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 fa6d80c..47c40c3 100644 --- a/pages/application/hotwork_cfd/hotwork-accept/hotwork-accept-detail.vue +++ b/pages/application/hotwork_cfd/hotwork-accept/hotwork-accept-detail.vue @@ -526,7 +526,6 @@ title: '请稍候' }) if (STATUS == 8) { - if (_this.imgList.length <= 0) { uni.showToast({ icon: 'none', @@ -730,7 +729,6 @@ }, url: basePath + '/app/limitspace/listAllSpace?tm=' + new Date().getTime(), data: {CORPINFO_ID: corpinfoId}, - dataType: 'json', success: function (res) { _this.limitSpaceList = res.data.varList; } diff --git a/pages/application/hotwork_cfd/hotwork-accept/hotwork-accept-list.vue b/pages/application/hotwork_cfd/hotwork-accept/hotwork-accept-list.vue index fd22fd1..bbcf7e5 100644 --- a/pages/application/hotwork_cfd/hotwork-accept/hotwork-accept-list.vue +++ b/pages/application/hotwork_cfd/hotwork-accept/hotwork-accept-list.vue @@ -3,18 +3,9 @@ 返回 完工验收 - - - - - - - - - 动火作业待提交 - + - - + + @@ -137,11 +128,6 @@ 安全交底人:{{CONFESS_USER_NAME}}已签字 - - - 安全交底人:{{CONFESS_USER_NAME}}未签字 - - 接受交底人:{{ACCEPT_CONFESS_USER_NAME}}已签字 @@ -326,6 +312,12 @@ USER_NAME: STATUS.CONFIRM_USER_NAME, TIME: STATUS.CONFIRM_USER_SIGNER_TIME }, + { + id: '1.5', + name: '项目主管部门意见', + USER_NAME: STATUS.BELONGING_USER_NAME, + TIME: STATUS.BELONGING_SIGNATURE_TIME + }, { id: '2', name: '属地监管单位意见', diff --git a/pages/application/hotwork_cfd/hotwork-acceptconfess/hotwork-acceptconfess-list.vue b/pages/application/hotwork_cfd/hotwork-acceptconfess/hotwork-acceptconfess-list.vue index 3cb0b6d..e0ff04a 100644 --- a/pages/application/hotwork_cfd/hotwork-acceptconfess/hotwork-acceptconfess-list.vue +++ b/pages/application/hotwork_cfd/hotwork-acceptconfess/hotwork-acceptconfess-list.vue @@ -64,15 +64,15 @@ 审核状态: - - + + - - + + @@ -323,6 +323,12 @@ USER_NAME: STATUS.CONFIRM_USER_NAME, TIME: STATUS.CONFIRM_USER_SIGNER_TIME }, + { + id: '1.5', + name: '项目主管部门意见', + USER_NAME: STATUS.BELONGING_USER_NAME, + TIME: STATUS.BELONGING_SIGNATURE_TIME + }, { id: '2', name: '属地监管单位意见', diff --git a/pages/application/hotwork_cfd/hotwork-apply/hotwork-apply-list.vue b/pages/application/hotwork_cfd/hotwork-apply/hotwork-apply-list.vue index 51e9c1e..52fdaa5 100644 --- a/pages/application/hotwork_cfd/hotwork-apply/hotwork-apply-list.vue +++ b/pages/application/hotwork_cfd/hotwork-apply/hotwork-apply-list.vue @@ -65,15 +65,15 @@ 审核状态: - + + - @@ -330,6 +330,12 @@ USER_NAME: STATUS.CONFIRM_USER_NAME, TIME: STATUS.CONFIRM_USER_SIGNER_TIME }, + { + id: '1.5', + name: '项目主管部门意见', + USER_NAME: STATUS.BELONGING_USER_NAME, + TIME: STATUS.BELONGING_SIGNATURE_TIME + }, { id: '2', name: '所在单位意见', @@ -371,12 +377,12 @@ this.$refs[e].open() this.showStatus = STATUS.APPLY_STATUS this.APPLY_STATUS = STATUS.APPLY_STATUS - this.GUARDIAN_USER_SIGNER_TIME = STATUS.GUARDIAN_USER_SIGNER_TIME - this.GUARDIAN_USER_NAME = STATUS.GUARDIAN_USER_NAME - this.CONFESS_USER_SIGNER_TIME = STATUS.CONFESS_USER_SIGNER_TIME - this.CONFESS_USER_NAME = STATUS.CONFESS_USER_NAME - this.ACCEPT_CONFESS_USER_SIGNER_TIME = STATUS.ACCEPT_CONFESS_USER_SIGNER_TIME - this.ACCEPT_CONFESS_USER_NAME = STATUS.ACCEPT_CONFESS_USER_NAME + this.GUARDIAN_USER_SIGNER_TIME = STATUS.GUARDIAN_USER_SIGNER_TIME + this.GUARDIAN_USER_NAME = STATUS.GUARDIAN_USER_NAME + this.CONFESS_USER_SIGNER_TIME = STATUS.CONFESS_USER_SIGNER_TIME + this.CONFESS_USER_NAME = STATUS.CONFESS_USER_NAME + this.ACCEPT_CONFESS_USER_SIGNER_TIME = STATUS.ACCEPT_CONFESS_USER_SIGNER_TIME + this.ACCEPT_CONFESS_USER_NAME = STATUS.ACCEPT_CONFESS_USER_NAME }, getShowStatus(step) { diff --git a/pages/application/hotwork_cfd/hotwork-approve/hotwork-approve-list.vue b/pages/application/hotwork_cfd/hotwork-approve/hotwork-approve-list.vue index 9fe2055..8f50ad4 100644 --- a/pages/application/hotwork_cfd/hotwork-approve/hotwork-approve-list.vue +++ b/pages/application/hotwork_cfd/hotwork-approve/hotwork-approve-list.vue @@ -55,15 +55,15 @@ 审核状态: - + + - @@ -318,6 +318,12 @@ USER_NAME: STATUS.CONFIRM_USER_NAME, TIME: STATUS.CONFIRM_USER_SIGNER_TIME }, + { + id: '1.5', + name: '项目主管部门意见', + USER_NAME: STATUS.BELONGING_USER_NAME, + TIME: STATUS.BELONGING_SIGNATURE_TIME + }, { id: '2', name: '属地监管单位意见', diff --git a/pages/application/hotwork_cfd/hotwork-audit/hotwork-audit-list.vue b/pages/application/hotwork_cfd/hotwork-audit/hotwork-audit-list.vue index 1cb5cd7..5de80d8 100644 --- a/pages/application/hotwork_cfd/hotwork-audit/hotwork-audit-list.vue +++ b/pages/application/hotwork_cfd/hotwork-audit/hotwork-audit-list.vue @@ -3,18 +3,9 @@ 返回 安全管理部门意见 - - - - - - - - - 动火作业待提交 - + + - @@ -327,6 +318,12 @@ USER_NAME: STATUS.CONFIRM_USER_NAME, TIME: STATUS.CONFIRM_USER_SIGNER_TIME }, + { + id: '1.5', + name: '项目主管部门意见', + USER_NAME: STATUS.BELONGING_USER_NAME, + TIME: STATUS.BELONGING_SIGNATURE_TIME + }, { id: '2', name: '属地监管单位意见', diff --git a/pages/application/hotwork_cfd/hotwork-confess/hotwork-confess-list.vue b/pages/application/hotwork_cfd/hotwork-confess/hotwork-confess-list.vue index 076010c..7351a29 100644 --- a/pages/application/hotwork_cfd/hotwork-confess/hotwork-confess-list.vue +++ b/pages/application/hotwork_cfd/hotwork-confess/hotwork-confess-list.vue @@ -64,15 +64,15 @@ 审核状态: - + + - @@ -323,6 +323,12 @@ USER_NAME: STATUS.CONFIRM_USER_NAME, TIME: STATUS.CONFIRM_USER_SIGNER_TIME }, + { + id: '1.5', + name: '项目主管部门意见', + USER_NAME: STATUS.BELONGING_USER_NAME, + TIME: STATUS.BELONGING_SIGNATURE_TIME + }, { id: '2', name: '属地监管单位意见', diff --git a/pages/application/hotwork_cfd/hotwork-confirm/hotwork-confirm-list.vue b/pages/application/hotwork_cfd/hotwork-confirm/hotwork-confirm-list.vue index ad69a4f..e68b0b2 100644 --- a/pages/application/hotwork_cfd/hotwork-confirm/hotwork-confirm-list.vue +++ b/pages/application/hotwork_cfd/hotwork-confirm/hotwork-confirm-list.vue @@ -64,15 +64,15 @@ 审核状态: - + + - @@ -335,6 +335,12 @@ USER_NAME: STATUS.CONFIRM_USER_NAME, TIME: STATUS.CONFIRM_USER_SIGNER_TIME }, + { + id: '1.5', + name: '项目主管部门意见', + USER_NAME: STATUS.BELONGING_USER_NAME, + TIME: STATUS.BELONGING_SIGNATURE_TIME + }, { id: '2', name: '所在单位意见', diff --git a/pages/application/hotwork_cfd/hotwork-gas/hotwork-gas-list.vue b/pages/application/hotwork_cfd/hotwork-gas/hotwork-gas-list.vue index 00f7876..6b33114 100644 --- a/pages/application/hotwork_cfd/hotwork-gas/hotwork-gas-list.vue +++ b/pages/application/hotwork_cfd/hotwork-gas/hotwork-gas-list.vue @@ -3,18 +3,9 @@ 返回 气体分析 - - - - - - - - - 动火作业待提交 - + + - @@ -323,6 +323,12 @@ USER_NAME: STATUS.CONFIRM_USER_NAME, TIME: STATUS.CONFIRM_USER_SIGNER_TIME }, + { + id: '1.5', + name: '项目主管部门意见', + USER_NAME: STATUS.BELONGING_USER_NAME, + TIME: STATUS.BELONGING_SIGNATURE_TIME + }, { id: '2', name: '属地监管单位意见', diff --git a/pages/application/hotwork_cfd/hotwork-leader/hotwork-leader-list.vue b/pages/application/hotwork_cfd/hotwork-leader/hotwork-leader-list.vue index 3dccb66..c9b9b07 100644 --- a/pages/application/hotwork_cfd/hotwork-leader/hotwork-leader-list.vue +++ b/pages/application/hotwork_cfd/hotwork-leader/hotwork-leader-list.vue @@ -55,15 +55,15 @@ 审核状态: - + + - @@ -318,6 +318,12 @@ USER_NAME: STATUS.CONFIRM_USER_NAME, TIME: STATUS.CONFIRM_USER_SIGNER_TIME }, + { + id: '1.5', + name: '项目主管部门意见', + USER_NAME: STATUS.BELONGING_USER_NAME, + TIME: STATUS.BELONGING_SIGNATURE_TIME + }, { id: '2', name: '所在单位意见', diff --git a/pages/application/hotwork_cfd/hotwork-monitor/hotwork-monitor-list.vue b/pages/application/hotwork_cfd/hotwork-monitor/hotwork-monitor-list.vue index dc8fbb0..f62413f 100644 --- a/pages/application/hotwork_cfd/hotwork-monitor/hotwork-monitor-list.vue +++ b/pages/application/hotwork_cfd/hotwork-monitor/hotwork-monitor-list.vue @@ -55,15 +55,15 @@ 审核状态: - + + - @@ -335,6 +335,12 @@ USER_NAME: STATUS.CONFIRM_USER_NAME, TIME: STATUS.CONFIRM_USER_SIGNER_TIME }, + { + id: '1.5', + name: '项目主管部门意见', + USER_NAME: STATUS.BELONGING_USER_NAME, + TIME: STATUS.BELONGING_SIGNATURE_TIME + }, { id: '2', name: '所在单位意见', diff --git a/pages/application/hotwork_cfd/hotwork-safety/hotwork-safety-list.vue b/pages/application/hotwork_cfd/hotwork-safety/hotwork-safety-list.vue index f8d9a7b..6b177d4 100644 --- a/pages/application/hotwork_cfd/hotwork-safety/hotwork-safety-list.vue +++ b/pages/application/hotwork_cfd/hotwork-safety/hotwork-safety-list.vue @@ -55,15 +55,15 @@ 审核状态: - + + - @@ -312,6 +312,12 @@ USER_NAME: STATUS.CONFIRM_USER_NAME, TIME: STATUS.CONFIRM_USER_SIGNER_TIME }, + { + id: '1.5', + name: '项目主管部门意见', + USER_NAME: STATUS.BELONGING_USER_NAME, + TIME: STATUS.BELONGING_SIGNATURE_TIME + }, { id: '2', name: '所在单位意见', diff --git a/pages/application/hotwork_cfd/hotwork-xiang-mu/hotwork-xiang-list.vue b/pages/application/hotwork_cfd/hotwork-xiang-mu/hotwork-xiang-list.vue index a1dab75..b8c5180 100644 --- a/pages/application/hotwork_cfd/hotwork-xiang-mu/hotwork-xiang-list.vue +++ b/pages/application/hotwork_cfd/hotwork-xiang-mu/hotwork-xiang-list.vue @@ -55,15 +55,15 @@ 审核状态: - + + - @@ -317,6 +317,12 @@ USER_NAME: STATUS.CONFIRM_USER_NAME, TIME: STATUS.CONFIRM_USER_SIGNER_TIME }, + { + id: '1.5', + name: '项目主管部门意见', + USER_NAME: STATUS.BELONGING_USER_NAME, + TIME: STATUS.BELONGING_SIGNATURE_TIME + }, { id: '2', name: '所在单位意见',