From a4d7993d0b44faffe2e548250a9d2bc27c77e521 Mon Sep 17 00:00:00 2001
From: xiejun <xj@2023>
Date: 星期三, 19 七月 2023 12:27:46 +0800
Subject: [PATCH] 集成获取分类接口（包含编码规则码段码值信息）
---
Source/UBCS-WEB/src/components/Master/MasterTree.vue | 16 +++++++---------
1 files changed, 7 insertions(+), 9 deletions(-)
diff --git a/Source/UBCS-WEB/src/components/Master/MasterTree.vue b/Source/UBCS-WEB/src/components/Master/MasterTree.vue
index d5923e6..2a583b3 100644
--- a/Source/UBCS-WEB/src/components/Master/MasterTree.vue
+++ b/Source/UBCS-WEB/src/components/Master/MasterTree.vue
@@ -116,18 +116,16 @@
},
//琛ㄦ牸澶撮儴
TableHeadRend() {
- return new Promise((resolve,reject)=>{
+ return new Promise((resolve, reject) => {
MasterTable({
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));
- }else {
+ if (!res.data.leaf) {
+ this.masterVrBtnList = res.data.buttons.filter(obj => flagsToDeleteBtn.includes(obj.uniqueFlag));
+ } else {
this.masterVrBtnList = res.data.buttons
}
this.tableHeadDataFateher = res.data;
@@ -141,14 +139,14 @@
sortable: item.sort,
width: item.minWidth
};
- this.tableHeadFindData.push(columnItem)
+ this.tableHeadFindData.push(Object.assign(item, columnItem))
// console.log(' this.tableHeadFindData', this.tableHeadFindData)
})
this.$emit('tableHeadDataFateher', this.tableHeadDataFateher);
this.$emit('tableHeadFindData', this.tableHeadFindData);
this.$emit('tableHeadBttoms', this.masterVrBtnList);
resolve();
- }).catch(err=>{
+ }).catch(err => {
reject(err)
})
})
--
Gitblit v1.9.3