From e2b55c8bbba3492d7cc97e5bfe97589aaf932b1f Mon Sep 17 00:00:00 2001
From: 田源 <lastanimals@163.com>
Date: 星期三, 20 十二月 2023 19:24:24 +0800
Subject: [PATCH] 整合代码

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

diff --git a/Source/UBCS-WEB/src/components/Master/MasterTree.vue b/Source/UBCS-WEB/src/components/Master/MasterTree.vue
index 17a4f13..d1ec150 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;"><i class="el-icon-refresh refresh-icon" @click="getTreeLists"></i></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,6 +38,7 @@
     return {
       TreeValue: '',
       idData: '',
+      referTreeId: '',
       masterVrBtnList: [],
       tableHeadFindData: [],
       tableHeadDataFateher: [],
@@ -52,15 +57,15 @@
         defaultExpandAll: false,
         menu: false,
         lazy: true,
-        // treeLoad:function (node,resolve){
-        //   console.log(node)
-        //   console.log(resolve)
-        // }
-        treeLoad: function (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}).then(res => {
+            const parentBtmName = node.data.attributes.btmname;
+            getTreeList({
+              parentOid: parentId,
+              parentBtmName: parentBtmName,
+              'conditionMap[btmTypeId]': this.referTreeId
+            }).then(res => {
               resolve(res.data.map(item => {
                 return {
                   ...item,
@@ -95,8 +100,7 @@
     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) {
@@ -105,6 +109,8 @@
             this.Treedata = res.data;
             const [firstProperty] = res.data;
             this.ModifyProperties(this.Treedata, 'text', 'label');
+            this.referTreeId = firstProperty.attributes.btmTypeId;
+            // console.log(this.referTreeId)
             this.codeClassifyOid = firstProperty.oid;
             this.coderuleoid = firstProperty.attributes.coderuleoid;
             this.$emit("coderuleoid", this.coderuleoid)
@@ -114,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)
       });
     },
@@ -137,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)
@@ -152,6 +161,7 @@
     TableHeadRend() {
       const index = this.$route.query.id.indexOf('@');
       const result = this.$route.query.id.substring(0, index);
+      // console.log(this.$route)
       return new Promise((resolve, reject) => {
         MasterTable({
           codeClassifyOid: this.nodeClickList.oid,
@@ -190,7 +200,7 @@
     async nodeClick(data) {
       try {
         // console.log(data)
-        this.TreeValue = data.label.split(" ")[0].trim();
+        this.TreeValue = data.label.split("</span>")[1].trim();
         // console.log('TreeValue',this.TreeValue)
         this.$emit('TreeValue', this.TreeValue)
         this.nodeClickList = data;
@@ -198,10 +208,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)
       }
     }
@@ -236,4 +246,7 @@
   margin-left: 6px;
   font-size: 18px;
 }
+#labelSize{
+  font-size: 14px !important;
+}
 </style>

--
Gitblit v1.9.3