From 9e7480c548624a04f6ac7630d644364b86c74215 Mon Sep 17 00:00:00 2001
From: 田源 <lastanimals@163.com>
Date: 星期二, 12 十二月 2023 09:23:56 +0800
Subject: [PATCH] 样式优化整合代码

---
 Source/UBCS-WEB/src/components/Master/MasterTree.vue |   11 ++++++++---
 1 files changed, 8 insertions(+), 3 deletions(-)

diff --git a/Source/UBCS-WEB/src/components/Master/MasterTree.vue b/Source/UBCS-WEB/src/components/Master/MasterTree.vue
index b34e705..4e883aa 100644
--- a/Source/UBCS-WEB/src/components/Master/MasterTree.vue
+++ b/Source/UBCS-WEB/src/components/Master/MasterTree.vue
@@ -6,7 +6,7 @@
         <span v-html="node.label"></span>
       </template>
     </avue-tree>
-    <div style="position: absolute; right: 0px; top: -1px;">
+    <div style="position: absolute; right: 3px; top: -1px;">
       <el-link class="refresh-icon" icon="el-icon-refresh" @click="getTreeLists"></el-link>
     </div>
   </div>
@@ -147,12 +147,17 @@
     },
     //琛ㄦ牸鍒锋柊
     TableRend() {
+      this.loading = true;
+      this.$emit('loading', this.loading)
       TableData({
         templateOid: this.templateOids,
         codeClassifyOid: this.nodeClickList.oid,
         page: this.currentPage,
         limit: this.pageSize,
       }).then(res => {
+        // console.log('tab',res)
+        this.loading = false;
+        this.$emit('loading', this.loading)
         this.tableDataArray = res.data.data;
         this.$emit('tableDataArray', this.tableDataArray)
         this.$emit('total', res.data.total)
@@ -181,7 +186,7 @@
           List.forEach(item => {
             let columnItem = {
               label: item.title,
-              prop: item.queryField,
+              prop: item.field,
               // type: this.columnType[item.type],
               sortable: item.sort,
               width: item.minWidth
@@ -209,7 +214,7 @@
         this.tableHeadFindData = []
         await this.TableHeadRend(); // 鍏堟墽琛� TableHeadRend()
         this.TableRend(); // TableHeadRend() 鏂规硶瀹屾垚鍚庡啀鎵ц TableRend()
-        this.$emit('nodeClick', this.templateOids)
+        this.$emit('nodeClickTemplateOids', this.templateOids)
         this.$emit("codeClassifyOid", this.nodeClickList.oid)
         this.$emit("nodeClickList", this.nodeClickList)
       } catch (error) {

--
Gitblit v1.9.3