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 29ad153..dbc37b0 100644 --- a/pages/application/hotwork_cfd/hotwork-confirm/hotwork-confirm-detail.vue +++ b/pages/application/hotwork_cfd/hotwork-confirm/hotwork-confirm-detail.vue @@ -226,8 +226,8 @@ - - + + @@ -411,7 +411,7 @@ formData.OPERATOR = loginUser.USER_ID formData.ACTION_USER = loginUser.NAME formData.APPLY_STATUS = STATUS - if (STATUS === '2') { + if (STATUS === '1.5') { uni.request({ url: basePath + '/app/hotwork/cfd/check', method: 'POST', @@ -424,46 +424,46 @@ success: (res) => { if ("success" === res.data.result) { uni.hideLoading(); - // if (res.data.passFlag === '0') { - // uni.showModal({ - // title: '', - // content: res.data.message, - // cancelColor: "#000000", - // cancelText: '取消', - // confirmText: '确定', - // success: res => { - // this.buttonloading = false - // } - // }) - // } else { - // formData.STATUS = STATUS - // formData.measuresList = JSON.stringify(this.measuresList) - // formData.CORPINFO_ID = loginUser.CORPINFO_ID - // formData.USER_ID = loginUser.USER_ID - // this.buttonloading = true - // uni.uploadFile({ - // url: basePath + '/app/hotwork/cfd/editStatus', - // filePath: _this.imgList[0].filePath, - // name: 'FFILE', - // formData: formData, - // success: (res) => { - // uni.showToast({ - // icon: 'none', - // title: '保存成功', - // duration: 2000 - // }); - // _this.goback() - // this.buttonloading = false - // }, - // fail: (err) => { - // uni.hideLoading(); - // uni.showModal({ - // content: err.errMsg, - // showCancel: false - // }); - // } - // }) - // } + if (res.data.passFlag === '0') { + uni.showModal({ + title: '', + content: res.data.message, + cancelColor: "#000000", + cancelText: '取消', + confirmText: '确定', + success: res => { + this.buttonloading = false + } + }) + } else { + formData.STATUS = STATUS + formData.measuresList = JSON.stringify(this.measuresList) + formData.CORPINFO_ID = loginUser.CORPINFO_ID + formData.USER_ID = loginUser.USER_ID + this.buttonloading = true + uni.uploadFile({ + url: basePath + '/app/hotwork/cfd/editStatus', + filePath: _this.imgList[0].filePath, + name: 'FFILE', + formData: formData, + success: (res) => { + uni.showToast({ + icon: 'none', + title: '保存成功', + duration: 2000 + }); + _this.goback() + this.buttonloading = false + }, + fail: (err) => { + uni.hideLoading(); + uni.showModal({ + content: err.errMsg, + showCancel: false + }); + } + }) + } } else if ("exception" === data.result) { uni.showToast({ title: '错误',