diff --git a/pages/application/hotwork_cfd/hotwork-accept/hotwork-accept-alldetail.vue b/pages/application/hotwork_cfd/hotwork-accept/hotwork-accept-alldetail.vue index 69eae6f..ce1042a 100644 --- a/pages/application/hotwork_cfd/hotwork-accept/hotwork-accept-alldetail.vue +++ b/pages/application/hotwork_cfd/hotwork-accept/hotwork-accept-alldetail.vue @@ -187,6 +187,11 @@ + + + 安全检查项： + {{ pd.safetyApprovalContent }} + 作业负责人： @@ -260,15 +265,15 @@ - + 接受交底人 {{ item.ACCEPT_CONFESS_USER_NAME }} {{ item.APPROVAL_SIGNATURE_TIME }} - - + + @@ -596,9 +601,14 @@ 验收部门负责人 {{pd.ACCEPT_USER_NAME}} {{pd.ACCEPT_USER_SIGNER_TIME}} - - - + + + + + + + + @@ -682,7 +692,8 @@ acceptUserList:[], acceptindex:-1, pd:{ - OTHER_PROTECTIVE_MEASURES:';_;;_;;_;;_;;_;;_;;_;' + OTHER_PROTECTIVE_MEASURES:';_;;_;;_;;_;;_;;_;;_;', + safetyApprovalContent: '', },// 数据 measuresList:[], rules:[ @@ -799,8 +810,22 @@ success: (res) => { if ("success" == res.data.result) { uni.hideLoading(); - console.log(res.data.pd,'1111111111111111111111111') _this.pd = res.data.pd; //参数map + + if (_this.pd.ACCEPT_USER_SIGNER_PATH) { + _this.pd.ACCEPT_USER_SIGNER_PATH_ARRAY = _this.pd.ACCEPT_USER_SIGNER_PATH.split(',').map(item => item.trim()); + } else { + _this.pd.ACCEPT_USER_SIGNER_PATH_ARRAY = []; + } + + if (res.data.pd.safetyList && res.data.pd.safetyList.length > 0) { + _this.pd.safetyApprovalContent = res.data.pd.safetyList.map(item => item.APPROVAL_CONTENT).join(', '); + } + + if (_this.pd.ACCEPT_USER_SIGNER_TIME) { + _this.pd.ACCEPT_USER_SIGNER_TIME = _this.pd.ACCEPT_USER_SIGNER_TIME.split(',')[0]; + } + if (res.data.pd.confessList && res.data.pd.confessList.length > 0) { _this.pd.APPROVAL_SIGNATURE = res.data.pd.confessList[0].APPROVAL_SIGNATURE; } @@ -815,6 +840,9 @@ }) _this.pd.OTHER_PROTECTIVE_MEASURES = '' _this.measuresList = res.data.measuresList + if (_this.pd.safetyList && _this.pd.safetyList.length > 0) { + _this.pd.APPROVAL_CONTENT = _this.pd.safetyList.map(item => item.APPROVAL_CONTENT).join(', '); + } if(_this.pd.APPLY_STATUS < 1){ _this.forbidEdit = false; } diff --git a/pages/application/hotwork_cfd/hotwork-accept/hotwork-accept-detail.vue b/pages/application/hotwork_cfd/hotwork-accept/hotwork-accept-detail.vue index cd17497..17835ec 100644 --- a/pages/application/hotwork_cfd/hotwork-accept/hotwork-accept-detail.vue +++ b/pages/application/hotwork_cfd/hotwork-accept/hotwork-accept-detail.vue @@ -159,6 +159,11 @@ + + + 安全检查项： + {{ pd.safetyApprovalContent }} + 作业负责人： @@ -243,15 +248,15 @@ - + 接受交底人 {{ item.ACCEPT_CONFESS_USER_NAME }} {{ item.APPROVAL_SIGNATURE_TIME }} - - + + @@ -473,7 +478,8 @@ export default { FIRE_COMPLETED: '0', SITE_CLEANED: '0', NO_REMAINING_EMBERS: '0', - OTHER_PROTECTIVE_MEASURES: ';_;;_;;_;;_;;_;;_;;_;' + OTHER_PROTECTIVE_MEASURES: ';_;;_;;_;;_;;_;;_;;_;', + safetyApprovalContent: '', }, measuresList: [], gasList: [], @@ -595,6 +601,10 @@ export default { _this.forbidEdit = false; } + if (res.data.pd.safetyList && res.data.pd.safetyList.length > 0) { + _this.pd.safetyApprovalContent = res.data.pd.safetyList.map(item => item.APPROVAL_CONTENT).join(', '); + } + let dongHuoCaoZuoRenPic = res.data.imgList2 if (dongHuoCaoZuoRenPic && dongHuoCaoZuoRenPic.length > 0) { _this.pd.dongHuoCaoZuoRenPic = [] diff --git a/pages/application/hotwork_cfd/hotwork-acceptconfess/hotwork-acceptconfess-detail.vue b/pages/application/hotwork_cfd/hotwork-acceptconfess/hotwork-acceptconfess-detail.vue index 91d21da..f6b3220 100644 --- a/pages/application/hotwork_cfd/hotwork-acceptconfess/hotwork-acceptconfess-detail.vue +++ b/pages/application/hotwork_cfd/hotwork-acceptconfess/hotwork-acceptconfess-detail.vue @@ -179,8 +179,8 @@ - - + + 安全交底人 @@ -193,16 +193,16 @@ - - + + 接受交底人 {{ item.ACCEPT_CONFESS_USER_NAME }} {{ item.APPROVAL_SIGNATURE_TIME }} - - + + @@ -322,9 +322,14 @@ 验收部门负责人 {{pd.ACCEPT_USER_NAME}} {{pd.ACCEPT_USER_SIGNER_TIME}} - - - + + + + + + + + @@ -500,7 +505,7 @@ onLoad(event){ this.todayDate = formatDate(new Date(), 'yyyy-MM-dd hh:mm'); this.pd.HOTWORK_ID = event.HOTWORK_ID; - if(this.pd.HOTWORK_ID){ + if(this.pd.HOTWORK_ID){ this.msg="edit"; this.getData(); }else { @@ -515,7 +520,6 @@ this.getDept(); this.getLimitSpace(); loginSession(); - }, methods: { //跳转事件 @@ -544,6 +548,17 @@ if ("success" == res.data.result) { uni.hideLoading(); _this.pd = res.data.pd; //参数map + + if (_this.pd.ACCEPT_USER_SIGNER_PATH) { + _this.pd.ACCEPT_USER_SIGNER_PATH_ARRAY = _this.pd.ACCEPT_USER_SIGNER_PATH.split(',').map(item => item.trim()); + } else { + _this.pd.ACCEPT_USER_SIGNER_PATH_ARRAY = []; + } + + if (_this.pd.ACCEPT_USER_SIGNER_TIME) { + _this.pd.ACCEPT_USER_SIGNER_TIME = _this.pd.ACCEPT_USER_SIGNER_TIME.split(',')[0]; + } + _this.pd = Object.assign(_this.pd, { "CONFIRM_USER_MEASURES": _this.pd.OTHER_PROTECTIVE_MEASURES.split(";_;")[0] @@ -557,6 +572,11 @@ _this.pd.ACCEPT_CONFESS_USER_SIGNER_PATH = _this.pd.acceptConfessList[i].ACCEPT_CONFESS_USER_SIGNER_PATH; _this.pd.ACCEPT_CONFESS_USER_NAME = _this.pd.acceptConfessList[i].ACCEPT_CONFESS_USER_NAME; _this.pd.ACCEPT_CONFESS_USER_SIGNER_TIME = _this.pd.acceptConfessList[i].CREATE_TIME; + + // 将ACCEPT_CONFESS_USER_SIGNER_PATH转换为数组并赋值给imgList + // _this.imgList = _this.pd.ACCEPT_CONFESS_USER_SIGNER_PATH.split(';').map(path => ({ + // filePath: _this.baseImgPath + path.trim() + // })); break; } } @@ -589,9 +609,8 @@ current: 0 }); }, - goSubmit(){ - var _this = this; - let required = true + goSubmit() { + var _this = this; if (_this.pd.safetyList && _this.pd.safetyList.some(item => item.APPROVAL_STATUS === '0')) { uni.showToast({ icon: 'none', @@ -600,54 +619,128 @@ }); return; } - uni.showLoading({ - title: '请稍候' - }) - if (_this.imgList.length <= 0) { - uni.showToast({ - icon: 'none', - title: '请签字', - duration: 1500 - }); - return; - } - // var fileList = []; - // var signtime = []; - const formData={} - Object.keys(this.pd).map(key => { - formData[key]=this.pd[key] - }) - // this.uploadImgFaults(fileList,signtime) - // formData.SIGNTIME = signtime.join(",") - formData.CREATOR=loginUser.USER_ID - formData.OPERATOR=loginUser.USER_ID - formData.ACTION_USER=loginUser.NAME - formData.CORPINFO_ID = loginUser.CORPINFO_ID - formData.USER_ID = loginUser.USER_ID - uni.uploadFile({ - url: basePath+'/app/hotwork/cfd/editAcceptconfess', - // files: fileList, - filePath: _this.imgList[0].filePath, - name: 'FFILE', - formData: formData, - success: (res) => { - uni.showToast({ - icon:'none', - title: '保存成功', - duration: 2000 - }); - _this.goback() - }, - fail: (err) => { - uni.hideLoading(); - uni.showModal({ - content: err.errMsg, - showCancel: false - }); - } - }) - }, + if (_this.imgList.length <= 0) { + uni.showToast({ + icon: 'none', + title: '请签字', + duration: 1500 + }); + return; + } + + uni.showLoading({ + title: '请稍候' + }); + + const formData = {}; + Object.keys(this.pd).map(key => { + formData[key] = this.pd[key]; + }); + formData.CREATOR = loginUser.USER_ID; + formData.OPERATOR = loginUser.USER_ID; + formData.ACTION_USER = loginUser.NAME; + formData.CORPINFO_ID = loginUser.CORPINFO_ID; + formData.USER_ID = loginUser.USER_ID; + + const files = _this.imgList.map((img, index) => { + return { + name: 'FFILE', + uri: img.filePath + }; + }); + + uni.uploadFile({ + url: basePath + '/app/hotwork/cfd/editAcceptconfess', + files: files, + formData: formData, + success: (uploadFileRes) => { + const responseData = JSON.parse(uploadFileRes.data); + if (responseData.result === 'success') { + uni.hideLoading(); + uni.showToast({ + icon: 'none', + title: '保存成功', + duration: 2000 + }); + _this.imgList = []; + _this.goback(); + } else { + uni.hideLoading(); + uni.showModal({ + content: responseData.message, + showCancel: false + }); + } + }, + fail: (err) => { + uni.hideLoading(); + uni.showModal({ + content: err.errMsg, + showCancel: false + }); + } + }); + }, + // goSubmit(){ + // var _this = this; + // let required = true + // if (_this.pd.safetyList && _this.pd.safetyList.some(item => item.APPROVAL_STATUS === '0')) { + // uni.showToast({ + // icon: 'none', + // title: '未进行安全措施确认，不能签字', + // duration: 2000 + // }); + // return; + // } + // uni.showLoading({ + // title: '请稍候' + // }) + // + // if (_this.imgList.length <= 0) { + // uni.showToast({ + // icon: 'none', + // title: '请签字', + // duration: 1500 + // }); + // return; + // } + // // var fileList = []; + // // var signtime = []; + // const formData={} + // Object.keys(this.pd).map(key => { + // formData[key]=this.pd[key] + // }) + // // this.uploadImgFaults(fileList,signtime) + // // formData.SIGNTIME = signtime.join(",") + // formData.CREATOR=loginUser.USER_ID + // formData.OPERATOR=loginUser.USER_ID + // formData.ACTION_USER=loginUser.NAME + // formData.CORPINFO_ID = loginUser.CORPINFO_ID + // formData.USER_ID = loginUser.USER_ID + // uni.uploadFile({ + // url: basePath+'/app/hotwork/cfd/editAcceptconfess', + // // files: fileList, + // filePath: _this.imgList[0].filePath, + // name: 'FFILE', + // formData: formData, + // success: (res) => { + // uni.showToast({ + // icon:'none', + // title: '保存成功', + // duration: 2000 + // }); + // _this.goback() + // }, + // fail: (err) => { + // uni.hideLoading(); + // uni.showModal({ + // content: err.errMsg, + // showCancel: false + // }); + // } + // }) + // }, // uploadImgFaults(fileList,signtime) { // this.imgList.map(item => { // var img = {} diff --git a/pages/application/hotwork_cfd/hotwork-apply/hotwork-apply-detail.vue b/pages/application/hotwork_cfd/hotwork-apply/hotwork-apply-detail.vue index ebfe28b..4d584a2 100644 --- a/pages/application/hotwork_cfd/hotwork-apply/hotwork-apply-detail.vue +++ b/pages/application/hotwork_cfd/hotwork-apply/hotwork-apply-detail.vue @@ -117,9 +117,9 @@ - - + :data-url="pd.dongHuoCaoZuoRenPic[index].FILEPATH"> + + @@ -838,7 +838,7 @@ export default { WORK_LONGITUDE: '', WORK_LATITUDE: '', ACCEPT_CONFESS_USER_ID: '', - dongHuoCaoZuoRenPic: [] + dongHuoCaoZuoRenPic: [], },// 数据 measuresList: [], rules: [ @@ -992,6 +992,7 @@ export default { if ("success" == res.data.result) { uni.hideLoading(); _this.pd = res.data.pd; //参数map + _this.pd.dongHuoCaoZuoRenPic = _this.pd.dongHuoCaoZuoRenPic || []; _this.pd = Object.assign(_this.pd, { "CONFIRM_USER_MEASURES": _this.pd.OTHER_PROTECTIVE_MEASURES.split(";_;")[0], @@ -1012,7 +1013,10 @@ export default { if (dongHuoCaoZuoRenPic && dongHuoCaoZuoRenPic.length > 0) { _this.pd.dongHuoCaoZuoRenPic = [] for (let i = 0; i < dongHuoCaoZuoRenPic.length; i++) { - _this.pd.dongHuoCaoZuoRenPic.push(baseImgPath + dongHuoCaoZuoRenPic[i].FILEPATH) + _this.pd.dongHuoCaoZuoRenPic.push({ + ...dongHuoCaoZuoRenPic[i], + FILEPATH:baseImgPath + dongHuoCaoZuoRenPic[i].FILEPATH, + }) } } if (_this.pd.APPLY_STATUS <= 0) { @@ -1069,21 +1073,21 @@ export default { }, goSubmit(STATUS) { var _this = this; - let required = true + let required = true; uni.showLoading({ title: '请稍候' - }) + }); if (STATUS === '1') { - this.rules.map(({name, message}) => { + this.rules.map(({ name, message }) => { if (!this.pd[name]) { uni.showToast({ icon: 'none', title: message, duration: 1500 }); - required = false + required = false; } - }) + }); if (this.pd.WORK_LEVEL != '二级') { if (!this.pd.AUDIT_USER_ID) { uni.showToast({ @@ -1091,7 +1095,7 @@ export default { title: '请选择安全管理部门负责人', duration: 1500 }); - required = false + required = false; } } if (this.pd.WORK_LEVEL != '二级' && this.pd.WORK_LEVEL != '一级') { @@ -1101,7 +1105,7 @@ export default { title: '请选择动火审批负责人', duration: 1500 }); - required = false + required = false; } } if (this.pd.WORK_LEVEL == '特级' || this.pd.WORK_LEVEL == '一级') { @@ -1111,7 +1115,7 @@ export default { title: '动火级别为特级或一级时，动火作业开始时间与结束时间应不超过8小时，请重新选择', duration: 1500 }); - required = false + required = false; } } if (new Date(this.pd.WORK_END_DATE).getTime() - new Date(this.pd.WORK_START_DATE).getTime() <= 0) { @@ -1120,7 +1124,7 @@ export default { title: '作业开始时间不能晚于或等于结束时间，请重新选择', duration: 1500 }); - required = false + required = false; } if (this.pd.WORK_LEVEL == '二级') { if (new Date(this.pd.WORK_END_DATE).getTime() - new Date(this.pd.WORK_START_DATE).getTime() >= 259200000) { @@ -1129,7 +1133,7 @@ export default { title: '动火级别为二级时，动火作业开始时间与结束时间应不超过72小时，请重新选择', duration: 1500 }); - required = false + required = false; } } for (let i = 0; i < this.confessList.length; i++) { @@ -1139,7 +1143,7 @@ export default { title: '请选择安全交底人', duration: 1500 }); - required = false + required = false; } } for (let i = 0; i < this.acceptconfessList.length; i++) { @@ -1149,7 +1153,7 @@ export default { title: '请选择接受交底人', duration: 1500 }); - required = false + required = false; } } if (this.pd.dongHuoCaoZuoRenPic.length <= 0) { @@ -1158,36 +1162,35 @@ export default { title: '请上传动火操作人图片', duration: 1500 }); - required = false + required = false; } if (!required) { - return + return; } // 清空非必要信息 for (let i = 0; i < this.confessList.length; i++) { - this.confessList[i].confessUserList = [] + this.confessList[i].confessUserList = []; } for (let i = 0; i < this.acceptconfessList.length; i++) { - this.acceptconfessList[i].acceptconfessUserList = [] + this.acceptconfessList[i].acceptconfessUserList = []; } } - const formData = {} + const formData = {}; Object.keys(this.pd).map(key => { - formData[key] = this.pd[key] - }) - formData.CORPINFO_ID = corpinfoId - formData.CREATOR = loginUser.USER_ID - formData.OPERATOR = loginUser.USER_ID - formData.ACTION_USER = loginUser.NAME - formData.APPLY_STATUS = STATUS - formData.WORK_LONGITUDE = this.pd.WORK_LONGITUDE - formData.WORK_LATITUDE = this.pd.WORK_LATITUDE - formData.dongHuoCaoZuoRenPic = this.pd.dongHuoCaoZuoRenPic - formData.CORPINFO_ID = loginUser.CORPINFO_ID - formData.USER_ID = loginUser.USER_ID - formData.confessList = JSON.stringify(this.confessList) - formData.acceptconfessList = JSON.stringify(this.acceptconfessList) - this.buttonloading = true + formData[key] = this.pd[key]; + }); + formData.CORPINFO_ID = corpinfoId; + formData.CREATOR = loginUser.USER_ID; + formData.OPERATOR = loginUser.USER_ID; + formData.ACTION_USER = loginUser.NAME; + formData.APPLY_STATUS = STATUS; + formData.WORK_LONGITUDE = this.pd.WORK_LONGITUDE; + formData.WORK_LATITUDE = this.pd.WORK_LATITUDE; + formData.CORPINFO_ID = loginUser.CORPINFO_ID; + formData.USER_ID = loginUser.USER_ID; + formData.confessList = JSON.stringify(this.confessList); + formData.acceptconfessList = JSON.stringify(this.acceptconfessList); + this.buttonloading = true; uni.request({ url: basePath + "/app/hotwork/cfd/" + _this.msg, method: 'POST', @@ -1203,9 +1206,12 @@ export default { success: (res) => { if (res.data.result == 'success') { for (let i = 0; i < this.pd.dongHuoCaoZuoRenPic.length; i++) { + const filePath = this.pd.dongHuoCaoZuoRenPic[i].IMGFILES_ID + ? this.pd.dongHuoCaoZuoRenPic[i].FILEPATH + : this.pd.dongHuoCaoZuoRenPic[i]; uni.uploadFile({ url: basePath + "/app/hotwork/cfd/uploadImg", - filePath: this.pd.dongHuoCaoZuoRenPic[i], + filePath: filePath, name: 'FFILE', formData: { HOTWORK_ID: res.data.HOTWORK_ID @@ -1217,8 +1223,8 @@ export default { title: '提交成功', duration: 1500 }); - _this.goback() - this.buttonloading = false + _this.goback(); + this.buttonloading = false; } }, fail: (err) => { @@ -1228,15 +1234,15 @@ export default { showCancel: false }); } - }) + }); } - }else{ + } else { uni.hideLoading(); uni.showToast({ title: res.data.message, duration: 1500 }); - this.buttonloading = false + this.buttonloading = false; } }, fail: (err) => { @@ -1246,7 +1252,7 @@ export default { showCancel: false }); } - }) + }); }, // 获取动火列表 getLimitSpace() { @@ -1889,25 +1895,36 @@ export default { ChooseImage() { var _this = this; uni.chooseImage({ - count: 4, //默认9 - sizeType: ['original', 'compressed'], //可以指定是原图还是压缩图，默认二者都有 - sourceType: ['camera', 'album'], //从相册选择 + count: 4, // 最大可选数量 + sizeType: ['original', 'compressed'], // 可以指定是原图还是压缩图 + sourceType: ['camera', 'album'], // 从相册或相机选择 success: (res) => { - if (this.pd.dongHuoCaoZuoRenPic.length !== 0) { - this.pd.dongHuoCaoZuoRenPic = this.pd.dongHuoCaoZuoRenPic.concat(res.tempFilePaths) - } else { - this.pd.dongHuoCaoZuoRenPic = res.tempFilePaths - } + const tempFilePaths = res.tempFilePaths; + // 合并选择的图片与已有的图片 + _this.pd.dongHuoCaoZuoRenPic = _this.pd.dongHuoCaoZuoRenPic.concat(tempFilePaths); + console.log("选择图片路径：", tempFilePaths) + console.log("3333333333333333：", _this.pd.dongHuoCaoZuoRenPic) + // 触发视图更新 + _this.$forceUpdate(); + }, + fail: (err) => { + console.error("图片选择失败：", err); } }); }, ViewImage(e) { + const urls = [] + console.log("图片路径：", this.pd.dongHuoCaoZuoRenPic) + for (let i = 0; i < this.pd.dongHuoCaoZuoRenPic.length; i++) { + urls.push(this.pd.dongHuoCaoZuoRenPic[i].FILEPATH) + } uni.previewImage({ - urls: this.pd.dongHuoCaoZuoRenPic, + urls, current: e.currentTarget.dataset.url }); }, - DelImg1(e) { + DelImg1(index) { + var _this = this; uni.showModal({ title: '双控平台', content: '确定要删除这张图片吗？', @@ -1916,10 +1933,66 @@ export default { confirmText: '确定', success: res => { if (res.confirm) { - this.form.imgList.splice(e.currentTarget.dataset.index, 1) + if (_this.pd.dongHuoCaoZuoRenPic && _this.pd.dongHuoCaoZuoRenPic[index]) { + // 获取需要删除的图片信息 + let imgInfo = _this.pd.dongHuoCaoZuoRenPic[index]; + + // 如果图片有IMGFILES_ID，说明是已经上传到服务器的图片，需要调用删除接口 + if (imgInfo.IMGFILES_ID) { + uni.showLoading({ + title: '处理中' + }); + uni.request({ + url: basePath + '/app/hotwork/cfd/delImg', + method: 'POST', + dataType: 'json', + header: { + 'Content-type': 'application/x-www-form-urlencoded' + }, + data: { + IMGFILES_ID: imgInfo.IMGFILES_ID, + FILEPATH: imgInfo.FILEPATH + }, + success: (res) => { + uni.hideLoading(); + if (res.data.result === 'success') { + uni.showToast({ + icon: 'none', + title: '删除成功', + duration: 1500 + }); + _this.pd.dongHuoCaoZuoRenPic.splice(index, 1); + _this.$forceUpdate(); // 强制视图更新 + } else { + uni.showToast({ + icon: 'none', + title: res.data.message, + duration: 2000 + }); + } + }, + fail: (err) => { + uni.hideLoading(); + uni.showModal({ + content: err.errMsg, + showCancel: false + }); + } + }); + } else { + // 如果图片没有IMGFILES_ID，说明是本地图片，直接删除 + _this.pd.dongHuoCaoZuoRenPic.splice(index, 1); + uni.showToast({ + icon: 'none', + title: '删除成功', + duration: 1500 + }); + _this.$forceUpdate(); // 强制视图更新 + } + } } } - }) + }); }, // 2024-01-31 created by liu jun description: 安全交底人多选 addConfessUser(){ diff --git a/pages/application/hotwork_cfd/hotwork-approve/hotwork-approve-alldetail.vue b/pages/application/hotwork_cfd/hotwork-approve/hotwork-approve-alldetail.vue index 6a329fe..f03cb23 100644 --- a/pages/application/hotwork_cfd/hotwork-approve/hotwork-approve-alldetail.vue +++ b/pages/application/hotwork_cfd/hotwork-approve/hotwork-approve-alldetail.vue @@ -181,11 +181,16 @@ - - 其他安全措施： - - - + + + + + + + + + 安全检查项： + {{ pd.safetyApprovalContent }} @@ -222,6 +227,11 @@ + + + 动火审批人： + {{ pd.AUDIT_USER_MEASURES}} + 动火前验票： @@ -261,15 +271,15 @@ - + 接受交底人 {{ item.ACCEPT_CONFESS_USER_NAME }} {{ item.APPROVAL_SIGNATURE_TIME }} - - + + @@ -597,9 +607,14 @@ 验收部门负责人 {{pd.ACCEPT_USER_NAME}} {{pd.ACCEPT_USER_SIGNER_TIME}} - - - + + + + + + + + @@ -683,7 +698,8 @@ acceptUserList:[], acceptindex:-1, pd:{ - OTHER_PROTECTIVE_MEASURES:';_;;_;;_;;_;;_;;_;;_;' + OTHER_PROTECTIVE_MEASURES:';_;;_;;_;;_;;_;;_;;_;', + safetyApprovalContent: '', },// 数据 measuresList:[], rules:[ @@ -801,6 +817,21 @@ if ("success" == res.data.result) { uni.hideLoading(); _this.pd = res.data.pd; //参数map + + if (_this.pd.ACCEPT_USER_SIGNER_PATH) { + _this.pd.ACCEPT_USER_SIGNER_PATH_ARRAY = _this.pd.ACCEPT_USER_SIGNER_PATH.split(',').map(item => item.trim()); + } else { + _this.pd.ACCEPT_USER_SIGNER_PATH_ARRAY = []; + } + + if (res.data.pd.safetyList && res.data.pd.safetyList.length > 0) { + _this.pd.safetyApprovalContent = res.data.pd.safetyList.map(item => item.APPROVAL_CONTENT).join(', '); + } + + if (_this.pd.ACCEPT_USER_SIGNER_TIME) { + _this.pd.ACCEPT_USER_SIGNER_TIME = _this.pd.ACCEPT_USER_SIGNER_TIME.split(',')[0]; + } + if (res.data.pd.confessList && res.data.pd.confessList.length > 0) { _this.pd.APPROVAL_SIGNATURE = res.data.pd.confessList[0].APPROVAL_SIGNATURE; } @@ -815,6 +846,9 @@ }) _this.pd.OTHER_PROTECTIVE_MEASURES = '' _this.measuresList = res.data.measuresList + if (_this.pd.safetyList && _this.pd.safetyList.length > 0) { + _this.pd.APPROVAL_CONTENT = _this.pd.safetyList.map(item => item.APPROVAL_CONTENT).join(', '); + } if(_this.pd.APPLY_STATUS < 1){ _this.forbidEdit = false; } diff --git a/pages/application/hotwork_cfd/hotwork-approve/hotwork-approve-detail.vue b/pages/application/hotwork_cfd/hotwork-approve/hotwork-approve-detail.vue index 10a3c38..6bdde85 100644 --- a/pages/application/hotwork_cfd/hotwork-approve/hotwork-approve-detail.vue +++ b/pages/application/hotwork_cfd/hotwork-approve/hotwork-approve-detail.vue @@ -167,6 +167,11 @@ + + + 安全检查项： + {{ pd.safetyApprovalContent }} + 作业负责人： @@ -250,15 +255,15 @@ - + 接受交底人 {{ item.ACCEPT_CONFESS_USER_NAME }} {{ item.APPROVAL_SIGNATURE_TIME }} - - + + @@ -292,17 +297,18 @@ - - - - 项目主管部门负责意见 - - + + + 项目主管部门负责意见 + 项目主管部门负责人 {{pd.EXAMINE_USER_NAME}} {{pd.EXAMINE_APPROVAL_CREATE_TIME}} + + + 属地监管单位意见 @@ -418,7 +424,8 @@ acceptUserList:[], acceptindex:-1, pd:{ - OTHER_PROTECTIVE_MEASURES:';_;;_;;_;;_;;_;;_;;_;' + OTHER_PROTECTIVE_MEASURES:';_;;_;;_;;_;;_;;_;;_;', + safetyApprovalContent: '', },// 数据 measuresList:[], rules:[ @@ -524,6 +531,11 @@ if(_this.pd.APPLY_STATUS < 1){ _this.forbidEdit = false; } + + if (res.data.pd.safetyList && res.data.pd.safetyList.length > 0) { + _this.pd.safetyApprovalContent = res.data.pd.safetyList.map(item => item.APPROVAL_CONTENT).join(', '); + } + let dongHuoCaoZuoRenPic = res.data.imgList2 if (dongHuoCaoZuoRenPic && dongHuoCaoZuoRenPic.length > 0) { _this.pd.dongHuoCaoZuoRenPic = [] diff --git a/pages/application/hotwork_cfd/hotwork-audit/hotwork-audit-alldetail.vue b/pages/application/hotwork_cfd/hotwork-audit/hotwork-audit-alldetail.vue index 1241df8..dad71d7 100644 --- a/pages/application/hotwork_cfd/hotwork-audit/hotwork-audit-alldetail.vue +++ b/pages/application/hotwork_cfd/hotwork-audit/hotwork-audit-alldetail.vue @@ -181,11 +181,16 @@ - - 其他安全措施： - - - + + + + + + + + + 安全检查项： + {{ pd.safetyApprovalContent }} @@ -202,6 +207,11 @@ 属地监管单位： {{ pd.GUARDIAN_USER_MEASURES}} + + + 安全管理部门： + {{ pd.LEADER_USER_MEASURES}} + @@ -255,15 +265,15 @@ - + 接受交底人 {{ item.ACCEPT_CONFESS_USER_NAME }} {{ item.APPROVAL_SIGNATURE_TIME }} - - + + @@ -591,9 +601,14 @@ 验收部门负责人 {{pd.ACCEPT_USER_NAME}} {{pd.ACCEPT_USER_SIGNER_TIME}} - - - + + + + + + + + @@ -677,7 +692,8 @@ acceptUserList:[], acceptindex:-1, pd:{ - OTHER_PROTECTIVE_MEASURES:';_;;_;;_;;_;;_;;_;;_;' + OTHER_PROTECTIVE_MEASURES:';_;;_;;_;;_;;_;;_;;_;', + safetyApprovalContent: '', },// 数据 measuresList:[], rules:[ @@ -795,6 +811,21 @@ if ("success" == res.data.result) { uni.hideLoading(); _this.pd = res.data.pd; //参数map + + if (_this.pd.ACCEPT_USER_SIGNER_PATH) { + _this.pd.ACCEPT_USER_SIGNER_PATH_ARRAY = _this.pd.ACCEPT_USER_SIGNER_PATH.split(',').map(item => item.trim()); + } else { + _this.pd.ACCEPT_USER_SIGNER_PATH_ARRAY = []; + } + + if (res.data.pd.safetyList && res.data.pd.safetyList.length > 0) { + _this.pd.safetyApprovalContent = res.data.pd.safetyList.map(item => item.APPROVAL_CONTENT).join(', '); + } + + if (_this.pd.ACCEPT_USER_SIGNER_TIME) { + _this.pd.ACCEPT_USER_SIGNER_TIME = _this.pd.ACCEPT_USER_SIGNER_TIME.split(',')[0]; + } + if (res.data.pd.confessList && res.data.pd.confessList.length > 0) { _this.pd.APPROVAL_SIGNATURE = res.data.pd.confessList[0].APPROVAL_SIGNATURE; } @@ -809,6 +840,9 @@ }) _this.pd.OTHER_PROTECTIVE_MEASURES = '' _this.measuresList = res.data.measuresList + if (_this.pd.safetyList && _this.pd.safetyList.length > 0) { + _this.pd.APPROVAL_CONTENT = _this.pd.safetyList.map(item => item.APPROVAL_CONTENT).join(', '); + } if(_this.pd.APPLY_STATUS < 1){ _this.forbidEdit = false; } diff --git a/pages/application/hotwork_cfd/hotwork-audit/hotwork-audit-detail.vue b/pages/application/hotwork_cfd/hotwork-audit/hotwork-audit-detail.vue index 9b6c9e2..3d9c92d 100644 --- a/pages/application/hotwork_cfd/hotwork-audit/hotwork-audit-detail.vue +++ b/pages/application/hotwork_cfd/hotwork-audit/hotwork-audit-detail.vue @@ -190,6 +190,11 @@ + + + 安全检查项： + {{ pd.safetyApprovalContent }} + 作业负责人： @@ -274,15 +279,15 @@ - + 接受交底人 {{ item.ACCEPT_CONFESS_USER_NAME }} {{ item.APPROVAL_SIGNATURE_TIME }} - - + + @@ -341,17 +346,18 @@ - - - - 项目主管部门负责意见 - - + + + 项目主管部门负责意见 + 项目主管部门负责人 {{pd.EXAMINE_USER_NAME}} {{pd.EXAMINE_APPROVAL_CREATE_TIME}} + + + @@ -456,7 +462,8 @@ acceptUserList:[], acceptindex:-1, pd:{ - OTHER_PROTECTIVE_MEASURES:';_;;_;;_;;_;;_;;_;;_;' + OTHER_PROTECTIVE_MEASURES:';_;;_;;_;;_;;_;;_;;_;', + safetyApprovalContent: '', },// 数据 measuresList:[], rules:[ @@ -561,6 +568,10 @@ _this.forbidEdit = false; } + if (res.data.pd.safetyList && res.data.pd.safetyList.length > 0) { + _this.pd.safetyApprovalContent = res.data.pd.safetyList.map(item => item.APPROVAL_CONTENT).join(', '); + } + let dongHuoCaoZuoRenPic = res.data.imgList2 if (dongHuoCaoZuoRenPic && dongHuoCaoZuoRenPic.length > 0) { _this.pd.dongHuoCaoZuoRenPic = [] diff --git a/pages/application/hotwork_cfd/hotwork-confess/hotwork-confess-detail.vue b/pages/application/hotwork_cfd/hotwork-confess/hotwork-confess-detail.vue index 98c0a6a..e4997b1 100644 --- a/pages/application/hotwork_cfd/hotwork-confess/hotwork-confess-detail.vue +++ b/pages/application/hotwork_cfd/hotwork-confess/hotwork-confess-detail.vue @@ -222,8 +222,8 @@ - - + + 安全交底人 @@ -236,16 +236,16 @@ - - + + 接受交底人 {{ item.ACCEPT_CONFESS_USER_NAME }} {{ item.APPROVAL_SIGNATURE_TIME }} - - + + @@ -388,9 +388,14 @@ 验收部门负责人 {{pd.ACCEPT_USER_NAME}} {{pd.ACCEPT_USER_SIGNER_TIME}} - - - + + + + + + + + @@ -608,8 +613,19 @@ success: (res) => { if ("success" == res.data.result) { uni.hideLoading(); - console.log(res.data.pd,'11111111111111') + console.log(res.data.pd,'111111111111111111111111') _this.pd = res.data.pd; //参数map + + if (_this.pd.ACCEPT_USER_SIGNER_PATH) { + _this.pd.ACCEPT_USER_SIGNER_PATH_ARRAY = _this.pd.ACCEPT_USER_SIGNER_PATH.split(',').map(item => item.trim()); + } else { + _this.pd.ACCEPT_USER_SIGNER_PATH_ARRAY = []; + } + + if (_this.pd.ACCEPT_USER_SIGNER_TIME) { + _this.pd.ACCEPT_USER_SIGNER_TIME = _this.pd.ACCEPT_USER_SIGNER_TIME.split(',')[0]; + } + _this.pd = Object.assign(_this.pd, { "CONFIRM_USER_MEASURES": _this.pd.OTHER_PROTECTIVE_MEASURES.split(";_;")[0] @@ -617,6 +633,7 @@ _this.pd.OTHER_PROTECTIVE_MEASURES = '' _this.files = res.data.imgList; _this.measuresList = res.data.measuresList + if (_this.pd.confessList && _this.pd.confessList.length > 0) { for (let i = 0; i < _this.pd.confessList.length; i++) { if (_this.pd.confessList[i].APPROVAL_SIGNATURE) { diff --git a/pages/application/hotwork_cfd/hotwork-confirm/hotwork-confirm-alldetail.vue b/pages/application/hotwork_cfd/hotwork-confirm/hotwork-confirm-alldetail.vue index 19d35bb..1f64faa 100644 --- a/pages/application/hotwork_cfd/hotwork-confirm/hotwork-confirm-alldetail.vue +++ b/pages/application/hotwork_cfd/hotwork-confirm/hotwork-confirm-alldetail.vue @@ -181,17 +181,22 @@ - - 其他安全措施： - - - - - - - - + + + + + + + + 安全检查项： + {{ pd.safetyApprovalContent }} + + + + 作业负责人： + {{ pd.CONFIRM_OTHER_CONTENT}} + 项目责任负责人： @@ -250,15 +255,15 @@ - + 接受交底人 {{ item.ACCEPT_CONFESS_USER_NAME }} {{ item.APPROVAL_SIGNATURE_TIME }} - - + + @@ -582,9 +587,14 @@ 验收部门负责人 {{pd.ACCEPT_USER_NAME}} {{pd.ACCEPT_USER_SIGNER_TIME}} - - - + + + + + + + + @@ -668,7 +678,8 @@ acceptUserList:[], acceptindex:-1, pd:{ - OTHER_PROTECTIVE_MEASURES:';_;;_;;_;;_;;_;;_;;_;' + OTHER_PROTECTIVE_MEASURES:';_;;_;;_;;_;;_;;_;;_;', + safetyApprovalContent: '', },// 数据 measuresList:[], rules:[ @@ -785,6 +796,21 @@ if ("success" == res.data.result) { uni.hideLoading(); _this.pd = res.data.pd; //参数map + + if (res.data.pd.safetyList && res.data.pd.safetyList.length > 0) { + _this.pd.safetyApprovalContent = res.data.pd.safetyList.map(item => item.APPROVAL_CONTENT).join(', '); + } + + if (_this.pd.ACCEPT_USER_SIGNER_PATH) { + _this.pd.ACCEPT_USER_SIGNER_PATH_ARRAY = _this.pd.ACCEPT_USER_SIGNER_PATH.split(',').map(item => item.trim()); + } else { + _this.pd.ACCEPT_USER_SIGNER_PATH_ARRAY = []; + } + + if (_this.pd.ACCEPT_USER_SIGNER_TIME) { + _this.pd.ACCEPT_USER_SIGNER_TIME = _this.pd.ACCEPT_USER_SIGNER_TIME.split(',')[0]; + } + if (res.data.pd.confessList && res.data.pd.confessList.length > 0) { _this.pd.APPROVAL_SIGNATURE = res.data.pd.confessList[0].APPROVAL_SIGNATURE; } @@ -799,6 +825,9 @@ }) _this.pd.OTHER_PROTECTIVE_MEASURES = '' _this.measuresList = res.data.measuresList + if (_this.pd.safetyList && _this.pd.safetyList.length > 0) { + _this.pd.APPROVAL_CONTENT = _this.pd.safetyList.map(item => item.APPROVAL_CONTENT).join(', '); + } if(_this.pd.APPLY_STATUS < 1){ _this.forbidEdit = false; } diff --git a/pages/application/hotwork_cfd/hotwork-confirm/hotwork-confirm-detail.vue b/pages/application/hotwork_cfd/hotwork-confirm/hotwork-confirm-detail.vue index ecd3a98..19d41bf 100644 --- a/pages/application/hotwork_cfd/hotwork-confirm/hotwork-confirm-detail.vue +++ b/pages/application/hotwork_cfd/hotwork-confirm/hotwork-confirm-detail.vue @@ -162,6 +162,11 @@ + + + 安全检查项： + {{ pd.safetyApprovalContent }} + 项目责任负责人： @@ -240,15 +245,15 @@ - + 接受交底人 {{ item.ACCEPT_CONFESS_USER_NAME }} {{ item.APPROVAL_SIGNATURE_TIME }} - - + + @@ -353,7 +358,9 @@ monitorindex:-1, acceptUserList:[], acceptindex:-1, - pd:{},// 数据 + pd:{ + safetyApprovalContent: '', + },// 数据 measuresList:[], rules:[ {name:'CHECK_NO',message:'请输入编号'}, @@ -439,6 +446,10 @@ _this.forbidEdit = false; } + if (res.data.pd.safetyList && res.data.pd.safetyList.length > 0) { + _this.pd.safetyApprovalContent = res.data.pd.safetyList.map(item => item.APPROVAL_CONTENT).join(', '); + } + let dongHuoCaoZuoRenPic = res.data.imgList2 if (dongHuoCaoZuoRenPic && dongHuoCaoZuoRenPic.length > 0) { _this.pd.dongHuoCaoZuoRenPic = [] diff --git a/pages/application/hotwork_cfd/hotwork-guardian/hotwork-guardian-detail.vue b/pages/application/hotwork_cfd/hotwork-guardian/hotwork-guardian-detail.vue index 28a0056..d7f670b 100644 --- a/pages/application/hotwork_cfd/hotwork-guardian/hotwork-guardian-detail.vue +++ b/pages/application/hotwork_cfd/hotwork-guardian/hotwork-guardian-detail.vue @@ -213,15 +213,15 @@ - + 接受交底人 {{ item.ACCEPT_CONFESS_USER_NAME }} {{ item.APPROVAL_SIGNATURE_TIME }} - - + + @@ -341,9 +341,14 @@ 验收部门负责人 {{pd.ACCEPT_USER_NAME}} {{pd.ACCEPT_USER_SIGNER_TIME}} - - - + + + + + + + + @@ -549,6 +554,17 @@ if ("success" == res.data.result) { uni.hideLoading(); _this.pd = res.data.pd; //参数map + + if (_this.pd.ACCEPT_USER_SIGNER_PATH) { + _this.pd.ACCEPT_USER_SIGNER_PATH_ARRAY = _this.pd.ACCEPT_USER_SIGNER_PATH.split(',').map(item => item.trim()); + } else { + _this.pd.ACCEPT_USER_SIGNER_PATH_ARRAY = []; + } + + if (_this.pd.ACCEPT_USER_SIGNER_TIME) { + _this.pd.ACCEPT_USER_SIGNER_TIME = _this.pd.ACCEPT_USER_SIGNER_TIME.split(',')[0]; + } + _this.pd = Object.assign(_this.pd, { "CONFIRM_USER_MEASURES": _this.pd.OTHER_PROTECTIVE_MEASURES.split(";_;")[0] @@ -556,6 +572,7 @@ _this.pd.OTHER_PROTECTIVE_MEASURES = '' _this.files = res.data.imgList; _this.measuresList = res.data.measuresList + if(_this.pd.APPLY_STATUS < 1){ _this.forbidEdit = false; } diff --git a/pages/application/hotwork_cfd/hotwork-leader/hotwork-leader-alldetail.vue b/pages/application/hotwork_cfd/hotwork-leader/hotwork-leader-alldetail.vue index 12b8b3c..ec6615f 100644 --- a/pages/application/hotwork_cfd/hotwork-leader/hotwork-leader-alldetail.vue +++ b/pages/application/hotwork_cfd/hotwork-leader/hotwork-leader-alldetail.vue @@ -181,11 +181,16 @@ - - 其他安全措施： - - - + + + + + + + + + 安全检查项： + {{ pd.safetyApprovalContent }} @@ -202,6 +207,11 @@ + + + 属地监管单位： + {{ pd.GUARDIAN_USER_MEASURES}} + 安全管理部门： @@ -250,15 +260,15 @@ - + 接受交底人 {{ item.ACCEPT_CONFESS_USER_NAME }} {{ item.APPROVAL_SIGNATURE_TIME }} - - + + @@ -586,9 +596,14 @@ 验收部门负责人 {{pd.ACCEPT_USER_NAME}} {{pd.ACCEPT_USER_SIGNER_TIME}} - - - + + + + + + + + @@ -672,7 +687,8 @@ acceptUserList:[], acceptindex:-1, pd:{ - OTHER_PROTECTIVE_MEASURES:';_;;_;;_;;_;;_;;_;;_;' + OTHER_PROTECTIVE_MEASURES:';_;;_;;_;;_;;_;;_;;_;', + safetyApprovalContent: '', },// 数据 measuresList:[], rules:[ @@ -790,6 +806,21 @@ if ("success" == res.data.result) { uni.hideLoading(); _this.pd = res.data.pd; //参数map + + if (_this.pd.ACCEPT_USER_SIGNER_PATH) { + _this.pd.ACCEPT_USER_SIGNER_PATH_ARRAY = _this.pd.ACCEPT_USER_SIGNER_PATH.split(',').map(item => item.trim()); + } else { + _this.pd.ACCEPT_USER_SIGNER_PATH_ARRAY = []; + } + + if (res.data.pd.safetyList && res.data.pd.safetyList.length > 0) { + _this.pd.safetyApprovalContent = res.data.pd.safetyList.map(item => item.APPROVAL_CONTENT).join(', '); + } + + if (_this.pd.ACCEPT_USER_SIGNER_TIME) { + _this.pd.ACCEPT_USER_SIGNER_TIME = _this.pd.ACCEPT_USER_SIGNER_TIME.split(',')[0]; + } + _this.pd = Object.assign(_this.pd, { "CONFIRM_USER_MEASURES": _this.pd.OTHER_PROTECTIVE_MEASURES.split(";_;")[0], @@ -801,6 +832,9 @@ }) _this.pd.OTHER_PROTECTIVE_MEASURES = '' _this.measuresList = res.data.measuresList + if (_this.pd.safetyList && _this.pd.safetyList.length > 0) { + _this.pd.APPROVAL_CONTENT = _this.pd.safetyList.map(item => item.APPROVAL_CONTENT).join(', '); + } if(_this.pd.APPLY_STATUS < 1){ _this.forbidEdit = false; } diff --git a/pages/application/hotwork_cfd/hotwork-leader/hotwork-leader-detail.vue b/pages/application/hotwork_cfd/hotwork-leader/hotwork-leader-detail.vue index fe8f283..3b7922f 100644 --- a/pages/application/hotwork_cfd/hotwork-leader/hotwork-leader-detail.vue +++ b/pages/application/hotwork_cfd/hotwork-leader/hotwork-leader-detail.vue @@ -161,6 +161,11 @@ + + + 安全检查项： + {{ pd.safetyApprovalContent }} + 作业负责人： @@ -255,15 +260,15 @@ - + 接受交底人 {{ item.ACCEPT_CONFESS_USER_NAME }} {{ item.APPROVAL_SIGNATURE_TIME }} - - + + @@ -397,7 +402,8 @@ acceptUserList:[], acceptindex:-1, pd:{ - OTHER_PROTECTIVE_MEASURES:';_;;_;;_;;_;;_;;_;;_;' + OTHER_PROTECTIVE_MEASURES:';_;;_;;_;;_;;_;;_;;_;', + safetyApprovalContent: '', },// 数据 measuresList:[], rules:[ @@ -498,6 +504,10 @@ _this.forbidEdit = false; } + if (res.data.pd.safetyList && res.data.pd.safetyList.length > 0) { + _this.pd.safetyApprovalContent = res.data.pd.safetyList.map(item => item.APPROVAL_CONTENT).join(', '); + } + let dongHuoCaoZuoRenPic = res.data.imgList2 if (dongHuoCaoZuoRenPic && dongHuoCaoZuoRenPic.length > 0) { _this.pd.dongHuoCaoZuoRenPic = [] diff --git a/pages/application/hotwork_cfd/hotwork-monitor/hotwork-monitor-alldetail.vue b/pages/application/hotwork_cfd/hotwork-monitor/hotwork-monitor-alldetail.vue index f8aec09..3f9bb9a 100644 --- a/pages/application/hotwork_cfd/hotwork-monitor/hotwork-monitor-alldetail.vue +++ b/pages/application/hotwork_cfd/hotwork-monitor/hotwork-monitor-alldetail.vue @@ -181,11 +181,16 @@ - - 其他安全措施： - - - + + + + + + + + + 安全检查项： + {{ pd.safetyApprovalContent }} @@ -216,6 +221,11 @@ 动火审批人： {{ pd.AUDIT_USER_MEASURES}} + + + + 动火前验票： + {{ pd.APPROVE_USER_MEASURES}} @@ -250,15 +260,15 @@ - + 接受交底人 {{ item.ACCEPT_CONFESS_USER_NAME }} {{ item.APPROVAL_SIGNATURE_TIME }} - - + + @@ -672,7 +682,8 @@ acceptUserList:[], acceptindex:-1, pd:{ - OTHER_PROTECTIVE_MEASURES:';_;;_;;_;;_;;_;;_;;_;' + OTHER_PROTECTIVE_MEASURES:';_;;_;;_;;_;;_;;_;;_;', + safetyApprovalContent: '', },// 数据 measuresList:[], rules:[ @@ -802,8 +813,16 @@ "APPROVE_USER_MEASURES": _this.pd.OTHER_PROTECTIVE_MEASURES.split(";_;")[4], "MONITOR_USER_MEASURES": _this.pd.OTHER_PROTECTIVE_MEASURES.split(";_;")[5] }) + + if (res.data.pd.safetyList && res.data.pd.safetyList.length > 0) { + _this.pd.safetyApprovalContent = res.data.pd.safetyList.map(item => item.APPROVAL_CONTENT).join(', '); + } + _this.pd.OTHER_PROTECTIVE_MEASURES = '' _this.measuresList = res.data.measuresList + if (_this.pd.safetyList && _this.pd.safetyList.length > 0) { + _this.pd.APPROVAL_CONTENT = _this.pd.safetyList.map(item => item.APPROVAL_CONTENT).join(', '); + } if(_this.pd.APPLY_STATUS < 1){ _this.forbidEdit = false; } diff --git a/pages/application/hotwork_cfd/hotwork-monitor/hotwork-monitor-detail.vue b/pages/application/hotwork_cfd/hotwork-monitor/hotwork-monitor-detail.vue index 34892aa..9bfdba7 100644 --- a/pages/application/hotwork_cfd/hotwork-monitor/hotwork-monitor-detail.vue +++ b/pages/application/hotwork_cfd/hotwork-monitor/hotwork-monitor-detail.vue @@ -166,6 +166,11 @@ + + + 安全检查项： + {{ pd.safetyApprovalContent }} + 作业负责人： @@ -250,15 +255,15 @@ - + 接受交底人 {{ item.ACCEPT_CONFESS_USER_NAME }} {{ item.APPROVAL_SIGNATURE_TIME }} - - + + @@ -293,18 +298,18 @@ - - - - - 项目主管部门负责意见 - - + + + 项目主管部门负责意见 + 项目主管部门负责人 {{pd.EXAMINE_USER_NAME}} {{pd.EXAMINE_APPROVAL_CREATE_TIME}} + + + @@ -437,7 +442,8 @@ acceptUserList:[], acceptindex:-1, pd:{ - OTHER_PROTECTIVE_MEASURES:';_;;_;;_;;_;;_;;_;;_;' + OTHER_PROTECTIVE_MEASURES:';_;;_;;_;;_;;_;;_;;_;', + safetyApprovalContent: '', },// 数据 measuresList:[], rules:[ @@ -548,6 +554,10 @@ _this.forbidEdit = false; } + if (res.data.pd.safetyList && res.data.pd.safetyList.length > 0) { + _this.pd.safetyApprovalContent = res.data.pd.safetyList.map(item => item.APPROVAL_CONTENT).join(', '); + } + let dongHuoCaoZuoRenPic = res.data.imgList2 if (dongHuoCaoZuoRenPic && dongHuoCaoZuoRenPic.length > 0) { _this.pd.dongHuoCaoZuoRenPic = [] diff --git a/pages/application/hotwork_cfd/hotwork-safety/hotwork-safety-detail.vue b/pages/application/hotwork_cfd/hotwork-safety/hotwork-safety-detail.vue index 7ad38d8..d01717c 100644 --- a/pages/application/hotwork_cfd/hotwork-safety/hotwork-safety-detail.vue +++ b/pages/application/hotwork_cfd/hotwork-safety/hotwork-safety-detail.vue @@ -215,15 +215,15 @@ - + 接受交底人 {{ item.ACCEPT_CONFESS_USER_NAME }} {{ item.APPROVAL_SIGNATURE_TIME }} - - + + @@ -355,8 +355,13 @@ 验收部门负责人 {{pd.ACCEPT_USER_NAME}} {{pd.ACCEPT_USER_SIGNER_TIME}} - - + + + + + + + @@ -584,6 +589,17 @@ export default { if ("success" == res.data.result) { uni.hideLoading(); _this.pd = res.data.pd; //参数map + + if (_this.pd.ACCEPT_USER_SIGNER_PATH) { + _this.pd.ACCEPT_USER_SIGNER_PATH_ARRAY = _this.pd.ACCEPT_USER_SIGNER_PATH.split(',').map(item => item.trim()); + } else { + _this.pd.ACCEPT_USER_SIGNER_PATH_ARRAY = []; + } + + if (_this.pd.ACCEPT_USER_SIGNER_TIME) { + _this.pd.ACCEPT_USER_SIGNER_TIME = _this.pd.ACCEPT_USER_SIGNER_TIME.split(',')[0]; + } + if (res.data.measuresList && res.data.measuresList.length > 0) { _this.measuresList = res.data.measuresList }else { @@ -596,6 +612,7 @@ export default { // _this.updateForbidEdit(); let dongHuoCaoZuoRenPic = res.data.imgList2 + console.log(dongHuoCaoZuoRenPic,'11111111111111111111111111111') if (dongHuoCaoZuoRenPic && dongHuoCaoZuoRenPic.length > 0) { _this.pd.dongHuoCaoZuoRenPic = [] for (let i = 0; i < dongHuoCaoZuoRenPic.length; i++) { diff --git a/pages/application/hotwork_cfd/hotwork-xiang-mu/hotwork-xiang-alldetail.vue b/pages/application/hotwork_cfd/hotwork-xiang-mu/hotwork-xiang-alldetail.vue index 31aeaa6..7c949c5 100644 --- a/pages/application/hotwork_cfd/hotwork-xiang-mu/hotwork-xiang-alldetail.vue +++ b/pages/application/hotwork_cfd/hotwork-xiang-mu/hotwork-xiang-alldetail.vue @@ -181,22 +181,27 @@ - - 其他安全措施： - - - + + + + + + + + + 安全检查项： + {{ pd.safetyApprovalContent }} 作业负责人： {{ pd.CONFIRM_OTHER_CONTENT}} - - - - - + + + 项目责任负责人： + {{ pd.BELONGING_USER_MEASURES}} + @@ -255,15 +260,15 @@ - + 接受交底人 {{ item.ACCEPT_CONFESS_USER_NAME }} {{ item.APPROVAL_SIGNATURE_TIME }} - - + + @@ -591,9 +596,14 @@ 验收部门负责人 {{pd.ACCEPT_USER_NAME}} {{pd.ACCEPT_USER_SIGNER_TIME}} - - - + + + + + + + + @@ -677,7 +687,8 @@ acceptUserList:[], acceptindex:-1, pd:{ - OTHER_PROTECTIVE_MEASURES:';_;;_;;_;;_;;_;;_;;_;' + OTHER_PROTECTIVE_MEASURES:';_;;_;;_;;_;;_;;_;;_;', + safetyApprovalContent: '', },// 数据 measuresList:[], rules:[ @@ -798,6 +809,21 @@ if (res.data.pd.confessList && res.data.pd.confessList.length > 0) { _this.pd.APPROVAL_SIGNATURE = res.data.pd.confessList[0].APPROVAL_SIGNATURE; } + + if (res.data.pd.safetyList && res.data.pd.safetyList.length > 0) { + _this.pd.safetyApprovalContent = res.data.pd.safetyList.map(item => item.APPROVAL_CONTENT).join(', '); + } + + if (_this.pd.ACCEPT_USER_SIGNER_PATH) { + _this.pd.ACCEPT_USER_SIGNER_PATH_ARRAY = _this.pd.ACCEPT_USER_SIGNER_PATH.split(',').map(item => item.trim()); + } else { + _this.pd.ACCEPT_USER_SIGNER_PATH_ARRAY = []; + } + + if (_this.pd.ACCEPT_USER_SIGNER_TIME) { + _this.pd.ACCEPT_USER_SIGNER_TIME = _this.pd.ACCEPT_USER_SIGNER_TIME.split(',')[0]; + } + _this.pd = Object.assign(_this.pd, { "CONFIRM_USER_MEASURES": _this.pd.OTHER_PROTECTIVE_MEASURES.split(";_;")[0], @@ -809,6 +835,9 @@ }) _this.pd.OTHER_PROTECTIVE_MEASURES = '' _this.measuresList = res.data.measuresList + if (_this.pd.safetyList && _this.pd.safetyList.length > 0) { + _this.pd.APPROVAL_CONTENT = _this.pd.safetyList.map(item => item.APPROVAL_CONTENT).join(', '); + } if(_this.pd.APPLY_STATUS < 1){ _this.forbidEdit = false; } diff --git a/pages/application/hotwork_cfd/hotwork-xiang-mu/hotwork-xiang-detail.vue b/pages/application/hotwork_cfd/hotwork-xiang-mu/hotwork-xiang-detail.vue index 21a5057..4613210 100644 --- a/pages/application/hotwork_cfd/hotwork-xiang-mu/hotwork-xiang-detail.vue +++ b/pages/application/hotwork_cfd/hotwork-xiang-mu/hotwork-xiang-detail.vue @@ -163,6 +163,11 @@ + + + 安全检查项： + {{ pd.safetyApprovalContent }} + 作业负责人： @@ -255,15 +260,15 @@ - + 接受交底人 {{ item.ACCEPT_CONFESS_USER_NAME }} {{ item.APPROVAL_SIGNATURE_TIME }} - - + + @@ -389,7 +394,8 @@ export default { acceptUserList: [], acceptindex: -1, pd: { - OTHER_PROTECTIVE_MEASURES: ';_;;_;;_;;_;;_;;_;;_;' + OTHER_PROTECTIVE_MEASURES: ';_;;_;;_;;_;;_;;_;;_;', + safetyApprovalContent: '', },// 数据 measuresList: [], rules: [ @@ -487,6 +493,10 @@ export default { _this.forbidEdit = false; } + if (res.data.pd.safetyList && res.data.pd.safetyList.length > 0) { + _this.pd.safetyApprovalContent = res.data.pd.safetyList.map(item => item.APPROVAL_CONTENT).join(', '); + } + let dongHuoCaoZuoRenPic = res.data.imgList2 if (dongHuoCaoZuoRenPic && dongHuoCaoZuoRenPic.length > 0) { _this.pd.dongHuoCaoZuoRenPic = []