From 1a43773bf1510edefe5fa46803b18a4a86a2fb26 Mon Sep 17 00:00:00 2001
From: wangting <675591594@qq.com>
Date: 星期五, 14 七月 2023 16:24:34 +0800
Subject: [PATCH] 主数据格式化展示列

---
 Source/UBCS-WEB/src/components/Master/MasterTree.vue |   18 +++++++++---------
 1 files changed, 9 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..cf5f526 100644
--- a/Source/UBCS-WEB/src/components/Master/MasterTree.vue
+++ b/Source/UBCS-WEB/src/components/Master/MasterTree.vue
@@ -116,18 +116,18 @@
     },
     //琛ㄦ牸澶撮儴
     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"];
+          console.log('1-', res.data)
+          console.log('123-', res.data.buttons)
+          const flagsToDeleteBtn = ["CODEIMPORTHISTORY", "CODEBATCHADD", "CODESTARTPROCESS", "CODEEXPORT", "CODEQUERY"];
           //涓嶅悓鑺傜偣鏄剧ず涓嶅悓鎸夐挳
-          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 +141,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