From f8cb4519363640a36cf5c5818f7f647ad13b507f Mon Sep 17 00:00:00 2001
From: lyfO_o <764716047@qq.com>
Date: Sat, 02 Apr 2022 10:29:24 +0800
Subject: [PATCH] Merge remote-tracking branch 'remotes/origin/shf' into master

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

diff --git a/src/views/safetyproduction/new.vue b/src/views/safetyproduction/new.vue
index 9ad7b6f..0ab20d8 100644
--- a/src/views/safetyproduction/new.vue
+++ b/src/views/safetyproduction/new.vue
@@ -15,7 +15,7 @@
           ></el-tree>
         </div>
       </div>
-      <div class="box-right" v-if="list == '' ? false : true">
+      <div class="box-right" v-if="lists == '' ? false : true">
         <div class="btns">
           <el-button type="primary" class="btn" @click="open(0)"
             >添加</el-button
@@ -24,7 +24,7 @@
             >暂存</el-button
           >
         </div>
-        <div v-for="(item, i) in lists" :key="i">
+        <div v-for="(item, i) in lists" :key="i" style="padding:0 0 20px 0">
           <div class="title">
             A级要素：<span>{{ item.elementAName }}</span>
           </div>
@@ -33,9 +33,9 @@
               <el-col :span="6" :offset="1"
                 ><p><span>B级要素：</span>{{ item.elementBName }}</p></el-col
               >
-              <el-col :span="6" :offset="4"
+              <!-- <el-col :span="6" :offset="4"
                 ><p><span>得分：</span>50</p></el-col
-              >
+              > -->
             </el-row>
             <el-row>
               <el-col :span="22" :offset="1">
@@ -112,12 +112,12 @@
         </div>
       </div>
     </div>
-    <el-dialog title="添加" :visible.sync="dialogVisible" :close-on-click-modal="false" width="30%">
-      <el-form ref="form" :model="form" label-width="100px">
-        <el-form-item label="自查清单名称">
+    <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-input v-model="form.inspectionName"></el-input>
         </el-form-item>
-        <el-form-item label="检查人名称">
+        <el-form-item label="检查人名称" prop="type">
           <el-select
             v-model="form.inspector"
             style="width: 100%"
@@ -132,7 +132,7 @@
             </el-option>
           </el-select>
         </el-form-item>
-        <el-form-item label="时间">
+        <el-form-item label="时间" prop="time">
           <el-col :span="11">
             <el-date-picker
               type="date"
@@ -199,6 +199,18 @@
         label: "label",
       },
       itemId: "",
+       parent: [],
+          rules: {
+        name: [
+          { required: true, message: "要素名称不能为空", trigger: "change" },
+        ],
+          type: [
+          { required: true, message: "级别不能为空", trigger: "change" },
+        ],
+         time: [
+          { required: true, message: "父要素不能为空", trigger: "change" },
+        ]
+      },
     };
   },
   created() {
@@ -212,7 +224,6 @@
       safetySelfInspectionInfo({ id: id }).then((res) => {
         if (res.data.code == 200) {
           this.form = res.data.result;
-          console.log(res.data.result);
           this.list = res.data.result;
           var trees = [];
           for (var i = 0; i < this.list.itemList.length; i++) {
@@ -232,11 +243,9 @@
               cser.push(capB)
               }
               arr[i].id=cser
-            console.log('tag', capB)
             arr[i].child = this.checkSameData(arr[i].child);
           }
           this.lists = arr;
-          console.log(this.lists);
         }
       });
     },
@@ -281,6 +290,7 @@
           }
         } else if (this.id == "编辑") {
           this.list = res.data.result;
+          if(this.list.length!=0){
           var capA = { elementAName: "", id: [], child: [] };
           var atte = [];
           capA.elementAName = this.list[0].elementAName;
@@ -307,6 +317,7 @@
             );
             this.lists.splice(i, 1);
           }
+        }
         }
       });
     },
@@ -362,10 +373,12 @@
       }
     },
     open(type) {
+          this.$nextTick(() => {
+        this.$refs["form"].clearValidate();
+      });
       this.dialogVisible = true;
       this.form.status = type;
       var arr = [];
-      console.log("数据", this.lists);
       for (var i = 0; i < this.lists.length; i++) {
         this.lists[i].id;
         for (var j = 0; j < this.lists[i].id.length; j++) {
@@ -380,6 +393,8 @@
       });
     },
     addC() {
+       this.$refs["form"].validate((valid) => {
+        if (valid) {
       if (this.id == "添加") {
         safetySelfInspectionAdd(this.form).then((res) => {
           if (res.data.code == 200) {
@@ -409,6 +424,8 @@
               path:"/checklistself"
             });
       }
+         }
+      });
     },
     btnsQX() {
       this.show = true;

--
Gitblit v1.9.2