1、隐患整改中临时安全措施bug修复

hyx_2024-11-12_newInspect
fufeifei 2024-11-11 18:13:01 +08:00
parent 2388ecf612
commit e5dba3b4d0
2 changed files with 15 additions and 9 deletions

View File

@ -33,7 +33,7 @@
<el-form-item :rules="form.IS_NORMAL =='1' ?formRule.RECTIFICATIONTIME:[{required: false}]" label="整改时间" prop="RECTIFICATIONTIME">
<el-date-picker v-model="form.RECTIFICATIONTIME" value-format="yyyy-MM-dd HH:mm:ss" type="datetime" placeholder="选择日期" />
</el-form-item>
<el-form-item :rules="DAYNUM >= 1 ?formRule.TEMPORARY_SAFE_MEASURE:[{required: false}]" label="临时安全措施" label-width="110px" prop="TEMPORARY_SAFE_MEASURE" >
<el-form-item :rules="DAYNUM >= 1 ?formRule.TEMPORARY_SAFE_MEASURE:[{required: false}]" label="临时安全措施" prop="TEMPORARY_SAFE_MEASURE" >
<el-input :rows="3" v-model="form.TEMPORARY_SAFE_MEASURE" type="textarea" placeholder="请在此处输入临时安全措施..."/>
</el-form-item>
<el-form-item :rules="[{required: true}]" label="整改后图片" label-width="100px">
@ -426,7 +426,7 @@ export default {
this.loading = true
if (this.DAYNUM >= 1 && this.form.TEMPORARY_SAFE_MEASURE == '') {
this.$message({
message: '临时安全措施不能为空,请先返回上个页面填写临时安全措施!!!',
message: '请先输入临时安全措施!!!',
type: 'error'
})
this.loading = false

View File

@ -784,14 +784,20 @@ export default {
},
//
AddTempSafeMeasureClick() {
if (!this.addSafeMeasureForm.TEMPORARY_SAFE_MEASURE && this.dayNum >= 1) {
this.$message({
message: '请填写临时安全措施',
type: 'error'
})
this.loading = false
return false
if (!this.addSafeMeasureForm.TEMPORARY_SAFE_MEASURE) {
alert(this.dayNum)
if (this.dayNum >= 1) {
this.$message({
message: '请填写临时安全措施',
type: 'error'
})
this.loading = false
return false
}else {
this.addSafeMeasureForm.TEMPORARY_SAFE_MEASURE = ''
}
}
const loading = this.$loading({
lock: true,
text: '加载中......',