From c181527b88758cec56479f2076f06c8df9dd45c6 Mon Sep 17 00:00:00 2001
From: lyfO_o <764716047@qq.com>
Date: 星期一, 30 五月 2022 15:11:28 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/master' into master
---
src/views/doublePreventAction/hiddenDanger/hiddenDangerReform/report/components/reportDialog.vue | 80 +++++++++++++++++++++------------------
1 files changed, 43 insertions(+), 37 deletions(-)
diff --git a/src/views/doublePreventAction/hiddenDanger/hiddenDangerReform/report/components/reportDialog.vue b/src/views/doublePreventAction/hiddenDanger/hiddenDangerReform/report/components/reportDialog.vue
index 60efbd7..649f583 100644
--- a/src/views/doublePreventAction/hiddenDanger/hiddenDangerReform/report/components/reportDialog.vue
+++ b/src/views/doublePreventAction/hiddenDanger/hiddenDangerReform/report/components/reportDialog.vue
@@ -1,11 +1,7 @@
<template>
- <el-dialog title="新增" :visible.sync="dialogFormVisible"
- :modal-append-to-body="false" :close-on-click-modal="false" width="800px">
- <el-form ref="dataForm" :rules="dataFormRules" :model="dataForm" label-position="right" label-width="140px"
- style="" element-loading-text="保存中...">
-
-
- <el-form-item label="隐患级别：">
+ <el-dialog title="新增" :visible.sync="dialogFormVisible" :close-on-click-modal="false" width="800px">
+ <el-form ref="dataForm" :rules="dataFormRules" :model="dataForm" label-position="right" label-width="140px" style="" element-loading-text="保存中...">
+ <el-form-item label="隐患级别：" prop="level">
<el-select v-model="dataForm.level" placeholder="请选择" :disabled="isView">
<el-option
v-for="item in levels"
@@ -16,7 +12,7 @@
</el-select>
</el-form-item>
- <el-form-item label="选择整改人：">
+ <el-form-item label="选择整改人：" prop="rectifier">
<el-input v-model="dataForm.rectifier" readonly style="width: 205px" placeholder="请选择" >
</el-input>
@@ -25,7 +21,7 @@
</el-button>
</el-form-item>
- <el-form-item label="整改措施：" >
+ <el-form-item label="整改措施：" prop="rectifymeasure">
<el-input
style="width: 400px"
type="textarea"
@@ -35,7 +31,7 @@
v-model="dataForm.rectifymeasure">
</el-input>
</el-form-item>
- <el-form-item label="整改期限 ：" >
+ <el-form-item label="整改期限：" prop="rectifydeadline">
<el-date-picker
v-model="dataForm.rectifydeadline"
type="datetime"
@@ -45,7 +41,7 @@
placeholder="选择日期时间">
</el-date-picker>
</el-form-item>
- <el-form-item label="上报说明：" >
+ <el-form-item label="上报说明：" prop="note">
<el-input
style="width: 400px"
type="textarea"
@@ -128,8 +124,14 @@
note: '',
level:''
},
+ dataFormRules:{
+ level: [{ required: true, message: '隐患级别不能为空', trigger: 'change' }],
+ rectifier: [{ required: true, message: '整改人不能为空', trigger: 'change' }],
+ rectifymeasure: [{ required: true, message: '整改措施不能为空', trigger: 'blur' }],
+ rectifydeadline: [{ required: true, message: '整改期限不能为空', trigger: 'change' }],
+ note: [{ required: true, message: '上报说明不能为空', trigger: 'blur' }],
+ },
dialogFormVisible: false,
- dataFormRules: {},
isView:false,
}
},
@@ -153,20 +155,20 @@
this.resetDataForm()
},
trigger2Submit(){
- this.submiting = true
- let formData = new FormData()
- formData.append('rectifier', this.dataForm.rectifier)
- formData.append("rectifierid",this.dataForm.rectifierid)
- formData.append("level",this.dataForm.level)
- formData.append("rectifymeasure",this.dataForm.rectifymeasure)
- formData.append("rectifydeadline",this.dataForm.rectifydeadline)
- formData.append("note",this.dataForm.note)
- this.fileList.forEach(file=>{
- formData.append("files",file.raw)
- })
-
- hiddenDangerReport(formData)
- .then(res=>{
+ this.$refs["dataForm"].validate(valid =>{
+ if(valid){
+ this.submiting = true
+ let formData = new FormData()
+ formData.append('rectifier', this.dataForm.rectifier)
+ formData.append("rectifierid",this.dataForm.rectifierid)
+ formData.append("level",this.dataForm.level)
+ formData.append("rectifymeasure",this.dataForm.rectifymeasure)
+ formData.append("rectifydeadline",this.dataForm.rectifydeadline)
+ formData.append("note",this.dataForm.note)
+ this.fileList.forEach(file=>{
+ formData.append("files",file.raw)
+ })
+ hiddenDangerReport(formData).then(res=>{
if (res.data.code === '200') {
this.dialogFormVisible = false
this.$message({
@@ -181,18 +183,22 @@
});
}
this.fileList = []
- }
- )
- .catch(err=>{
- console.log(err)
+ }).catch(err=>{
+ console.log(err)
+ this.$message({
+ message: "接口错误,请联系管理员",
+ type: 'warning'
+ });
+ }).finally(()=>{
+ this.submiting = false
+ })
+ }else{
this.$message({
- message: "接口错误,请联系管理员",
- type: 'warning'
- });
- })
- .finally(()=>{
- this.submiting = false
- })
+ type:'warning',
+ message:'请完善基本信息'
+ })
+ }
+ })
},
showPersonSelect(){
--
Gitblit v1.9.2