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

---
 src/components/view/standard-table/technology.vue |   63 +++++++++++++++++++++++--------
 1 files changed, 46 insertions(+), 17 deletions(-)

diff --git a/src/components/view/standard-table/technology.vue b/src/components/view/standard-table/technology.vue
index a550804..166d41a 100644
--- a/src/components/view/standard-table/technology.vue
+++ b/src/components/view/standard-table/technology.vue
@@ -8,23 +8,23 @@
             :tree-props="{ children: 'children', hasChildren: 'hasChildren' }">
             <el-table-column type="selection" width="55">
             </el-table-column>
-            <el-table-column type="index" width="60" label="搴忓彿">
+            <el-table-column type="index" width="60" label="搴忓彿" :resizable="false">
             </el-table-column>
-            <el-table-column prop="father" label="宸ュ簭" sortable width="200px">
+            <el-table-column prop="father" label="宸ュ簭" :resizable="false">
               <template slot-scope="scope">
-                    <el-tag v-if="scope.row.children" type="primary">01</el-tag>
+                    <el-tag class="tag" v-if="scope.row.children" type="primary">01</el-tag>
                     <span style="color: black">
                       {{ scope.row.father }}
                     </span>
             </template>
             </el-table-column>
-            <el-table-column sortable label="宸ヨ壓鍚嶇О">
+            <el-table-column sortable label="宸ヨ壓鍚嶇О" :resizable="false">
               <template slot-scope="scope">
-                <el-tag type="success" v-if="!scope.row.children">02</el-tag>
+                <el-tag class="tag" type="success" v-if="!scope.row.children">02</el-tag>
                 <span style="color: black">{{ scope.row.name  }}</span>
               </template>
             </el-table-column>
-            <el-table-column prop="dg" label="璁惧缁�">
+            <el-table-column prop="dg" label="璁惧缁�" :resizable="false">
               <template slot-scope="scope">
                 <div class="showDiv">
                   <span>{{scope.row.dg}}</span>
@@ -32,10 +32,10 @@
                 </div>
               </template>
             </el-table-column>
-            <el-table-column prop="pq" label="鐢熶骇瀹氶(涓�/澶�)">
+            <el-table-column prop="pq" label="鐢熶骇瀹氶(涓�/澶�)" :resizable="false">
               <template slot-scope="scope">
                   <el-input v-model="scope.row.pq" 
-                  v-if="scope.row.dg != null"
+                  v-if="scope.row.dg != null" size="small"
                   @blur="updatePq(scope.row)"
                   ></el-input>
               </template>
@@ -67,16 +67,10 @@
     props:['tableData','tableType'],
     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);
@@ -106,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(){
@@ -137,6 +155,17 @@
     width: 100%;
     height: 100%;
   }
+  .tag{
+      line-height:24px;
+      text-align:center;
+      width:36px;
+      height:24px;
+      
+      border-radius:12px;
+    }
+    .tag:nth-child(1){
+      margin-left:20px;
+    }
   .standard .showDiv{
     cursor: pointer;
   }

--
Gitblit v1.9.3