From 7f9eb61d710569dd01daf33dfe88cbc2c30947e9 Mon Sep 17 00:00:00 2001
From: songhuangfeng123 <shf18767906695@163.com>
Date: 星期五, 01 四月 2022 10:32:21 +0800
Subject: [PATCH] fix
---
src/views/safetyproduction/gojudging.vue | 8 ++--
src/views/safetyproduction/checklistself.vue | 21 ++++++++--
src/views/safetyproduction/new.vue | 43 ++++++++-------------
src/views/safetyproduction/checklist.vue | 6 +-
4 files changed, 40 insertions(+), 38 deletions(-)
diff --git a/src/views/safetyproduction/checklist.vue b/src/views/safetyproduction/checklist.vue
index 91e3c2b..9dc6c1b 100644
--- a/src/views/safetyproduction/checklist.vue
+++ b/src/views/safetyproduction/checklist.vue
@@ -435,9 +435,6 @@
}
},
coAdd(val, type) {
- this.$nextTick(() => {
- this.$refs["form"].clearValidate();
- });
this.titleN = type;
if (type == "新增") {
this.dialogVisible = true;
@@ -452,6 +449,9 @@
);
this.formInline=JSON.parse(JSON.stringify(val));
}
+ this.$nextTick(() => {
+ this.$refs["form"].clearValidate();
+ });
},
listAdd() {
this.$refs["form"].validate((valid) => {
diff --git a/src/views/safetyproduction/checklistself.vue b/src/views/safetyproduction/checklistself.vue
index dc7b8f3..8445c00 100644
--- a/src/views/safetyproduction/checklistself.vue
+++ b/src/views/safetyproduction/checklistself.vue
@@ -12,7 +12,7 @@
<el-date-picker
v-model="listQuery.filter.inspectionStartTime"
type="date"
- format="yyyy 年 MM 月 dd 日"
+ format="yyyy 年 MM 月 dd 日"
placeholder="选择日期"
>
</el-date-picker>
@@ -23,7 +23,7 @@
<el-input v-model="listQuery.filter.inspectorName"></el-input>
</el-form-item>
</el-col>
- <el-col :span="4" style="text-align: center">
+ <el-col :span="8" style="text-align: center">
<el-button
type="primary"
icon="el-icon-search"
@@ -38,6 +38,12 @@
@click="jump()"
>新增</el-button
>
+ <el-button
+ type="primary"
+ class="btns"
+ @click="resetPage()"
+ >重置</el-button
+ >
</el-col>
</el-row>
</el-form>
@@ -105,7 +111,7 @@
status: "",
},
pageIndex: 1,
- pageSize: 5,
+ pageSize: 10,
},
list: [],
pageSize: 10,
@@ -117,6 +123,13 @@
this.safetySelfInspectionL();
},
methods: {
+ resetPage(){
+ this.listQuery.filter={}
+ this.listQuery.pageIndex=1
+ this.listQuery.pageSize=10
+ this.safetySelfInspectionL();
+ },
+
async safetySelfInspectionL() {
var res = await safetySelfInspectionList(this.listQuery).then((res) => {
if (res.data.code == 200) {
@@ -191,4 +204,4 @@
background-color: #034ea2;
border: 1px solid #034ea2;
}
-</style>
\ No newline at end of file
+</style>
diff --git a/src/views/safetyproduction/gojudging.vue b/src/views/safetyproduction/gojudging.vue
index 1f376a2..f0947c3 100644
--- a/src/views/safetyproduction/gojudging.vue
+++ b/src/views/safetyproduction/gojudging.vue
@@ -41,10 +41,10 @@
<el-table-column align="center" label="评审结果">
<template slot-scope="scope">
<span v-if="(scope.row.safetyInspectionItemResult== 0)"
- >是</span
+ >否决</span
>
<span v-if="(scope.row.safetyInspectionItemResult == 1)"
- >否</span
+ >扣分</span
>
</template>
</el-table-column>
@@ -72,7 +72,7 @@
</template>
</el-table-column>
<el-table-column
- prop=""
+ prop="remark"
align="center"
label="备注"
></el-table-column>
@@ -195,4 +195,4 @@
.titles {
font-size: 14px;
}
-</style>
\ No newline at end of file
+</style>
diff --git a/src/views/safetyproduction/new.vue b/src/views/safetyproduction/new.vue
index 0ab20d8..6d0496c 100644
--- a/src/views/safetyproduction/new.vue
+++ b/src/views/safetyproduction/new.vue
@@ -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() {
@@ -373,9 +361,6 @@
}
},
open(type) {
- this.$nextTick(() => {
- this.$refs["form"].clearValidate();
- });
this.dialogVisible = true;
this.form.status = type;
var arr = [];
@@ -392,6 +377,10 @@
}
});
},
+ closeDialog(){
+ this.dialogVisible = false
+ console.log(123,this.form)
+ },
addC() {
this.$refs["form"].validate((valid) => {
if (valid) {
@@ -478,4 +467,4 @@
background-color: #034ea2;
border: 1px solid #034ea2;
}
-</style>
\ No newline at end of file
+</style>
--
Gitblit v1.9.2