= 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: '验收人和整改人不能是同一个人!',
diff --git a/src/views/hiddenApi/publicMethod/detail.vue b/src/views/hiddenApi/publicMethod/detail.vue
index e214305..a889b3b 100644
--- a/src/views/hiddenApi/publicMethod/detail.vue
+++ b/src/views/hiddenApi/publicMethod/detail.vue
@@ -116,6 +116,10 @@
是否相关方 |
{{ pd.ISRELEVANT=='1'?'是':'否' }} |
+
+ 临时安全措施 |
+ {{ pd.TEMP_SAFE_MEASURE !== undefined ? pd.TEMP_SAFE_MEASURE : '' }} |
+
打回原因 |
diff --git a/src/views/hiddenApi/publicMethod/list.vue b/src/views/hiddenApi/publicMethod/list.vue
index 3252e46..6e2a811 100644
--- a/src/views/hiddenApi/publicMethod/list.vue
+++ b/src/views/hiddenApi/publicMethod/list.vue
@@ -179,6 +179,7 @@
查看
+ 临时安全措施
确认
整改
申请延期
@@ -235,6 +236,17 @@
关 闭
+
+
+
+
+
+
+
+
@@ -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',