From 039d01c3ee6217e18ef3bcaec263fd2ad59e6f68 Mon Sep 17 00:00:00 2001
From: Fixiaobai <fixiaobai@163.com>
Date: 星期三, 20 九月 2023 16:19:51 +0800
Subject: [PATCH] 	modified:   src/components/view/equipmentmaintain.vue 	modified:   src/components/view/standard-table/material.vue 	modified:   src/components/view/standard-table/product.vue 	modified:   src/components/view/standard-table/target.vue 	modified:   src/components/view/standard-table/technology.vue

---
 src/components/view/standard-table/material.vue |   68 +++++++++++++++++++++++++---------
 1 files changed, 50 insertions(+), 18 deletions(-)

diff --git a/src/components/view/standard-table/material.vue b/src/components/view/standard-table/material.vue
index 32384da..ab2c6ae 100644
--- a/src/components/view/standard-table/material.vue
+++ b/src/components/view/standard-table/material.vue
@@ -1,7 +1,7 @@
 <template>
     <div class="standard">
-      <div>
-            <el-table :data="tableData" max-height="675" row-key="rowId" border
+      <div style="width: 100%;height: 68vh;overflow-x: auto;">
+            <el-table :data="tableData"  row-key="rowId" border height="calc(90vh - 200px)"
             @select-all="selectAll" @select="selectTr" ref="multipleTable"
             @selection-change="handleSelectionChange" default-expand-all
               :tree-props="{ children: 'children', hasChildren: 'hasChildren' }">
@@ -9,25 +9,25 @@
               </el-table-column>
               <el-table-column type="index" width="60" label="搴忓彿">
               </el-table-column>
-              <el-table-column prop="father" label="宸ュ簭" sortable width="200px">
+              <el-table-column prop="father" label="宸ュ簭" width="200" :resizable="false">
                 <template slot-scope="scope">
-                  <el-tag v-if="scope.row.father != null" type="primary">01</el-tag>
+                  <el-tag class="tag" v-if="scope.row.father != null" type="primary">01</el-tag>
                   <span style="color: #000000">
                     {{ scope.row.father }}
                   </span>
               </template>
               </el-table-column>
-              <el-table-column prop="tname" sortable label="宸ヨ壓鍚嶇О">
+              <el-table-column prop="tname" label="宸ヨ壓鍚嶇О" width="200" :resizable="false">
                 <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" class="tag">02</el-tag>
                   <span style="color: #000000">
                     {{ scope.row.tname  }}
                   </span>
                   </template>
               </el-table-column>
-              <el-table-column prop="mname" label="鏉愭枡鍚嶇О">
+              <el-table-column prop="mname" label="鏉愭枡鍚嶇О" width="200" :resizable="false">
                 <template slot-scope="scope">
-                  <el-tag type="info" color="#faf2ff" v-if="scope.row.mname != null">
+                  <el-tag type="info" class="tag" color="#faf2ff" v-if="scope.row.mname != null">
                     <span style="color: #e1affb">03</span>
                   </el-tag>
                   <span>
@@ -35,14 +35,14 @@
                   </span>
                 </template>
               </el-table-column>
-              <el-table-column prop="specifications" label="瑙勬牸">
+              <el-table-column prop="specifications" label="瑙勬牸" :resizable="false">
               </el-table-column>
-              <el-table-column prop="unit" label="鍗曚綅">
+              <el-table-column prop="unit" label="鍗曚綅" :resizable="false">
               </el-table-column>
-              <el-table-column prop="num" label="鏁伴噺">
+              <el-table-column prop="num" label="鏁伴噺" :resizable="false">
                 <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 +56,9 @@
       data() {
         return {
           hasChildren:true,
-          selects: []
+          selects: [],
+          isAllSelect:false,
+          deleteList:[],
         }
       },
       props:['tableData','tableType'],
@@ -109,14 +111,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);
+        }
+      },
         // 琛ㄦ牸鏍戝叏閮ㄩ�変腑閰嶇疆  缁撴潫
       }
     }
@@ -127,6 +148,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;
+    }
   </style>
   <style>
     .standard * {

--
Gitblit v1.9.3