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 |   24 +++++++++++-------------
 1 files changed, 11 insertions(+), 13 deletions(-)

diff --git a/src/views/safetyproduction/new.vue b/src/views/safetyproduction/new.vue
index 5173eec..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>
@@ -225,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)
@@ -288,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 = {
@@ -358,7 +359,7 @@
           query: {
             idX: data.safetyInspectionItemId,
             name:this.id,
-            id:this.itemId 
+            id:this.itemId
           },
         });
       } else {
@@ -367,7 +368,7 @@
           query: {
             idX: data.id,
             name:this.id,
-            id:this.itemId 
+            id:this.itemId
           },
         });
       }
@@ -375,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;
@@ -392,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;
@@ -403,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({
@@ -419,7 +417,7 @@
           });
         });
          this.$router.push({
-              path:"/checklistself"
+              path:"/safetyproduction/safetyproduction/checklistself"
             });
       }
          }
@@ -478,7 +476,7 @@
   background-color: #034ea2;
   border: 1px solid #034ea2;
 }
-/deep/ .el-table__expanded-cell{
+.box-right /deep/ .el-table__expanded-cell{
   background-color: #fff !important;
 }
 </style>

--
Gitblit v1.9.2