From 1cc4eb09ce38f1f0db114b7d3570f92ceaf1d470 Mon Sep 17 00:00:00 2001
From: lyfO_o <764716047@qq.com>
Date: 星期三, 06 四月 2022 08:51:11 +0800
Subject: [PATCH] Merge remote-tracking branch 'remotes/origin/shf' into master

---
 src/views/safetyproduction/new.vue |   82 +++++++++++++++++++---------------------
 1 files changed, 39 insertions(+), 43 deletions(-)

diff --git a/src/views/safetyproduction/new.vue b/src/views/safetyproduction/new.vue
index 0ab20d8..1b9717b 100644
--- a/src/views/safetyproduction/new.vue
+++ b/src/views/safetyproduction/new.vue
@@ -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,7 @@
                       type="expand"
                     >
                       <template slot-scope="scope">
-                        <el-table :data="scope.row.deductionList">
+                        <el-table :data="scope.row.deductionList"  :cell-style="{background:'#fff',color:'#606266'}">
                           <el-table-column
                             prop="name"
                             align="center"
@@ -77,13 +77,7 @@
                           >
                           </el-table-column>
                           <el-table-column
-                            prop="date"
-                            align="center"
-                            label="扣分"
-                          >
-                          </el-table-column>
-                          <el-table-column
-                            prop="date"
+                            prop="remark"
                             align="center"
                             label="扣分备注"
                           >
@@ -114,10 +108,10 @@
     </div>
     <el-dialog :title="id" :visible.sync="dialogVisible" :close-on-click-modal="false" width="30%">
       <el-form ref="form"  :rules="rules" :model="form" label-width="110px">
-        <el-form-item label="自查清单名称" prop="name">
+        <el-form-item label="自查清单名称" prop="inspectionName">
           <el-input v-model="form.inspectionName"></el-input>
         </el-form-item>
-        <el-form-item label="检查人名称" prop="type">
+        <el-form-item label="检查人名称" prop="inspector">
           <el-select
             v-model="form.inspector"
             style="width: 100%"
@@ -132,11 +126,11 @@
             </el-option>
           </el-select>
         </el-form-item>
-        <el-form-item label="时间" prop="time">
+        <el-form-item label="时间" prop="inspectionTime">
           <el-col :span="11">
             <el-date-picker
               type="date"
-              format="yyyy 年 MM 月 dd 日"
+              value-format="yyyy-MM-dd"
               placeholder="开始时间"
               v-model="form.inspectionTime"
               style="width: 100%"
@@ -154,7 +148,7 @@
         class="dialog-footer"
       >
         <el-button type="primary" class="btn" @click="addC">确 定</el-button>
-        <el-button @click="dialogVisible = false">取 消</el-button>
+        <el-button @click="closeDialog">取 消</el-button>
       </span>
     </el-dialog>
   </div>
@@ -200,21 +194,20 @@
       },
       itemId: "",
        parent: [],
-          rules: {
-        name: [
-          { required: true, message: "要素名称不能为空", trigger: "change" },
-        ],
-          type: [
-          { required: true, message: "级别不能为空", trigger: "change" },
-        ],
-         time: [
-          { required: true, message: "父要素不能为空", trigger: "change" },
-        ]
-      },
+        rules: {
+            inspectionName: [{required: true, message: '自查清单名称不能为空', trigger: 'blur'}],
+            inspector: [{required: true, message: '检查人名称为空', trigger: 'blur'}],
+            inspectionTime: [{required: true, message: '检查时间不能为空', trigger: 'blur'}],
+        },
     };
   },
   created() {
     this.TreeA();
+      safetyInspectionItemName().then((res) => {
+        if (res.data.code == 200) {
+          this.nameList = res.data.result;
+        }
+      });
     this.id = this.$route.query.name;
     this.itemId = this.$route.query.id;
     this.itemInfo(this.$route.query.id);
@@ -230,14 +223,14 @@
             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 capB = {
+            var cser=[]
+              for(var j=0;j<arr[i].child.length;j++){ 
+             var capB = {
                 safetySelfInspectionId: "",
                 safetyInspectionItemId: "",
               }
-              var cser=[]
-              for(var j=0;j<arr[i].child.length;j++){
               capB.safetySelfInspectionId=arr[i].child[j].safetySelfInspectionId
               capB.safetyInspectionItemId=arr[i].child[j].safetyInspectionItemId
               cser.push(capB)
@@ -258,7 +251,7 @@
     },
     TreeB(id) {
       safetyInspectionItemTreeB({ id: id }).then((res) => {
-        this.list = [];
+        // this.list = [];
         if (this.id == "添加") {
           if (res.data.code == 200) {
             this.list = res.data.result;
@@ -293,9 +286,10 @@
           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 = {
+               var capB = {
               safetySelfInspectionId: "",
               safetyInspectionItemId: "",
             };
@@ -360,42 +354,43 @@
         this.$router.push({
           path: "/reviewXG",
           query: {
-            id: data.safetyInspectionItemId,
+            idX: data.safetyInspectionItemId,
+            name:this.id,
+            id:this.itemId 
           },
         });
       } else {
         this.$router.push({
           path: "/reviewXG",
           query: {
-            id: data.id,
+            idX: data.id,
+            name:this.id,
+            id:this.itemId 
           },
         });
       }
     },
     open(type) {
-          this.$nextTick(() => {
-        this.$refs["form"].clearValidate();
-      });
       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;
+        // this.lists[i].id;
         for (var j = 0; j < this.lists[i].id.length; j++) {
           arr.push(this.lists[i].id[j]);
         }
       }
       this.form.itemList = arr;
-      safetyInspectionItemName().then((res) => {
-        if (res.data.code == 200) {
-          this.nameList = res.data.result;
-        }
-      });
     },
+      closeDialog(){
+        this.dialogVisible = false
+      },
     addC() {
        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;
@@ -411,6 +406,7 @@
           }
         });
       } else if (this.id == "编辑") {
+        console.log('编辑',this.form)
         safetySelfInspectionMod(this.form).then((res) => {
           this.dialogVisible = false;
           this.$notify({
@@ -478,4 +474,4 @@
   background-color: #034ea2;
   border: 1px solid #034ea2;
 }
-</style>
\ No newline at end of file
+</style>

--
Gitblit v1.9.2