From fc89d746424577392fcec92cc8b8fea34006ce1c Mon Sep 17 00:00:00 2001
From: Fixiaobai <fixiaobai@163.com>
Date: 星期四, 14 九月 2023 13:49:14 +0800
Subject: [PATCH] Merge branch 'master' of http://192.168.0.22:9001/r/mom-before

---
 src/components/view/standard-table/material.vue |   38 ++++++++++++++++++++++++++++++--------
 1 files changed, 30 insertions(+), 8 deletions(-)

diff --git a/src/components/view/standard-table/material.vue b/src/components/view/standard-table/material.vue
index 32384da..b317e40 100644
--- a/src/components/view/standard-table/material.vue
+++ b/src/components/view/standard-table/material.vue
@@ -19,7 +19,8 @@
               </el-table-column>
               <el-table-column prop="tname" sortable label="宸ヨ壓鍚嶇О">
                 <template slot-scope="scope">
-                  <el-tag type="success" v-if="scope.row.tname != null">02</el-tag>
+                  <el-tag type="success" v-if="scope.row.tname != null"
+                  style="margin-left:20px;">02</el-tag>
                   <span style="color: #000000">
                     {{ scope.row.tname  }}
                   </span>
@@ -42,7 +43,7 @@
               <el-table-column prop="num" label="鏁伴噺">
                 <template slot-scope="scope">
                   <el-input v-model="scope.row.num" 
-                    v-if="scope.row.mname != null"
+                    v-if="scope.row.mname != null" size="small"
                     @blur="updateVal(scope.row)"></el-input>
                 </template>
               </el-table-column>
@@ -56,7 +57,9 @@
       data() {
         return {
           hasChildren:true,
-          selects: []
+          selects: [],
+          isAllSelect:false,
+          deleteList:[],
         }
       },
       props:['tableData','tableType'],
@@ -109,14 +112,33 @@
             }
           }
         },
-        handleSelectionChange(val) {
-          this.deleteList = [];
-          val.forEach((v) => {
-            if (v.id !== undefined) {
-              this.deleteList.push(v.id);
+        //鏀瑰彉閫変腑
+        toggleSelection(row, flag) {
+          this.$set(row, "isChecked", flag);
+          this.$nextTick(() => {
+            if (flag) {
+              this.$refs.multipleTable.toggleRowSelection(row, flag);
+            } else {
+              this.$refs.multipleTable.clearSelection();
             }
           });
         },
+        handleSelectionChange(val) {
+        this.deleteList = [];
+        val.forEach((v) => {
+          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);
+        }
+      },
         // 琛ㄦ牸鏍戝叏閮ㄩ�変腑閰嶇疆  缁撴潫
       }
     }

--
Gitblit v1.9.3