From df5f05fdc4acc8b0258d391a495e544bc0991e64 Mon Sep 17 00:00:00 2001
From: 王震 <10952869+daywangzhen@user.noreply.gitee.com>
Date: 星期六, 26 八月 2023 17:42:40 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/master'

---
 src/views/basicData/index.vue |   51 ++++++++++-----------------------------------------
 1 files changed, 10 insertions(+), 41 deletions(-)

diff --git a/src/views/basicData/index.vue b/src/views/basicData/index.vue
index 952955e..e47537f 100644
--- a/src/views/basicData/index.vue
+++ b/src/views/basicData/index.vue
@@ -143,6 +143,7 @@
         ref="multipleTable"
         @select="selectTr"
         @select-all="selectAll"
+        @selection-change="handleSelectionChange"
         :tree-props="{ children: 'children', hasChildren: 'hasChildren' }"
       >
         <el-table-column type="selection" label="搴忓彿"> </el-table-column>
@@ -344,20 +345,6 @@
       this.isAllSelect = !this.isAllSelect;
       let data = this.tableData;
       this.toggleSelect(data, this.isAllSelect, "all");
-      // 鑷畾涔�
-      if (this.isAllSelect) {
-        val.forEach((i) => {
-          if (i.id !== undefined) {
-            this.deleteList.push(i.id);
-          } else {
-            i.children.forEach((c) => {
-              this.deleteList.push(c.id);
-            });
-          }
-        });
-      } else {
-        this.deleteList.splice(0, this.deleteList.length);
-      }
     },
     //閫夋嫨鏌愯
     selectTr(selection, row) {
@@ -366,33 +353,6 @@
         this.isAllSelect = row.isChecked;
         this.toggleSelect(row, row.isChecked, "tr");
       });
-
-      if (row.isChecked === true) {
-        if (row.children !== undefined) {
-          row.children.forEach((i) => {
-            this.deleteList.push(i.id);
-          });
-        } else {
-          this.deleteList.push(row.id);
-        }
-      } else if (row.isChecked === false) {
-        if (row.children !== undefined) {
-          row.children.forEach((i) => {
-            this.deleteList.findIndex((c, index) => {
-              if (c === i.id) {
-                this.deleteList.splice(index, 1);
-                return;
-              }
-            });
-          });
-        }
-        this.deleteList.findIndex((c, index) => {
-          if (c === row.id) {
-            this.deleteList.splice(index, 1);
-            return;
-          }
-        });
-      }
     },
     //閫掑綊瀛愮骇
     toggleSelect(data, flag, type) {
@@ -426,6 +386,15 @@
         }
       });
     },
+    handleSelectionChange(val) {
+      this.deleteList = []
+      val.forEach((v) => {
+        if(v.id !== undefined) {
+          this.deleteList.push(v.id)
+        }
+      })
+      console.log(`output->this.deleteList`,this.deleteList)
+    },
     // 琛ㄦ牸鏍戝叏閮ㄩ�変腑閰嶇疆  缁撴潫
     deleteListClick() {
       deleteListApi(this.deleteList).then((res) => {

--
Gitblit v1.9.3