From a79582f0c67ddc681d2804669455ae13c64de8f9 Mon Sep 17 00:00:00 2001
From: ludc
Date: 星期二, 26 十二月 2023 20:20:22 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/master'

---
 Source/UBCS-WEB/src/components/Master/MasterTree.vue |   51 ++++++++++++++++++++++++++++++---------------------
 1 files changed, 30 insertions(+), 21 deletions(-)

diff --git a/Source/UBCS-WEB/src/components/Master/MasterTree.vue b/Source/UBCS-WEB/src/components/Master/MasterTree.vue
index bbd9ed5..12e2074 100644
--- a/Source/UBCS-WEB/src/components/Master/MasterTree.vue
+++ b/Source/UBCS-WEB/src/components/Master/MasterTree.vue
@@ -1,12 +1,16 @@
 <template>
-  <div class="app" style="display: flex;">
+  <div class="app" style="position: relative;">
     <avue-tree ref="tree" v-model="CloneTreeAvueform" v-loading="loading" :data="Treedata" :defaultExpandAll="false"
                :option="Treeoption" style="width: fit-content;" @node-click="nodeClick">
       <template slot-scope="{ node }">
-        <span v-html="node.label"></span>
+        <el-tooltip class="item" effect="dark"  open-delay="350" :content="$createElement('div', { domProps: { innerHTML: node.label } })"  placement="right-start">
+          <span id="labelSize" v-html="node.label" ></span>
+        </el-tooltip>
       </template>
     </avue-tree>
-    <div style="display: inline-block;"><el-link icon="el-icon-refresh" class="refresh-icon" @click="getTreeLists"></el-link></div>
+    <div style="position: absolute; right: 3px; top: -1px;">
+      <el-link class="refresh-icon" icon="el-icon-refresh" @click="getTreeLists"></el-link>
+    </div>
   </div>
 </template>
 
@@ -34,7 +38,7 @@
     return {
       TreeValue: '',
       idData: '',
-      referTreeId:'',
+      referTreeId: '',
       masterVrBtnList: [],
       tableHeadFindData: [],
       tableHeadDataFateher: [],
@@ -53,15 +57,15 @@
         defaultExpandAll: false,
         menu: false,
         lazy: true,
-        // treeLoad:function (node,resolve){
-        //   console.log(node)
-        //   console.log(resolve)
-        // }
-        treeLoad: (node, resolve) =>{
+        treeLoad: (node, resolve) => {
           if (node.data != false) {
             const parentId = (node.level === 0) ? 0 : node.data.oid;
             const parentBtmName = node.data.attributes.btmname;
-            getTreeList({parentOid: parentId, parentBtmName: parentBtmName,'conditionMap[id]': this.referTreeId }).then(res => {
+            getTreeList({
+              parentOid: parentId,
+              parentBtmName: parentBtmName,
+              'conditionMap[btmTypeId]': this.referTreeId
+            }).then(res => {
               resolve(res.data.map(item => {
                 return {
                   ...item,
@@ -96,19 +100,17 @@
     getTreeLists() {
       const index = this.$route.query.id.indexOf('@');
       const result = this.$route.query.id.substring(0, index);
-      this.idData = result
-      // console.log(this.$route)
+      this.idData = result;
       getTreeList({'conditionMap[id]': this.idData}).then(res => {
         if (res) {
           if (res.data.length === 0) {
             this.$message.error("涓绘暟鎹垎绫绘煡璇负绌猴紒");
           } else {
             this.Treedata = res.data;
-
             const [firstProperty] = res.data;
             this.ModifyProperties(this.Treedata, 'text', 'label');
-            this.referTreeId=firstProperty.attributes.btmTypeId;
-            console.log(this.referTreeId)
+            this.referTreeId = firstProperty.attributes.btmTypeId;
+            // console.log(this.referTreeId)
             this.codeClassifyOid = firstProperty.oid;
             this.coderuleoid = firstProperty.attributes.coderuleoid;
             this.$emit("coderuleoid", this.coderuleoid)
@@ -118,11 +120,9 @@
             });
             this.$emit("coderuleoid", this.coderuleoid)
             this.$emit('Treedata', this.Treedata)
-            // console.log(this.Treedata)
           }
         }
       }).catch(res => {
-        // console.log(res)
         this.$message.error(res)
       });
     },
@@ -141,12 +141,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)
@@ -175,10 +180,11 @@
           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
+              width: item.minWidth,
+              query: item.queryField
             };
             this.tableHeadFindData.push(Object.assign(item, columnItem))
           })
@@ -203,10 +209,10 @@
         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) {
-        // 澶勭悊閿欒
         this.$message.error(error)
       }
     }
@@ -241,4 +247,7 @@
   margin-left: 6px;
   font-size: 18px;
 }
+#labelSize{
+  font-size: 14px !important;
+}
 </style>

--
Gitblit v1.9.3