From 7f9eb61d710569dd01daf33dfe88cbc2c30947e9 Mon Sep 17 00:00:00 2001
From: songhuangfeng123 <shf18767906695@163.com>
Date: Fri, 01 Apr 2022 10:32:21 +0800
Subject: [PATCH] fix

---
 src/views/safetyproduction/new.vue |   48 +++++++++++++++++-------------------------------
 1 files changed, 17 insertions(+), 31 deletions(-)

diff --git a/src/views/safetyproduction/new.vue b/src/views/safetyproduction/new.vue
index 91e648f..6d0496c 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
@@ -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,17 +194,11 @@
       },
       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() {
@@ -224,7 +212,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++) {
@@ -244,11 +231,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);
         }
       });
     },
@@ -376,9 +361,6 @@
       }
     },
     open(type) {
-          this.$nextTick(() => {
-        this.$refs["form"].clearValidate();
-      });
       this.dialogVisible = true;
       this.form.status = type;
       var arr = [];
@@ -395,6 +377,10 @@
         }
       });
     },
+      closeDialog(){
+        this.dialogVisible = false
+          console.log(123,this.form)
+      },
     addC() {
        this.$refs["form"].validate((valid) => {
         if (valid) {
@@ -481,4 +467,4 @@
   background-color: #034ea2;
   border: 1px solid #034ea2;
 }
-</style>
\ No newline at end of file
+</style>

--
Gitblit v1.9.2