From 997835429a1d66643364091e8437ebbbeb8ff97a Mon Sep 17 00:00:00 2001
From: zenglf <18502938215@163.com>
Date: 星期四, 28 九月 2023 14:09:58 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/master' into develop

---
 src/views/mdc/common/BaseTree.vue |   24 ++++++++++--------------
 1 files changed, 10 insertions(+), 14 deletions(-)

diff --git a/src/views/mdc/common/BaseTree.vue b/src/views/mdc/common/BaseTree.vue
index 0aab780..ed5229a 100644
--- a/src/views/mdc/common/BaseTree.vue
+++ b/src/views/mdc/common/BaseTree.vue
@@ -112,21 +112,23 @@
       ...mapActions(['QueryProduction']),
       getCurrSelectedTitle() {
         return !this.currSelected.title ? '' : this.currSelected.title
-      }
-      ,
+      },
+      /**
+       * 鍙栨秷杞﹂棿閫変腑椤�
+       */
       onClearSelected() {
         this.hiding = true
         this.currSelected = {}
         this.selectedKeys = []
+        // console.log('鍙戦��')
+        // this.$bus.$emit('treeClearSelected','閲嶇疆鍒楄〃')
         this.$emit('sendSelectBaseTree', '')
       },
-
       onSelect(selectedKeys, e) {
         this.hiding = false
         let record = e.node.dataRef
         this.currSelected = Object.assign({}, record)
         this.selectedKeys = [record.key]
-        console.log(this.selectedKeys)
         this.$emit('sendSelectBaseTree', this.selectedKeys)
       },
       handleEdit(entity) {
@@ -167,8 +169,7 @@
         //   this.loading = false
         //   this.cardLoading = false
         // })
-      }
-      ,
+      },
       handleChange() {
         let search = this.searchInput
         let expandedKeys = this.dataList
@@ -186,8 +187,7 @@
           searchValue: search,
           autoExpandParent: true
         })
-      }
-      ,
+      },
       handleSearch(value) {
         let search = value
         let expandedKeys = this.dataList
@@ -206,8 +206,7 @@
           searchValue: search,
           autoExpandParent: true
         })
-      }
-      ,
+      },
       getParentKey(key, tree) {
         let parentKey
         for (let i = 0; i < tree.length; i++) {
@@ -223,7 +222,6 @@
         }
         return parentKey
       },
-
       generateList(data) {
         for (let i = 0; i < data.length; i++) {
           const node = data[i]
@@ -288,9 +286,7 @@
         this.queryTreeData()
         // 鏂板/淇敼 鎴愬姛鏃讹紝閲嶈浇鍒楄〃
       }
-
-    }
-    ,
+    },
     //鐩戝惉
     watch: {
       currSelected(val) { //鐩戝惉currSelected 鍙樺寲锛屽皢鍙樺寲鍚庣殑鏁板�间紶閫掔粰 getCurrSelected 浜嬩欢

--
Gitblit v1.9.3