From da6cfbce4502d53735832d4a076c9927576fc34b Mon Sep 17 00:00:00 2001
From: Your Name <123456>
Date: 星期一, 30 五月 2022 14:12:34 +0800
Subject: [PATCH] '改'

---
 src/views/safetyproduction/new.vue |   35 ++++++++++++++++++++---------------
 1 files changed, 20 insertions(+), 15 deletions(-)

diff --git a/src/views/safetyproduction/new.vue b/src/views/safetyproduction/new.vue
index f14f39c..f0c84be 100644
--- a/src/views/safetyproduction/new.vue
+++ b/src/views/safetyproduction/new.vue
@@ -17,10 +17,10 @@
       </div>
       <div class="box-right" v-if="lists == '' ? false : true">
         <div class="btns">
-          <el-button type="primary" class="btn" @click="open(0)"
+          <el-button type="primary" class="btn" @click="open(1)"
             >添加</el-button
           >
-          <el-button type="primary" class="btn" @click="open(-1)"
+          <el-button type="primary" class="btn" @click="open(0)"
             >暂存</el-button
           >
         </div>
@@ -39,7 +39,7 @@
             </el-row>
             <el-row>
               <el-col :span="22" :offset="1">
-                <el-table ref="table" border :data="item.child">
+                <el-table ref="table" border :stripe="true" :data="item.child" :header-cell-style="{background:'#eef1f6',color:'#606266'}" :cell-style="{background:'#fff',color:'#606266'}">
                   <el-table-column
                     prop="standardizationRequirements"
                     align="center"
@@ -69,7 +69,9 @@
                       type="expand"
                     >
                       <template slot-scope="scope">
-                        <el-table :data="scope.row.deductionList">
+                        <el-table border :data="scope.row.deductionList"
+                        :header-cell-style="{background:'#eef1f6',color:'#606266'}" :cell-style="{background:'#fff',color:'#606266'}"
+                        >
                           <el-table-column
                             prop="name"
                             align="center"
@@ -223,14 +225,15 @@
             trees.push(this.list.itemList[i].elementA);
           }
           this.treeList = Array.from(new Set(trees));
-          var arr = this.checkSameDataA(this.list.itemList);  
+          var arr = this.checkSameDataA(this.list.itemList);
           for (var i = 0; i < arr.length; i++) {
             var cser=[]
-              for(var j=0;j<arr[i].child.length;j++){ 
+              for(var j=0;j<arr[i].child.length;j++){
              var capB = {
                 safetySelfInspectionId: "",
                 safetyInspectionItemId: "",
               }
+              arr[i].child[j].deductionList= arr[i].child[j].selfDeductionList
               capB.safetySelfInspectionId=arr[i].child[j].safetySelfInspectionId
               capB.safetyInspectionItemId=arr[i].child[j].safetyInspectionItemId
               cser.push(capB)
@@ -286,7 +289,7 @@
           if(this.list.length!=0){
           var capA = { elementAName: "", id: [], child: [] };
           var atte = [];
-        
+
           capA.elementAName = this.list[0].elementAName;
           for (var i = 0; i < this.list.length; i++) {
                var capB = {
@@ -356,7 +359,7 @@
           query: {
             idX: data.safetyInspectionItemId,
             name:this.id,
-            id:this.itemId 
+            id:this.itemId
           },
         });
       } else {
@@ -365,7 +368,7 @@
           query: {
             idX: data.id,
             name:this.id,
-             id:this.itemId 
+            id:this.itemId
           },
         });
       }
@@ -373,7 +376,6 @@
     open(type) {
       this.dialogVisible = true;
       this.form.status = type;
-      console.log("xxxxx",this.lists)
       var arr = [];
       for (var i = 0; i < this.lists.length; i++) {
         // this.lists[i].id;
@@ -390,7 +392,6 @@
        this.$refs["form"].validate((valid) => {
         if (valid) {
       if (this.id == "添加") {
-        console.log("添加",this.form)
         safetySelfInspectionAdd(this.form).then((res) => {
           if (res.data.code == 200) {
             this.dialogVisible = false;
@@ -401,12 +402,11 @@
               title: "成功",
             });
             this.$router.push({
-              path:"/checklistself"
+              path:"/safetyproduction/safetyproduction/checklistself"
             });
           }
         });
       } else if (this.id == "编辑") {
-        console.log('编辑',this.form)
         safetySelfInspectionMod(this.form).then((res) => {
           this.dialogVisible = false;
           this.$notify({
@@ -417,7 +417,7 @@
           });
         });
          this.$router.push({
-              path:"/checklistself"
+              path:"/safetyproduction/safetyproduction/checklistself"
             });
       }
          }
@@ -441,7 +441,7 @@
 }
 .box-left {
   width: 20%;
-  min-height: 800px;
+  min-height: 850px;
   background-color: white;
   border-radius: 5px;
 }
@@ -453,6 +453,8 @@
   width: 79%;
   background-color: white;
   border-radius: 5px;
+  height: 850px;
+  overflow-y:overlay;
 }
 .title {
   font-size: 16px;
@@ -474,4 +476,7 @@
   background-color: #034ea2;
   border: 1px solid #034ea2;
 }
+.box-right /deep/ .el-table__expanded-cell{
+  background-color: #fff !important;
+}
 </style>

--
Gitblit v1.9.2