From bf4cb4fdbd57f1785cdd1ddeadfb20a835d5fb6f Mon Sep 17 00:00:00 2001
From: lyh <925863403@qq.com>
Date: 星期四, 05 六月 2025 15:18:56 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/master'
---
src/views/dnc/base/modules/ProductStructure/ProductStructureTree.vue | 6 +++++-
1 files changed, 5 insertions(+), 1 deletions(-)
diff --git a/src/views/dnc/base/modules/ProductStructure/ProductStructureTree.vue b/src/views/dnc/base/modules/ProductStructure/ProductStructureTree.vue
index 1fed810..9d8320b 100644
--- a/src/views/dnc/base/modules/ProductStructure/ProductStructureTree.vue
+++ b/src/views/dnc/base/modules/ProductStructure/ProductStructureTree.vue
@@ -63,6 +63,8 @@
<AssignPermissionModal :currentTreeNodeInfo="rightClickSelected" @submitSuccess="modalFormSubmitSuccess" />
<!--妫�绱㈢數瀛愭ā鏉垮脊绐�-->
<NcDocumentSearchModal :currentDocumentInfo="rightClickSelected" @submitSuccess="modalFormSubmitSuccess" />
+ <!--妫�绱C鏂囦欢寮圭獥-->
+ <NcDocumentSearchNcModal :currentDocumentInfo="rightClickSelected" @submitSuccess="modalFormSubmitSuccess" />
<!--寮曠敤閮ㄤ欢-->
<NcComponentBorrowModal :currentBorrowInfo="rightClickSelected" @submitSuccess="modalFormSubmitSuccess" />
<!--浜у搧缁撴瀯鏍戝熀鏈彸閿彍鍗�(绌虹櫧澶勮Е鍙�)-->
@@ -85,6 +87,7 @@
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 {
@@ -101,6 +104,7 @@
ProductModal,
ProductStructureTreeContextMenu,
NcDocumentSearchModal,
+ NcDocumentSearchNcModal,
NcComponentBorrowModal
},
data() {
@@ -397,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