From 1fce0b643b1b8bd5d443efb3ff0074caab3c5dba Mon Sep 17 00:00:00 2001
From: shj <1790240199@qq.com>
Date: Thu, 31 Mar 2022 17:07:56 +0800
Subject: [PATCH] Merge branch 'shf' of https://sinanoaq.cn:8888/r/ztqt into shf

---
 src/views/safetyproduction/checklist.vue |   28 +++++++++++++++++++---------
 1 files changed, 19 insertions(+), 9 deletions(-)

diff --git a/src/views/safetyproduction/checklist.vue b/src/views/safetyproduction/checklist.vue
index 31bad5e..64deeee 100644
--- a/src/views/safetyproduction/checklist.vue
+++ b/src/views/safetyproduction/checklist.vue
@@ -16,7 +16,7 @@
               </el-col>
               <el-col :span="11" :offset="1" style="white-space: nowrap">
                 <el-form-item size="mini">
-                  <el-button type="primary" class="btns" @click="find" size="mini"
+                  <el-button type="primary" class="btns"  size="mini"
                     >搜索</el-button
                   >
                   <el-button
@@ -266,9 +266,9 @@
       </div>
     </div>
 
-    <el-dialog :title="titleN" :visible.sync="dialogVisible" width="30%">
-      <el-form ref="form" :model="formInline" label-width="80px">
-        <el-form-item label="名称">
+    <el-dialog :title="titleN" :visible.sync="dialogVisible" :close-on-click-modal="false" width="30%">
+      <el-form ref="form" :rules="rules" :model="formInline" label-width="80px">
+        <el-form-item label="名称" prop="name">
           <el-input v-model="formInline.name"></el-input>
         </el-form-item>
         <el-form-item label="说明">
@@ -280,7 +280,7 @@
         </el-form-item>
       </el-form>
       <span slot="footer" class="dialog-footer">
-        <el-button @click="dialogVisible = false">取 消</el-button>
+        <el-button @click="listCel">取 消</el-button>
         <el-button type="primary" class="btns" @click="listAdd"
           >确 定</el-button
         >
@@ -336,6 +336,10 @@
         children: "children",
         label: "label",
       },
+        rules: {
+        name: [
+          { required: true, message: "名称不能为空", trigger: "change" },
+        ],}
     };
   },
   created() {
@@ -353,15 +357,12 @@
       },
     beforTree() {
       safetyInspectionItemTree().then((res) => {
-        console.log(res);
         this.tree = res.data.result;
       });
     },
     safetyInspectionItemL(data) {
-      // console.log(data)
       this.listQuery.filter.elementB = data.value;
       safetyInspectionItemList(this.listQuery).then((res) => {
-        // console.log(res.data.result.records);
         this.list = res.data.result.records;
       });
     },
@@ -382,7 +383,6 @@
       } else {
         this.disabled = true;
         var i = this.list.findIndex((item) => item.id == id);
-        console.log(id);
         this.form = this.list[i];
       }
     },
@@ -435,6 +435,9 @@
       }
     },
     coAdd(val, type) {
+       this.$nextTick(() => {
+        this.$refs["form"].clearValidate();
+      });
       this.titleN = type;
       if (type == "新增") {
         this.dialogVisible = true;
@@ -451,6 +454,8 @@
       }
     },
     listAdd() {
+        this.$refs["form"].validate((valid) => {
+        if (valid) {
       if (this.titleN == "新增") {
         this.form.deductionList.push(this.formInline);
         this.dialogVisible = false;
@@ -459,6 +464,8 @@
         this.form.deductionList[this.index].space = this.formInline.space;
         this.dialogVisible = false;
       }
+         }
+      });
     },
     listDel(val) {
       var i = this.form.deductionList.findIndex(
@@ -481,6 +488,9 @@
         }
       });
     },
+    listCel(){
+      this.dialogVisible = false;
+    },
     btnsQX() {
       this.show = true;
     },

--
Gitblit v1.9.2