From bfedaf0182cac8fb947f1b0a3dee3d07c3c24f1e Mon Sep 17 00:00:00 2001
From: wangting <675591594@qq.com>
Date: 星期五, 21 七月 2023 19:33:29 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/master'
---
Source/UBCS-WEB/src/components/Master/MasterTree.vue | 9 +++------
1 files changed, 3 insertions(+), 6 deletions(-)
diff --git a/Source/UBCS-WEB/src/components/Master/MasterTree.vue b/Source/UBCS-WEB/src/components/Master/MasterTree.vue
index cf5f526..4fe2405 100644
--- a/Source/UBCS-WEB/src/components/Master/MasterTree.vue
+++ b/Source/UBCS-WEB/src/components/Master/MasterTree.vue
@@ -70,13 +70,14 @@
},
created() {
this.getTreeLists()
-
},
computed:{
},
methods:{
//鑾峰彇鏁版嵁
getTreeLists(){
+ const fullPath = this.$route.fullPath
+ const queryString = fullPath.split('?')[1];
getTreeList({'conditionMap[id]': 'wupin'}).then(res=>{
this.Treedata=res.data
this.ModifyProperties(this.Treedata, 'text', 'label');
@@ -121,9 +122,7 @@
codeClassifyOid: this.nodeClickList.oid,
functionId: 5,
}).then(res => {
- console.log('1-', res.data)
- console.log('123-', res.data.buttons)
- const flagsToDeleteBtn = ["CODEIMPORTHISTORY", "CODEBATCHADD", "CODESTARTPROCESS", "CODEEXPORT", "CODEQUERY"];
+ const flagsToDeleteBtn = ["CODEIMPORTHISTORY", "CODEEXPORT", "CODEQUERY","batchApplyCode"];
//涓嶅悓鑺傜偣鏄剧ず涓嶅悓鎸夐挳
if (!res.data.leaf) {
this.masterVrBtnList = res.data.buttons.filter(obj => flagsToDeleteBtn.includes(obj.uniqueFlag));
@@ -142,7 +141,6 @@
width: item.minWidth
};
this.tableHeadFindData.push(Object.assign(item, columnItem))
- // console.log(' this.tableHeadFindData', this.tableHeadFindData)
})
this.$emit('tableHeadDataFateher', this.tableHeadDataFateher);
this.$emit('tableHeadFindData', this.tableHeadFindData);
@@ -163,7 +161,6 @@
this.TableRend(); // TableHeadRend() 鏂规硶瀹屾垚鍚庡啀鎵ц TableRend()
this.$emit('nodeClick',this.templateOids)
this.$emit("codeClassifyOid", this.nodeClickList.oid )
- console.log('鏍�',this.nodeClickList)
} catch (error) {
// 澶勭悊閿欒
this.$message.error(error)
--
Gitblit v1.9.3