guoyuepeng
/
qa-prevention-gwj-vue
1
0
Fork 3
Code Issues Pull Requests 1 Packages Projects Releases Wiki Activity

1、隐患整改中添加临时安全措施

hyx_2024-11-12_newInspect
fufeifei 2024-11-01 16:30:20 +08:00
parent 3939ff0487
commit d2fb289704
3 changed files with 108 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

25
src/views/hidden/rectify/components/change.vue
View File

@ -33,6 +33,9 @@
<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-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">
<el-upload
ref="zhenggaiupload"
@ -192,7 +195,8 @@ export default {
disposalPlan: '', // 无法整改原因
RECTIFYDESCR: '', // 整改描述
INVESTMENT_FUNDS: '', // 投入资金
RECTIFICATIONTIME: ''// 整改时间
RECTIFICATIONTIME: '', // 整改时间
TEMPORARY_SAFE_MEASURE: '' // 临时安全措施
},
rectify_files: [],
hideUpload: false, // 整改照片
@ -215,7 +219,8 @@ export default {
TIMELIMITFOR: [{ required: true, message: '请输入时限要求', trigger: 'blur' }],
JOBREQUIREMENT: [{ required: true, message: '请输入工作要求', trigger: 'blur' }],
OTHERBUSINESS: [{ required: true, message: '请输入其他事项', trigger: 'blur' }],
disposalPlan: [{ required: true, message: '请输入无法整改原因', trigger: 'blur' }]
disposalPlan: [{ required: true, message: '请输入无法整改原因', trigger: 'blur' }],
TEMPORARY_SAFE_MEASURE: [{ required: true, message: '请输入临时安全措施', trigger: 'blur' }]
},
defaultProps: {
value: 'id',
@ -226,7 +231,9 @@ export default {
defaultNodes: [],
ys_userList: [],
other: [], // 其他验收人员
otherUserList: []
otherUserList: [],
DAYNUM: 0,
TEMP_SAFE_MEASURE: ''
}
},
watch: {
@ -273,6 +280,9 @@ export default {
if (data.result == 'success') {
this.data = data
this.pd = data.hidden
this.DAYNUM = Number(this.pd.DAYNUM)
this.form.TEMPORARY_SAFE_MEASURE = this.pd.TEMP_SAFE_MEASURE != undefined ? this.pd.TEMP_SAFE_MEASURE : ''
this.TEMP_SAFE_MEASURE = this.pd.TEMP_SAFE_MEASURE
if (this.pd.HIDDENLEVEL == 'hiddenLevel0002') {
this.getqyData()
}
@ -414,6 +424,14 @@ export default {
},
saveRectify() { // 正常整改
this.loading = true
if (this.DAYNUM >= 1 && this.form.TEMPORARY_SAFE_MEASURE == '') {
this.$message({
message: '临时安全措施不能为空，请先返回上个页面填写临时安全措施！！！',
type: 'error'
})
this.loading = false
return false
}
if (this.$refs.zhenggaiupload.uploadFiles.length < 1) {
this.$message({
message: '请上传整改后照片',
@ -457,6 +475,7 @@ export default {
formdata.append('CHECKDEPT', this.form.DEPARTMENT_ID) // 验收人
formdata.append('CHECKOR', this.form.USER_ID) // 验收部门
formdata.append('OTHER', JSON.stringify(this.other)) // 其他验收人
formdata.append('TEMPORARY_SAFE_MEASURE', this.form.TEMPORARY_SAFE_MEASURE) // 临时安全措施
if (this.form.USER_ID == this.loginUserid) {
this.$message({
message: '验收人和整改人不能是同一个人!',

4
src/views/hiddenApi/publicMethod/detail.vue
View File

@ -116,6 +116,10 @@
<td class="tbg">是否相关方</td>
<td>{{ pd.ISRELEVANT=='1'?'是':'否' }}</td>
</tr>
<tr>
<td class="tbg">临时安全措施</td>
<td>{{ pd.TEMP_SAFE_MEASURE !== undefined ? pd.TEMP_SAFE_MEASURE : '' }}</td>
</tr>
<template v-if="repulsecause">
<tr v-for="item in repulsecause" :key="item.USER_ID">
<td class="tbg">打回原因</td>

83
src/views/hiddenApi/publicMethod/list.vue
View File

@ -179,6 +179,7 @@
<el-table-column prop="" label="操作" width="200" align="center">
<template slot-scope="{row}">
<el-button v-if="hasButtenAllMap.buttenTypeGoView" icon="el-icon-view" size="mini" @click="goView(row.HIDDEN_ID)">查看</el-button>
<el-button v-if="hasButtenAllMap.buttenTypeRectify" type="success" icon="el-icon-document" size="mini" @click="addTempSafeMeasureBtn(row.DAYNUM, row.HIDDEN_ID, row.TEMP_SAFE_MEASURE)">临时安全措施</el-button>
<el-button v-if="hasButtenAllMap.buttenTypeConfirm" :disabled="row.STATE !='-2'" type="success" icon="el-icon-check" size="mini" @click="confirm(row.HIDDEN_ID)">确认</el-button>
<el-button v-if="hasButtenAllMap.buttenTypeRectify" :disabled="!row.STATE =='1' || !row.STATE =='10'" type="danger" icon="el-icon-document" size="mini" @click="goRectify(row.HIDDEN_ID)">整改</el-button>
<el-button v-if="hasButtenAllMap.buttenTypePostpone" :disabled="!((row.STATE =='-1' || row.STATE =='1' || row.STATE =='10') && row.exaCount === 0 )" type="warning" icon="el-icon-document" size="mini" @click="goApplyDelay(row)">申请延期</el-button>
@ -235,6 +236,17 @@
<el-button @click="dialogVisibleshow = false">关 闭</el-button>
</span>
</el-dialog>
<el-dialog :visible.sync="addTempSafeMeasureDialogForm" title="添加临时安全措施" width="600px">
<el-form ref="AddTempSafeMeasureForm" :model="addSafeMeasureForm" :rules="rules" label-width="110px" style="width: 500px;">
<el-form-item :rules="dayNum >= 1 ?addSafeMeasureFormRule.TEMPORARY_SAFE_MEASURE:[{required: false}]" label="临时安全措施" label-width="110px" prop="TEMPORARY_SAFE_MEASURE" >
<el-input :rows="9" v-model="addSafeMeasureForm.TEMPORARY_SAFE_MEASURE" type="textarea" placeholder="请在此处输入临时安全措施..."/>
</el-form-item>
</el-form>
<div slot="footer" class="dialog-footer">
<el-button @click="addTempSafeMeasureDialogForm = false">取 消</el-button>
<el-button type="primary" @click="AddTempSafeMeasureClick">确 定</el-button>
</div>
</el-dialog>
<div v-if="dialogdProgress" class="mark"><dProgress :percentage ="percentageVar" ptype="circle" /></div>
<!-- <el-dialog v-if="dialogdProgress" :visible.sync="dialogdProgress" width="70%" height="70%" >-->
<!-- <dProgress :percentage ="percentageVar" ptype="circle" />-->
@ -347,7 +359,18 @@ export default {
zhenggaiList: [],
yanshouList: [],
dialogdProgress: false,
percentageVar: 0
percentageVar: 0,
addTempSafeMeasureDialogForm: false, // 用于控制添加临时安全措施弹窗的显示与隐藏
// 添加临时安全措施的表单数据
addSafeMeasureForm: {
TEMPORARY_SAFE_MEASURE: '' // 用于接收并存储临时安全措施的值
},
// 添加临时安全措施的表单规则
addSafeMeasureFormRule: {
TEMPORARY_SAFE_MEASURE: [{ required: true, message: '请输入临时安全措施', trigger: 'blur' }]
},
dayNum: 0,
HIDDEN_ID: ''
}
},
// BI 页面有要过来,等待查看参数
@ -723,6 +746,64 @@ export default {
encodeURIComponent(JSON.stringify(rows)) + '&STARTTIME=' + this.condform.creatTime[0] + '&ENDTIME=' + this.condform.creatTime[1])
this.dialogVisibleshow = false
},
// 临时安全措施打开弹窗的点击事件
addTempSafeMeasureBtn(dayNum, HIDDEN_ID, TEMP_SAFE_MEASURE) {
requestFN(
'/hiddenApi/findTempSafeMeasureByHiddenId',
{
HIDDEN_ID: HIDDEN_ID
}
).then((data) => {
if (data.result == 'success') {
this.addTempSafeMeasureDialogForm = true
this.addSafeMeasureForm.TEMPORARY_SAFE_MEASURE = data.tempSafeMeasure != null ? data.tempSafeMeasure : ''
} else {
this.addTempSafeMeasureDialogForm = false
}
})
this.dayNum = Number(dayNum) // 整改完成期限 减去 隐患确认时间 之间相差的天数
this.HIDDEN_ID = HIDDEN_ID
},
// 添加临时安全措施的点击事件
AddTempSafeMeasureClick() {
if (!this.addSafeMeasureForm.TEMPORARY_SAFE_MEASURE && this.dayNum >= 1) {
this.$message({
message: '请填写临时安全措施',
type: 'error'
})
this.loading = false
return false
}
const loading = this.$loading({
lock: true,
text: '加载中......',
background: 'rgba(0,0,0,0.5)'
})
requestFN(
'/hiddenApi/addTempSafeMeasure',
{
TEMPORARY_SAFE_MEASURE: this.addSafeMeasureForm.TEMPORARY_SAFE_MEASURE,
HIDDEN_ID: this.HIDDEN_ID
}
).then((data) => {
loading.close()
if (data.result == 'success') {
this.addTempSafeMeasureDialogForm = false
this.$message({
message: '添加成功',
type: 'success'
})
} else {
this.$message({
message: data.exception,
type: '添加失败'
})
this.loading = false
}
}).catch((e) => {
this.listLoading = false
})
},
getHiddenNames() {
requestFN(
'/hidden/getHiddenNames',