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 d7e633a..6f49eb5 100644 --- a/pages/application/hotwork_cfd/hotwork-accept/hotwork-accept-detail.vue +++ b/pages/application/hotwork_cfd/hotwork-accept/hotwork-accept-detail.vue @@ -495,7 +495,11 @@ export default { { name: 'AUDIT_USER_ID', message: '请选择安全管理部门负责人' }, { name: 'APPROVE_USER_ID', message: '请选择审批人' }, { name: 'MONITOR_USER_ID', message: '请选择验票班长' }, - { name: 'ACCEPT_USER_ID', message: '请选择验收部门负责人' } + { name: 'ACCEPT_USER_ID', message: '请选择验收部门负责人' }, + { name: 'FIRE_COMPLETED', message: '请选择动火完成情况' }, + { name: 'SITE_CLEANED', message: '请选择作业现场清理情况' }, + { name: 'NO_REMAINING_EMBERS', message: '请选择遗留火种情况' } + ], todayDate: '', modalName: null, 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 92b208a..114a6dc 100644 --- a/pages/application/hotwork_cfd/hotwork-accept/hotwork-accept-list.vue +++ b/pages/application/hotwork_cfd/hotwork-accept/hotwork-accept-list.vue @@ -136,12 +136,12 @@ 安全交底人:{{confessUserNames}}未签字 - + 接受交底人:{{acceptConfessUserNames}}已签字 - + 接受交底人:{{acceptConfessUserNames}}未签字 @@ -237,8 +237,9 @@ ACCEPT_CONFESS_USER_SIGNER_TIME: '', ACCEPT_CONFESS_USER_NAME: '', confessStatus: '', - acceptConfessUserNames: '', - confessUserNames: '' + confessUserNames: '', + acceptConfessStatus: '', + acceptConfessUserNames: '' } }, onReady() { @@ -379,6 +380,7 @@ this.ACCEPT_CONFESS_USER_NAME = STATUS.ACCEPT_CONFESS_USER_NAME this.confessStatus = STATUS.confessStatus this.confessUserNames = STATUS.confessUserNames + this.acceptConfessStatus = STATUS.acceptConfessStatus this.acceptConfessUserNames = STATUS.acceptConfessUserNames }, 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 3f0fe76..7d56e5a 100644 --- a/pages/application/hotwork_cfd/hotwork-approve/hotwork-approve-list.vue +++ b/pages/application/hotwork_cfd/hotwork-approve/hotwork-approve-list.vue @@ -136,12 +136,12 @@ 安全交底人:{{confessUserNames}}未签字 - + 接受交底人:{{acceptConfessUserNames}}已签字 - + 接受交底人:{{acceptConfessUserNames}}未签字 @@ -237,8 +237,9 @@ ACCEPT_CONFESS_USER_SIGNER_TIME: '', ACCEPT_CONFESS_USER_NAME: '', confessStatus: '', - acceptConfessUserNames: '', - confessUserNames: '' + confessUserNames: '', + acceptConfessStatus: '', + acceptConfessUserNames: '' } }, onReady() { @@ -380,6 +381,7 @@ this.ACCEPT_CONFESS_USER_NAME = STATUS.ACCEPT_CONFESS_USER_NAME this.confessStatus = STATUS.confessStatus this.confessUserNames = STATUS.confessUserNames + this.acceptConfessStatus = STATUS.acceptConfessStatus this.acceptConfessUserNames = STATUS.acceptConfessUserNames }, getShowStatus(step) { 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 05bd3eb..80120ae 100644 --- a/pages/application/hotwork_cfd/hotwork-audit/hotwork-audit-list.vue +++ b/pages/application/hotwork_cfd/hotwork-audit/hotwork-audit-list.vue @@ -136,12 +136,12 @@ 安全交底人:{{confessUserNames}}未签字 - + 接受交底人:{{acceptConfessUserNames}}已签字 - + 接受交底人:{{acceptConfessUserNames}}未签字 @@ -237,8 +237,9 @@ ACCEPT_CONFESS_USER_SIGNER_TIME: '', ACCEPT_CONFESS_USER_NAME: '', confessStatus: '', - acceptConfessUserNames: '', - confessUserNames: '' + confessUserNames: '', + acceptConfessStatus: '', + acceptConfessUserNames: '' } }, onReady() { @@ -380,6 +381,7 @@ this.ACCEPT_CONFESS_USER_NAME = STATUS.ACCEPT_CONFESS_USER_NAME this.confessStatus = STATUS.confessStatus this.confessUserNames = STATUS.confessUserNames + this.acceptConfessStatus = STATUS.acceptConfessStatus this.acceptConfessUserNames = STATUS.acceptConfessUserNames }, getShowStatus(step) { 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 7e8f70f..5e86015 100644 --- a/pages/application/hotwork_cfd/hotwork-confirm/hotwork-confirm-list.vue +++ b/pages/application/hotwork_cfd/hotwork-confirm/hotwork-confirm-list.vue @@ -145,12 +145,12 @@ 安全交底人:{{confessUserNames}}未签字 - + 接受交底人:{{acceptConfessUserNames}}已签字 - + 接受交底人:{{acceptConfessUserNames}}未签字 @@ -246,8 +246,9 @@ ACCEPT_CONFESS_USER_SIGNER_TIME: '', ACCEPT_CONFESS_USER_NAME: '', confessStatus: '', - acceptConfessUserNames: '', - confessUserNames: '' + confessUserNames: '', + acceptConfessStatus: '', + acceptConfessUserNames: '' } }, onReady() { @@ -397,6 +398,7 @@ this.ACCEPT_CONFESS_USER_NAME = STATUS.ACCEPT_CONFESS_USER_NAME this.confessStatus = STATUS.confessStatus this.confessUserNames = STATUS.confessUserNames + this.acceptConfessStatus = STATUS.acceptConfessStatus this.acceptConfessUserNames = STATUS.acceptConfessUserNames }, getShowStatus(step) { 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 e4a5c7e..28341f0 100644 --- a/pages/application/hotwork_cfd/hotwork-leader/hotwork-leader-list.vue +++ b/pages/application/hotwork_cfd/hotwork-leader/hotwork-leader-list.vue @@ -136,12 +136,12 @@ 安全交底人:{{confessUserNames}}未签字 - + 接受交底人:{{acceptConfessUserNames}}已签字 - + 接受交底人:{{acceptConfessUserNames}}未签字 @@ -237,8 +237,9 @@ ACCEPT_CONFESS_USER_SIGNER_TIME: '', ACCEPT_CONFESS_USER_NAME: '', confessStatus: '', - acceptConfessUserNames: '', - confessUserNames: '' + confessUserNames: '', + acceptConfessStatus: '', + acceptConfessUserNames: '' } }, onReady() { @@ -380,6 +381,7 @@ this.ACCEPT_CONFESS_USER_NAME = STATUS.ACCEPT_CONFESS_USER_NAME this.confessStatus = STATUS.confessStatus this.confessUserNames = STATUS.confessUserNames + this.acceptConfessStatus = STATUS.acceptConfessStatus this.acceptConfessUserNames = STATUS.acceptConfessUserNames }, getShowStatus(step) { 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 690ccc7..4581e3f 100644 --- a/pages/application/hotwork_cfd/hotwork-monitor/hotwork-monitor-list.vue +++ b/pages/application/hotwork_cfd/hotwork-monitor/hotwork-monitor-list.vue @@ -136,12 +136,12 @@ 安全交底人:{{confessUserNames}}未签字 - + 接受交底人:{{acceptConfessUserNames}}已签字 - + 接受交底人:{{acceptConfessUserNames}}未签字 @@ -238,8 +238,9 @@ ACCEPT_CONFESS_USER_SIGNER_TIME: '', ACCEPT_CONFESS_USER_NAME: '', confessStatus: '', - acceptConfessUserNames: '', - confessUserNames: '' + confessUserNames: '', + acceptConfessStatus: '', + acceptConfessUserNames: '' } }, onReady() { @@ -397,6 +398,7 @@ this.ACCEPT_CONFESS_USER_NAME = STATUS.ACCEPT_CONFESS_USER_NAME this.confessStatus = STATUS.confessStatus this.confessUserNames = STATUS.confessUserNames + this.acceptConfessStatus = STATUS.acceptConfessStatus this.acceptConfessUserNames = STATUS.acceptConfessUserNames }, getShowStatus(step) { 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 2baf1bb..ed54bd5 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 @@ -136,12 +136,12 @@ 安全交底人:{{confessUserNames}}未签字 - + 接受交底人:{{acceptConfessUserNames}}已签字 - + 接受交底人:{{acceptConfessUserNames}}未签字 @@ -237,8 +237,9 @@ ACCEPT_CONFESS_USER_SIGNER_TIME: '', ACCEPT_CONFESS_USER_NAME: '', confessStatus: '', - acceptConfessUserNames: '', - confessUserNames: '' + confessUserNames: '', + acceptConfessStatus: '', + acceptConfessUserNames: '' } }, onReady() { @@ -379,6 +380,7 @@ this.ACCEPT_CONFESS_USER_NAME = STATUS.ACCEPT_CONFESS_USER_NAME this.confessStatus = STATUS.confessStatus this.confessUserNames = STATUS.confessUserNames + this.acceptConfessStatus = STATUS.acceptConfessStatus this.acceptConfessUserNames = STATUS.acceptConfessUserNames }, getShowStatus(step) {