From 91678e5bf6c81ab5da30e8c2cb713b6e57ee229f Mon Sep 17 00:00:00 2001
From: zhaowei <zhaowei>
Date: 星期五, 13 六月 2025 15:48:28 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/master'
---
src/views/dnc/base/modules/ProductStructure/ProductStructureTreeContextMenu.vue | 60 ++++++++++++++++++++++++++++++++++++++----------------------
1 files changed, 38 insertions(+), 22 deletions(-)
diff --git a/src/views/dnc/base/modules/ProductStructure/ProductStructureTreeContextMenu.vue b/src/views/dnc/base/modules/ProductStructure/ProductStructureTreeContextMenu.vue
index 338a3a0..a57934e 100644
--- a/src/views/dnc/base/modules/ProductStructure/ProductStructureTreeContextMenu.vue
+++ b/src/views/dnc/base/modules/ProductStructure/ProductStructureTreeContextMenu.vue
@@ -39,7 +39,9 @@
{ label: '娣诲姞閮ㄤ欢', code: 'product_add_child', icon: 'plus', isCommonMethod: false },
{ label: '缂栬緫浜у搧淇℃伅', code: 'product_edit', icon: 'edit', isCommonMethod: false },
// { label: '瀵煎嚭鏂囨。', code: 'product_export', icon: 'export', isCommonMethod: true },
- { label: '瀵煎叆鍏朵粬鏂囨。', code: 'product_import', icon: 'import', isCommonMethod: true },
+ { label: '瀵煎叆鍏朵粬鏂囨。', code: 'product_other_import', icon: 'import', isCommonMethod: true },
+ { label: '妫�绱㈢數瀛愭牱鏉�', code: 'product_search', icon: 'search', isCommonMethod: true },
+ { label: '妫�绱C鏂囦欢', code: 'product_search_nc', icon: 'search', isCommonMethod: true },
{ label: '鍒犻櫎', code: 'product_delete', icon: 'delete', isCommonMethod: true },
{ label: '鏉冮檺閰嶇疆', code: 'public_assign_permission', icon: 'idcard', isCommonMethod: true }
],
@@ -50,7 +52,10 @@
{ label: '鍒涘缓宸ュ簭', code: 'component_add_relative', icon: 'plus', isCommonMethod: false },
{ label: '缂栬緫閮ㄤ欢淇℃伅', code: 'component_edit', icon: 'edit', isCommonMethod: false },
// { label: '瀵煎嚭鏂囨。', code: 'component_export', icon: 'export', isCommonMethod: true },
- { label: '瀵煎叆鍏朵粬鏂囨。', code: 'component_import', icon: 'import', isCommonMethod: true },
+ { label: '瀵煎叆鍏朵粬鏂囨。', code: 'component_other_import', icon: 'import', isCommonMethod: true },
+ { label: '妫�绱㈢數瀛愭牱鏉�', code: 'component_search', icon: 'search', isCommonMethod: true },
+ { label: '妫�绱C鏂囦欢', code: 'component_search_nc', icon: 'search', isCommonMethod: true },
+ { label: '寮曠敤閮ㄤ欢',code: 'component_borrow',icon: 'plus',isCommonMethod: false},
{ label: '鍒犻櫎', code: 'component_delete', icon: 'delete', isCommonMethod: true },
{ label: '鏉冮檺閰嶇疆', code: 'public_assign_permission', icon: 'idcard', isCommonMethod: true }
],
@@ -61,7 +66,9 @@
// { label: '鍒涘缓宸ュ簭', code: 'parts_add_relative', icon: 'plus', isCommonMethod: false },
{ label: '缂栬緫闆朵欢淇℃伅', code: 'parts_edit', icon: 'edit', isCommonMethod: false },
// { label: '瀵煎嚭鏂囨。', code: 'parts_export', icon: 'export', isCommonMethod: true },
- { label: '瀵煎叆鍏朵粬鏂囨。', code: 'parts_import', icon: 'import', isCommonMethod: true },
+ { label: '瀵煎叆鍏朵粬鏂囨。', code: 'parts_other_import', icon: 'import', isCommonMethod: true },
+ { label: '妫�绱㈢數瀛愭牱鏉�', code: 'parts_search', icon: 'search', isCommonMethod: true },
+ { label: '妫�绱C鏂囦欢', code: 'parts_search_nc', icon: 'search', isCommonMethod: true },
{ label: '鍒犻櫎', code: 'parts_delete', icon: 'delete', isCommonMethod: true },
{ label: '鏉冮檺閰嶇疆', code: 'public_assign_permission', icon: 'idcard', isCommonMethod: true }
],
@@ -70,6 +77,9 @@
{ label: '鍒涘缓宸ヨ壓瑙勭▼鐗堟湰', code: 'version_add', icon: 'plus', isCommonMethod: false },
{ label: '鍒涘缓宸ュ簭', code: 'version_add_child', icon: 'plus', isCommonMethod: false },
{ label: '缂栬緫宸ヨ壓瑙勭▼鐗堟湰淇℃伅', code: 'version_edit', icon: 'edit', isCommonMethod: false },
+ { label: '瀵煎叆鍏朵粬鏂囨。', code: 'version_other_import', icon: 'import', isCommonMethod: true },
+ { label: '妫�绱㈢數瀛愭牱鏉�', code: 'version_search', icon: 'search', isCommonMethod: true },
+ { label: '妫�绱C鏂囦欢', code: 'version_search_nc', icon: 'search', isCommonMethod: true },
{ label: '鍒犻櫎', code: 'version_delete', icon: 'delete', isCommonMethod: true },
{ label: '鏉冮檺閰嶇疆', code: 'public_assign_permission', icon: 'idcard', isCommonMethod: true }
],
@@ -81,7 +91,10 @@
{ label: '缂栬緫宸ュ簭淇℃伅', code: 'process_edit', icon: 'edit', isCommonMethod: false },
{ label: '鍒犻櫎', code: 'process_delete', icon: 'delete', isCommonMethod: true },
// { label: '瀵煎嚭NC绋嬪簭', code: 'process_export', icon: 'export', isCommonMethod: true },
- { label: '瀵煎叆NC绋嬪簭', code: 'process_import', icon: 'import', isCommonMethod: true },
+ { label: '瀵煎叆NC绋嬪簭', code: 'process_nc_import', icon: 'import', isCommonMethod: true },
+ { label: '瀵煎叆鍏朵粬鏂囨。', code: 'process_other_import', icon: 'import', isCommonMethod: true },
+ { label: '妫�绱㈢數瀛愭牱鏉�', code: 'process_search', icon: 'search', isCommonMethod: true },
+ { label: '妫�绱C鏂囦欢', code: 'process_search_nc', icon: 'search', isCommonMethod: true },
{ label: '鏉冮檺閰嶇疆', code: 'public_assign_permission', icon: 'idcard', isCommonMethod: true }
],
//宸ユ
@@ -91,7 +104,10 @@
{ label: '娣诲姞璁惧绫�', code: 'processStep_add_type', icon: 'plus', isCommonMethod: true },
{ label: '鍒犻櫎', code: 'processStep_delete', icon: 'delete', isCommonMethod: true },
// { label: '瀵煎嚭NC绋嬪簭', code: 'processStep_export', icon: 'import', isCommonMethod: true },
- { label: '瀵煎叆NC绋嬪簭', code: 'processStep_import', icon: 'import', isCommonMethod: true },
+ { label: '瀵煎叆NC绋嬪簭', code: 'processStep_nc_import', icon: 'import', isCommonMethod: true },
+ { label: '瀵煎叆鍏朵粬鏂囨。', code: 'processStep_other_import', icon: 'import', isCommonMethod: true },
+ { label: '妫�绱㈢數瀛愭牱鏉�', code: 'processStep_search', icon: 'search', isCommonMethod: true },
+ { label: '妫�绱C鏂囦欢', code: 'processStep_search_nc', icon: 'search', isCommonMethod: true },
{ label: '鏉冮檺閰嶇疆', code: 'public_assign_permission', icon: 'idcard', isCommonMethod: true }
]
}
@@ -114,28 +130,28 @@
return 'processStep'
}
},
- getCurrentDocClassCode() {
- switch (+this.treeParams.type) {
- case 1:
- return 'OTHER'
- case 2:
- return 'OTHER'
- case 3:
- return 'OTHER'
- case 5:
- return 'NC'
- case 6:
- return 'NC'
- }
- }
+ // getCurrentDocClassCode() {
+ // switch (+this.treeParams.type) {
+ // case 1:
+ // return 'OTHER'
+ // case 2:
+ // return 'OTHER'
+ // case 3:
+ // return 'OTHER'
+ // case 4:
+ // return 'OTHER'
+ // case 5:
+ // return 'NC'
+ // case 6:
+ // return 'NC'
+ // }
+ // }
},
methods: {
onContextMenuClick(treeKey, menuKey) {
const level = this.getCurrentMenuLevel
- const param = this.getCurrentDocClassCode
console.log('level---------------------', level)
- console.log('param---------------------', param)
- const treeNodeInfo = Object.assign({}, this.treeParams, { param })
+ const treeNodeInfo = Object.assign({}, this.treeParams)
console.log('treeNodeInfo******************', treeNodeInfo)
const menuKeyArray = menuKey.split('_')
const isCommonMethod = this.defaultContextMenuList[level].find(item => item.code === menuKey).isCommonMethod
--
Gitblit v1.9.3