From b274738442b2214c018e9b55f96a226a33c18cbe Mon Sep 17 00:00:00 2001
From: shj <1790240199@qq.com>
Date: 星期三, 06 四月 2022 16:56:43 +0800
Subject: [PATCH] Merge branch 'shf' of https://sinanoaq.cn:8888/r/ztqt into shf
---
src/views/safetyproduction/checklist.vue | 67 +++++++++++++++++++++++----------
1 files changed, 47 insertions(+), 20 deletions(-)
diff --git a/src/views/safetyproduction/checklist.vue b/src/views/safetyproduction/checklist.vue
index 58f8c18..778720d 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
@@ -47,18 +47,18 @@
<el-col :span="2">
<p class="titles">标准化要求：</p>
</el-col>
- <el-col :span="18">
+ <el-col :span="20">
<p class="titles-type">
{{ item.standardizationRequirements }}
</p>
</el-col>
- <el-col :span="2"
+ <el-col :span="1"
><p class="btnXG" @click="safetyInspectionItemC(item.id, '修改')">
修改
</p></el-col
>
- <el-col :span="2"
- ><p class="btnXG" @click="safetyInspectionItemDel(item.id)">
+ <el-col :span="1"
+ ><p class="btnXG" style="color:red;" @click="safetyInspectionItemDel(item.id)">
删除
</p></el-col
>
@@ -76,6 +76,22 @@
<el-col :span="10"
><p class="title-type">
{{ item.reviewMethod }}
+ </p></el-col
+ >
+ </el-row>
+ <el-row>
+ <el-col :span="2"><p class="title">否决项：</p></el-col>
+ <el-col :span="9"
+ ><p class="title-type">
+ {{ item.veto }}
+ </p></el-col
+ >
+ <el-col :span="2" :offset="1"
+ ><p class="title">扣分项：</p></el-col
+ >
+ <el-col :span="10"
+ ><p class="title-type">
+ {{ item.deductionList[index].name}}
</p></el-col
>
</el-row>
@@ -147,7 +163,6 @@
v-model="form.standardizationRequirements"
placeholder=""
maxlength="250"
- show-word-limit
></el-input>
</el-form-item>
</el-col>
@@ -161,7 +176,6 @@
v-model="form.enterpriseStandard"
placeholder=""
maxlength="250"
- show-word-limit
></el-input>
</el-form-item>
</el-col>
@@ -175,7 +189,6 @@
v-model="form.reviewMethod"
placeholder=""
maxlength="250"
- show-word-limit
></el-input>
</el-form-item>
</el-col>
@@ -192,7 +205,6 @@
v-model="form.veto"
placeholder=""
maxlength="250"
- show-word-limit
></el-input>
</el-form-item>
</el-col>
@@ -266,9 +278,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 +292,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 +348,10 @@
children: "children",
label: "label",
},
+ rules: {
+ name: [
+ { required: true, message: "名称不能为空", trigger: "change" },
+ ],}
};
},
created() {
@@ -353,16 +369,14 @@
},
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;
+ console.log("xxx",this.list)
});
},
safetyInspectionItemC(id, type) {
@@ -382,7 +396,6 @@
} else {
this.disabled = true;
var i = this.list.findIndex((item) => item.id == id);
- console.log(id);
this.form = this.list[i];
}
},
@@ -447,10 +460,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 +477,8 @@
this.form.deductionList[this.index].space = this.formInline.space;
this.dialogVisible = false;
}
+ }
+ });
},
listDel(val) {
var i = this.form.deductionList.findIndex(
@@ -481,6 +501,9 @@
}
});
},
+ listCel(){
+ this.dialogVisible = false;
+ },
btnsQX() {
this.show = true;
},
@@ -499,7 +522,7 @@
}
.box-left {
width: 20%;
- min-height: 800px;
+ min-height: 850px;
background-color: white;
border-radius: 5px;
}
@@ -510,11 +533,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 +585,4 @@
background-color: #034ea2;
border: 1px solid #034ea2;
}
-</style>
\ No newline at end of file
+</style>
--
Gitblit v1.9.2