From f877ea29a3363133b7dc30d8adc477544a1eaf7f Mon Sep 17 00:00:00 2001
From: cqf <2252655793@qq.com>
Date: 星期四, 26 五月 2022 14:21:58 +0800
Subject: [PATCH] 文件名称如果不以a62b结尾,补上a62b

---
 src/views/safetyproduction/checklist.vue |  112 ++++++++++++++++++++++++++++++++++++++++++++------------
 1 files changed, 88 insertions(+), 24 deletions(-)

diff --git a/src/views/safetyproduction/checklist.vue b/src/views/safetyproduction/checklist.vue
index 31bad5e..1010be4 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
@@ -64,18 +64,69 @@
             >
           </el-row>
           <el-row>
-            <el-col :span="2"><p class="title">企业达标标准:</p></el-col>
-            <el-col :span="9"
+            <el-col :span="2"><p class="titles">企业达标标准:</p></el-col>
+            <el-col :span="22"
               ><p class="title-type">
                 {{ item.enterpriseStandard }}
               </p></el-col
             >
-            <el-col :span="2" :offset="1"
-              ><p class="title">评审方法:</p></el-col
+            <!-- <el-col :span="2" :offset="1"
+              ><p class="titles">评审方法:</p></el-col
             >
             <el-col :span="10"
               ><p class="title-type">
                 {{ item.reviewMethod }}
+              </p></el-col
+            > -->
+          </el-row>
+            <el-row>
+            <!-- <el-col :span="2"><p class="titles">企业达标标准:</p></el-col>
+            <el-col :span="9"
+              ><p class="title-type">
+                {{ item.enterpriseStandard }}
+              </p></el-col
+            > -->
+            <el-col :span="2"
+              ><p class="titles">评审方法:</p></el-col
+            >
+            <el-col :span="22"
+              ><p class="title-type">
+                {{ item.reviewMethod }}
+              </p></el-col
+            >
+          </el-row>
+          <el-row>
+            <el-col :span="2"><p class="titles">否决项:</p></el-col>
+            <el-col :span="22"
+              ><p class="title-type">
+                {{ item.veto }}
+              </p></el-col
+            >
+            <!-- <el-col :span="2" :offset="1"
+              ><p class="titles">扣分项:</p></el-col
+            >
+            <el-col :span="10"
+              ><p class="title-type">
+                {{ item.deductionList}}
+              </p></el-col
+            > -->
+          </el-row>
+             <el-row>
+            <!-- <el-col :span="2"><p class="titles">否决项:</p></el-col>
+            <el-col :span="9"
+              ><p class="title-type">
+                {{ item.veto }}
+              </p></el-col
+            > -->
+            <el-col :span="2"
+              ><p class="titles">扣分项:</p></el-col
+            >
+            <el-col :span="22"
+              ><p class="title-type">
+                <!-- {{ item.deductionList}} -->
+                <span style="line-height:20px" v-for="(item,index) in item.deductionList" :key="index">
+                  {{item.name}}
+                </span>
               </p></el-col
             >
           </el-row>
@@ -147,7 +198,6 @@
                     v-model="form.standardizationRequirements"
                     placeholder=""
                     maxlength="250"
-                    show-word-limit
                   ></el-input>
                 </el-form-item>
               </el-col>
@@ -161,7 +211,6 @@
                     v-model="form.enterpriseStandard"
                     placeholder=""
                     maxlength="250"
-                    show-word-limit
                   ></el-input>
                 </el-form-item>
               </el-col>
@@ -175,7 +224,6 @@
                     v-model="form.reviewMethod"
                     placeholder=""
                     maxlength="250"
-                    show-word-limit
                   ></el-input>
                 </el-form-item>
               </el-col>
@@ -192,7 +240,6 @@
                     v-model="form.veto"
                     placeholder=""
                     maxlength="250"
-                    show-word-limit
                   ></el-input>
                 </el-form-item>
               </el-col>
@@ -266,9 +313,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 +327,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 +383,10 @@
         children: "children",
         label: "label",
       },
+        rules: {
+        name: [
+          { required: true, message: "名称不能为空", trigger: "change" },
+        ],}
     };
   },
   created() {
@@ -353,17 +404,17 @@
       },
     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;
-      });
+        if (data.type== 1) {
+            this.listQuery.filter.elementB = data.value;
+            safetyInspectionItemList(this.listQuery).then((res) => {
+                this.list = res.data.result.records;
+                console.log(123,this.list)
+            });
+        }
     },
     safetyInspectionItemC(id, type) {
       this.show = false;
@@ -382,7 +433,6 @@
       } else {
         this.disabled = true;
         var i = this.list.findIndex((item) => item.id == id);
-        console.log(id);
         this.form = this.list[i];
       }
     },
@@ -447,10 +497,15 @@
         this.index = this.form.deductionList.findIndex(
           (item) => item.name == val.name
         );
-        this.formInline = val;
+          this.formInline=JSON.parse(JSON.stringify(val));
       }
+        this.$nextTick(() => {
+            this.$refs["form"].clearValidate();
+        });
     },
     listAdd() {
+        this.$refs["form"].validate((valid) => {
+        if (valid) {
       if (this.titleN == "新增") {
         this.form.deductionList.push(this.formInline);
         this.dialogVisible = false;
@@ -459,6 +514,8 @@
         this.form.deductionList[this.index].space = this.formInline.space;
         this.dialogVisible = false;
       }
+         }
+      });
     },
     listDel(val) {
       var i = this.form.deductionList.findIndex(
@@ -481,6 +538,9 @@
         }
       });
     },
+    listCel(){
+      this.dialogVisible = false;
+    },
     btnsQX() {
       this.show = true;
     },
@@ -499,7 +559,7 @@
 }
 .box-left {
   width: 20%;
-  min-height: 800px;
+  min-height: 850px;
   background-color: white;
   border-radius: 5px;
 }
@@ -510,11 +570,15 @@
   width: 79%;
   background-color: rgb(223, 229, 235);
   border-radius: 5px;
+  height: 850px;
+  overflow-y:overlay;
 }
 .box-rights {
   width: 79%;
   background-color: #fff;
   border-radius: 5px;
+   height: 850px;
+  overflow-y:overlay;
 }
 .box-rightXQ {
   margin-bottom: 10px;
@@ -558,4 +622,4 @@
   background-color: #034ea2;
   border: 1px solid #034ea2;
 }
-</style>
\ No newline at end of file
+</style>

--
Gitblit v1.9.2