From a00b50f20267948804399af79f0c5c1dec671a2c Mon Sep 17 00:00:00 2001
From: zhaowei <zhaowei>
Date: 星期一, 09 六月 2025 16:56:52 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/master'
---
src/views/dnc/base/modules/ProductStructure/ProductStructureTree.vue | 50 +++++++++++++++++++++++++++++++-------------------
1 files changed, 31 insertions(+), 19 deletions(-)
diff --git a/src/views/dnc/base/modules/ProductStructure/ProductStructureTree.vue b/src/views/dnc/base/modules/ProductStructure/ProductStructureTree.vue
index 7e5bd4b..9d8320b 100644
--- a/src/views/dnc/base/modules/ProductStructure/ProductStructureTree.vue
+++ b/src/views/dnc/base/modules/ProductStructure/ProductStructureTree.vue
@@ -4,7 +4,7 @@
<div style="display: flex;flex-direction: column;height: 100%">
<div style="display: flex;justify-content: space-between">
<a-input placeholder="杈撳叆鍏抽敭瀛楄繘琛屾悳绱�" allowClear v-model="searchInput"
- @change="handleSearchInputChange"/>
+ @change="handleSearchInputChange" />
<!-- <a-tooltip title="鍒锋柊">-->
<!-- <a-button icon="reload" @click="handleTreeReload" style="width: 18%;margin-left: 8px"></a-button>-->
<!-- </a-tooltip>-->
@@ -31,16 +31,16 @@
@select="handleTreeSelect" @expand="handleTreeExpand" @rightClick="handleTreeRightClick">
<template slot="title" slot-scope="{ label, parentId, key:treeKey,type}">
<ProductStructureTreeContextMenu ref="contextMenuRef"
- :treeParams="{label,treeKey,searchValue,type}"/>
+ :treeParams="{label,treeKey,searchValue,type}" />
</template>
- <a-icon slot="switcherIcon" type="down"/>
- <a-icon slot="product" type="shopping"/>
- <a-icon slot="component" type="camera"/>
- <a-icon slot="part" type="hdd"/>
- <a-icon slot="processSpecVersion" type="tag"/>
- <a-icon slot="process" type="apartment"/>
- <a-icon slot="processStep" type="tool"/>
+ <a-icon slot="switcherIcon" type="down" />
+ <a-icon slot="product" type="shopping" />
+ <a-icon slot="component" type="camera" />
+ <a-icon slot="part" type="hdd" />
+ <a-icon slot="processSpecVersion" type="tag" />
+ <a-icon slot="process" type="apartment" />
+ <a-icon slot="processStep" type="tool" />
</a-tree>
</div>
</div>
@@ -48,21 +48,27 @@
<!--浜у搧寮圭獥-->
<ProductModal ref="productModalFormRef" :currentTreeNodeInfo="rightClickSelected"
- @submitSuccess="getTreeDataByApi"/>
+ @submitSuccess="getTreeDataByApi" />
<!--閮ㄤ欢寮圭獥-->
- <ComponentModal :currentTreeNodeInfo="rightClickSelected" @submitSuccess="modalFormSubmitSuccess"/>
+ <ComponentModal :currentTreeNodeInfo="rightClickSelected" @submitSuccess="modalFormSubmitSuccess" />
<!--闆朵欢寮圭獥-->
- <PartModal :currentTreeNodeInfo="rightClickSelected" @submitSuccess="modalFormSubmitSuccess"/>
+ <PartModal :currentTreeNodeInfo="rightClickSelected" @submitSuccess="modalFormSubmitSuccess" />
<!--宸ヨ壓瑙勭▼鐗堟湰寮圭獥-->
- <ProcessSpecVersionModal :currentTreeNodeInfo="rightClickSelected" @submitSuccess="modalFormSubmitSuccess"/>
+ <ProcessSpecVersionModal :currentTreeNodeInfo="rightClickSelected" @submitSuccess="modalFormSubmitSuccess" />
<!--宸ュ簭寮圭獥-->
- <ProcessModal :currentTreeNodeInfo="rightClickSelected" @submitSuccess="modalFormSubmitSuccess"/>
+ <ProcessModal :currentTreeNodeInfo="rightClickSelected" @submitSuccess="modalFormSubmitSuccess" />
<!--宸ユ寮圭獥-->
- <ProcessStepModal :currentTreeNodeInfo="rightClickSelected" @submitSuccess="modalFormSubmitSuccess"/>
+ <ProcessStepModal :currentTreeNodeInfo="rightClickSelected" @submitSuccess="modalFormSubmitSuccess" />
<!--鏉冮檺閰嶇疆寮圭獥-->
- <AssignPermissionModal :currentTreeNodeInfo="rightClickSelected" @submitSuccess="modalFormSubmitSuccess"/>
+ <AssignPermissionModal :currentTreeNodeInfo="rightClickSelected" @submitSuccess="modalFormSubmitSuccess" />
+ <!--妫�绱㈢數瀛愭ā鏉垮脊绐�-->
+ <NcDocumentSearchModal :currentDocumentInfo="rightClickSelected" @submitSuccess="modalFormSubmitSuccess" />
+ <!--妫�绱C鏂囦欢寮圭獥-->
+ <NcDocumentSearchNcModal :currentDocumentInfo="rightClickSelected" @submitSuccess="modalFormSubmitSuccess" />
+ <!--寮曠敤閮ㄤ欢-->
+ <NcComponentBorrowModal :currentBorrowInfo="rightClickSelected" @submitSuccess="modalFormSubmitSuccess" />
<!--浜у搧缁撴瀯鏍戝熀鏈彸閿彍鍗�(绌虹櫧澶勮Е鍙�)-->
- <ProductStructureBaseContextMenu ref="baseContextmenuRef"/>
+ <ProductStructureBaseContextMenu ref="baseContextmenuRef" />
</a-card>
</template>
@@ -80,6 +86,9 @@
import DeviceCustomTypeModal from '@views/dnc/base/modules/ProductStructure/DeviceCustomType/DeviceCustomTypeModal.vue'
import ProductStructureBaseContextMenu
from '@views/dnc/base/modules/ProductStructure/ProductStructureBaseContextMenu.vue'
+import NcDocumentSearchModal from '@views/dnc/base/modules/ProductStructure/Document/NcDocumentSearchModal.vue'
+import NcDocumentSearchNcModal from '@views/dnc/base/modules/ProductStructure/Document/NcDocumentSearchNcModal.vue'
+import NcComponentBorrowModal from '@views/dnc/base/modules/ProductStructure/Document/NcComponentBorrowModal.vue'
export default {
name: 'ProductStructureTree',
@@ -93,7 +102,10 @@
PartModal,
ComponentModal,
ProductModal,
- ProductStructureTreeContextMenu
+ ProductStructureTreeContextMenu,
+ NcDocumentSearchModal,
+ NcDocumentSearchNcModal,
+ NcComponentBorrowModal
},
data() {
return {
@@ -389,7 +401,7 @@
// 鎺у埗鍩虹鍙抽敭鑿滃崟鍏抽棴
handleBaseContextMenuClose() {
- this.$refs.baseContextmenuRef.menuVisible = false
+ if(this.$refs.baseContextmenuRef)this.$refs.baseContextmenuRef.menuVisible = false
document.body.removeEventListener('click', this.handleBaseContextMenuClose)
},
--
Gitblit v1.9.3