Compare commits

..

No commits in common. "eb042f811642c84656a1f566df1ae259e12a77fb" and "565df5ed49d0e105087adc6ddeb2eac052a42a07" have entirely different histories.

3 changed files with 5 additions and 84 deletions

View File

@ -208,9 +208,9 @@
</el-dialog> </el-dialog>
<!-- 打回 --> <!-- 打回 -->
<el-dialog :visible.sync="hitBack" title="打回" width="80%"> <el-dialog :visible.sync="hitBack" title="打回" width="80%">
<el-form ref="form" :rules="rules"> <el-form>
<el-form-item label="说明" prop="hitBackReason" > <el-form-item label="说明" >
<el-input v-model="hitBackReason" clearable autocomplete="off"/> <el-input v-model="hitBackReason" autocomplete="off"/>
</el-form-item> </el-form-item>
</el-form> </el-form>
<div slot="footer" class="dialog-footer"> <div slot="footer" class="dialog-footer">
@ -272,14 +272,10 @@ export default {
disabledDate(time) { disabledDate(time) {
return time.getTime() > Date.now() // -8.64e7 return time.getTime() > Date.now() // -8.64e7
} }
},
rules: {
hitBackReason: [
{ required: true, message: '请输入打回说明', trigger: 'blur' }
]
} }
} }
}, },
created() { created() {
this.FIRE_CHECK_ID = this.$parent.FIRE_CHECK_ID this.FIRE_CHECK_ID = this.$parent.FIRE_CHECK_ID
this.FIRE_RECORD_ID = this.$parent.FIRE_RECORD_ID this.FIRE_RECORD_ID = this.$parent.FIRE_RECORD_ID

View File

@ -103,7 +103,7 @@
<td class="tbg">整改类型</td> <td class="tbg">整改类型</td>
<td> <td>
<template> <template>
{{ pd.RECTIFICATIONTYPE === '1' ? '限期整改' : '立即整改' }} 限期整改
</template> </template>
</td> </td>
</tr> </tr>

View File

@ -361,7 +361,6 @@
<div class="ui-height" /> <div class="ui-height" />
<div v-loading="loading" class="ui-foot"> <div v-loading="loading" class="ui-foot">
<el-button type="primary" @click="confirm"> </el-button> <el-button type="primary" @click="confirm"> </el-button>
<el-button type="success" @click="staging"> </el-button>
<el-button @click="goBack"> </el-button> <el-button @click="goBack"> </el-button>
</div> </div>
</div> </div>
@ -1142,80 +1141,6 @@ export default {
this.form.CONFIRM_MESSAGE_SIGN = information.INSPECTION_USER_SIGN_IMG this.form.CONFIRM_MESSAGE_SIGN = information.INSPECTION_USER_SIGN_IMG
this.form.CONFIRM_MESSAGE_TIME = information.INSPECTION_USER_SIGN_TIME this.form.CONFIRM_MESSAGE_TIME = information.INSPECTION_USER_SIGN_TIME
this.$forceUpdate() this.$forceUpdate()
},
/**
* 暂存
*/
staging() {
let flag = false
this.form.situationList.forEach(item => {
if (!this.validStr(item.SITUATION)) {
flag = true
return
}
})
if (flag) {
this.$message({
message: '检查情况不能为空',
type: 'warning'
})
return false
}
flag = false
this.form.inspectorList.forEach(item => {
if (!this.validStr(item.INSPECTION_USER_ID)) {
flag = true
return
}
})
if (flag) {
this.$message({
message: '检查人员不能为空',
type: 'warning'
})
return false
}
this.$refs.form.validate(valid => {
if (valid) {
const loading = this.$loading({
lock: true,
text: '数据保存中...',
spinner: 'el-icon-loading',
background: 'rgba(0, 0, 0, 0.7)'
})
// console.info(this.form.hiddenList[index])
this.$set(this.form, 'INSPECTORJSON', JSON.stringify(this.form.inspectorList))
this.$set(this.form, 'SITUATIONJSON', JSON.stringify(this.form.situationList))
this.$set(this.form, 'HIDDENJSON', JSON.stringify(this.form.hiddenList))
this.$set(this.form, 'delInspectors', this.delInspectors.join(','))
this.$set(this.form, 'delSituations', this.delSituations.join(','))
this.$set(this.form, 'delHiddens', this.delHiddens.join(','))
this.$set(this.form, 'delHiddenFiles', this.delHiddenFiles.join(','))
this.listLoading = true
requestFN(
'/safetyenvironmental/' + this.dialogType,
{ ...this.form, INSPECTION_STATUS: '99' }
).then((data) => {
for (let i = 0; i < data.pd.hiddenList.length; i++) {
this.uploadImg(this.hdFile[i]['fileHdImgList'], data.pd.hiddenList[i].HIDDEN_ID)
this.uploadVideo(this.hdFile[i]['fileVideoList'], data.pd.hiddenList[i].HIDDEN_ID)
}
this.$message({
message: '保存成功',
type: 'success'
})
this.listLoading = false
loading.close()
this.goBack()
}).catch((e) => {
this.listLoading = false
loading.close()
})
} else {
return false
}
})
} }
} }
} }