From 43cf1a348650fc00b3e638396406814bf5f7ebfd Mon Sep 17 00:00:00 2001 From: zhaowei <zhaowei> Date: 星期三, 15 一月 2025 17:55:02 +0800 Subject: [PATCH] 1、产品结构树页面新增工步功能 2、产品结构树页面新增导入文档或NC程序功能 --- src/views/dnc/base/modules/ProductStructure/ProductStructureTree.vue | 26 ++++++++++++++------------ 1 files changed, 14 insertions(+), 12 deletions(-) diff --git a/src/views/dnc/common/ProductStructureTree.vue b/src/views/dnc/base/modules/ProductStructure/ProductStructureTree.vue similarity index 93% rename from src/views/dnc/common/ProductStructureTree.vue rename to src/views/dnc/base/modules/ProductStructure/ProductStructureTree.vue index c6d958f..fc006c1 100644 --- a/src/views/dnc/common/ProductStructureTree.vue +++ b/src/views/dnc/base/modules/ProductStructure/ProductStructureTree.vue @@ -2,7 +2,6 @@ <a-card class="tree_con" :loading="cardLoading" :bordered="false" @contextmenu.native="e=>e.preventDefault()"> <a-spin :spinning="loading"> <div style="display: flex;flex-direction: column;height: 100%"> - <div style="display: flex"> <a-input placeholder="杈撳叆鍏抽敭瀛楄繘琛屾悳绱�" allowClear v-model="searchInput" @change="handleSearchInputChange"/> @@ -24,7 +23,7 @@ </div> <!--浜у搧缁撴瀯鏍�--> - <div style="flex: 1;overflow:auto;margin-top: 10px"> + <div class="" style="flex: 1;overflow:auto;margin-top: 10px"> <a-tree ref="tree" show-icon :checkStrictly="checkStrictly" :expandedKeys.sync="expandedKeys" :selectedKeys="selectedKeys" :treeData="treeDataSource" :autoExpandParent="autoExpandParent" @select="handleTreeSelect" @expand="handleTreeExpand" @rightClick="handleTreeRightClick"> @@ -53,21 +52,25 @@ <PartModal :currentTreeNodeInfo="rightClickSelected" @submitSuccess="modalFormSubmitSuccess"/> <!--宸ュ簭寮圭獥--> <ProcessModal :currentTreeNodeInfo="rightClickSelected" @submitSuccess="modalFormSubmitSuccess"/> + <!--宸ユ寮圭獥--> + <ProcessStepModal :currentTreeNodeInfo="rightClickSelected" @submitSuccess="modalFormSubmitSuccess"/> </a-card> </template> <script> import dncApi from '@/api/dnc' import { deleteAction } from '@/api/manage' - import ProductStructureTreeContextMenu from './modules/ProductStructureTree/ProductStructureTreeContextMenu' - import ProductModal from '../base/modules/ProductStructure/Product/ProductModal' - import ComponentModal from '../base/modules/ProductStructure/Component/ComponentModal' - import PartModal from '../base/modules/ProductStructure/Part/PartModal' - import ProcessModal from '../base/modules/ProductStructure/Process/ProcessModal' + import ProductStructureTreeContextMenu from './ProductStructureTreeContextMenu' + import ProductModal from './Product/ProductModal' + import ComponentModal from './Component/ComponentModal' + import PartModal from './Part/PartModal' + import ProcessModal from './Process/ProcessModal' + import ProcessStepModal from './ProcessStep/ProcessStepModal' export default { name: 'ProductStructureTree', components: { + ProcessStepModal, ProcessModal, PartModal, ComponentModal, @@ -274,10 +277,10 @@ case 3: treeNode.slots = { icon: 'part' } break - case 4: + case 5: treeNode.slots = { icon: 'process' } break - case 5: + case 6: treeNode.slots = { icon: 'processStep' } break default: @@ -288,7 +291,6 @@ </script> <style lang="less" scoped> - /deep/ .ant-card-body { padding: 0 12px 0 0; } @@ -306,8 +308,8 @@ width: calc(100% - 24px) !important; } - .tree_con { - overflow: hidden; + ::-webkit-scrollbar { + width: 8px; } @media screen and (min-width: 1920px) { -- Gitblit v1.9.3