From 4c5c20a7c03539104df74072b1b8a81b51c19ab8 Mon Sep 17 00:00:00 2001
From: zss <zss@example.com>
Date: 星期四, 14 九月 2023 10:42:15 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/master'

---
 src/components/view/standard-table/technology.vue |   45 +++++++++++++++++++++++++++++++--------------
 1 files changed, 31 insertions(+), 14 deletions(-)

diff --git a/src/components/view/standard-table/technology.vue b/src/components/view/standard-table/technology.vue
index 3186948..978a988 100644
--- a/src/components/view/standard-table/technology.vue
+++ b/src/components/view/standard-table/technology.vue
@@ -35,7 +35,7 @@
             <el-table-column prop="pq" label="鐢熶骇瀹氶(涓�/澶�)">
               <template slot-scope="scope">
                   <el-input v-model="scope.row.pq" 
-                  v-if="scope.row.pq != null"
+                  v-if="scope.row.dg != null"
                   @blur="updatePq(scope.row)"
                   ></el-input>
               </template>
@@ -65,19 +65,12 @@
       }
     },
     props:['tableData','tableType'],
-    created() {
-      console.log(this.tableData)
-    },
+    created() {},
     mounted() {
     },
     methods: {
       // 琛ㄦ牸鏍戝叏閮ㄩ�変腑閰嶇疆
       // 鍏ㄩ��/鍙栨秷閫夋搷浣�
-      selectAll(val) {
-        this.isAllSelect = !this.isAllSelect;
-        let data = this.tableData;
-        this.toggleSelect(data, this.isAllSelect, "all");
-      },
       //閫夋嫨鏌愯
 		  selectTr(selection, row) {
         this.$set(row, "isChecked", !row.isChecked);
@@ -107,13 +100,37 @@
           }
         }
       },
+      //鏀瑰彉閫変腑
+      toggleSelection(row, flag) {
+        this.$set(row, "isChecked", flag);
+        this.$nextTick(() => {
+          if (flag) {
+            this.$refs.multipleTable.toggleRowSelection(row, flag);
+          } else {
+            this.$refs.multipleTable.clearSelection();
+          }
+        });
+      },
+      selectAll(val) {
+        this.isAllSelect = !this.isAllSelect;
+        let data = this.tableData;
+        this.toggleSelect(data, this.isAllSelect, "all");
+      },
       handleSelectionChange(val) {
         this.deleteList = [];
         val.forEach((v) => {
-          if (v.id !== undefined) {
-            this.deleteList.push(v.id);
-          }
+          this.searchIdFun(v);
         });
+        this.$emit("childData",this.deleteList);
+      },
+      //閫掑綊鏌ユ壘閫変腑鏁版嵁id
+      searchIdFun(data){
+        let obj = data;
+        if(obj.children != undefined){
+          this.searchIdFun(obj.children);
+        }else{
+          this.deleteList.push(obj.id);
+        }
       },
       // 琛ㄦ牸鏍戝叏閮ㄩ�変腑閰嶇疆  缁撴潫
       showDialog(){
@@ -190,7 +207,7 @@
   /* .standard .el-table__body {
     height: 100%;
   } */
-  .standard .el-table .el-table__row:not([class*="el-table__row--level-"]) td:nth-child(3){
+  /* .standard .el-table .el-table__row:not([class*="el-table__row--level-"]) td:nth-child(3){
     padding-left: 23px !important;
-   }
+   } */
 </style>

--
Gitblit v1.9.3