From 7f84c202ad44aa342717c0f62832bfd8f385bc70 Mon Sep 17 00:00:00 2001 From: liujun Date: Tue, 9 Apr 2024 14:49:57 +0800 Subject: [PATCH] =?UTF-8?q?15008=20=E6=B5=81=E7=A8=8B=E5=9B=BE=20=E5=AE=A1?= =?UTF-8?q?=E6=89=B9=E9=80=9A=E8=BF=87=E5=90=8E=20=E6=9C=89=E7=9A=84?= =?UTF-8?q?=E8=8A=82=E7=82=B9=E6=98=BE=E7=A4=BA=E5=B7=B2=E5=AE=A1=E6=89=B9?= =?UTF-8?q?=20=E6=9C=89=E7=9A=84=E8=8A=82=E7=82=B9=E4=B8=8D=E6=98=BE?= =?UTF-8?q?=E7=A4=BA=20=E5=BA=94=E8=AF=A5=E7=BB=9F=E4=B8=80=E6=98=BE?= =?UTF-8?q?=E7=A4=BA=E5=B7=B2=E5=AE=A1=E6=89=B9=20=E6=89=80=E6=9C=89?= =?UTF-8?q?=E7=9A=84=E5=8A=A8=E7=81=AB=E6=B5=81=E7=A8=8B=E5=9B=BE=E9=83=BD?= =?UTF-8?q?=E8=A6=81=E6=94=B9=20=E6=89=80=E6=9C=89=E8=8A=82=E7=82=B9?= =?UTF-8?q?=E9=83=BD=E8=A6=81=E7=BB=9F=E4=B8=80?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../hotwork-accept/hotwork-accept-list.vue | 11 +++++++++++ .../hotwork-acceptconfess-list.vue | 11 +++++++++++ .../hotwork-apply/hotwork-apply-list.vue | 11 +++++++++++ .../hotwork-approve/hotwork-approve-list.vue | 11 +++++++++++ .../hotwork-audit/hotwork-audit-list.vue | 11 +++++++++++ .../hotwork-confess/hotwork-confess-list.vue | 11 +++++++++++ .../hotwork-confirm/hotwork-confirm-list.vue | 11 +++++++++++ .../hotwork_cfd/hotwork-gas/hotwork-gas-list.vue | 5 +++++ .../hotwork-guardian/hotwork-guardian-list.vue | 11 +++++++++++ .../hotwork-leader/hotwork-leader-list.vue | 11 +++++++++++ .../hotwork-monitor/hotwork-monitor-list.vue | 11 +++++++++++ .../hotwork-safety/hotwork-safety-list.vue | 11 +++++++++++ .../hotwork-xiang-mu/hotwork-xiang-list.vue | 13 ++++++++++++- 13 files changed, 138 insertions(+), 1 deletion(-) 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 eae4200..b6ec447 100644 --- a/pages/application/hotwork_cfd/hotwork-accept/hotwork-accept-list.vue +++ b/pages/application/hotwork_cfd/hotwork-accept/hotwork-accept-list.vue @@ -372,6 +372,11 @@ this.confessUserNames = STATUS.confessUserNames }, getShowStatus(step) { + if (this.showStatus == -1.5 && step.id == 0) { + step.msg = '项目主管部门打回' + step.STATE = '待提交' + step.REPULSE = step.REPULSE + } if (this.showStatus == -2 && step.id == 0) { step.msg = '作业负责人审核打回' step.STATE = '待提交' @@ -429,6 +434,9 @@ return 'success' } if (this.showStatus == step.id) { + if(step.name == '项目主管部门意见'){ + step.STATE = '待审核' + } if(step.name == '作业负责人意见'){ step.STATE = '待审核' } @@ -449,6 +457,9 @@ } return 'active' } else if (this.showStatus > step.id) { + if(step.name == '项目主管部门意见'){ + step.STATE = '已审核' + } if(step.name == '动火作业提交'){ step.STATE = '已提交' } 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 285ee65..e08d4ef 100644 --- a/pages/application/hotwork_cfd/hotwork-acceptconfess/hotwork-acceptconfess-list.vue +++ b/pages/application/hotwork_cfd/hotwork-acceptconfess/hotwork-acceptconfess-list.vue @@ -383,6 +383,11 @@ this.confessUserNames = STATUS.confessUserNames }, getShowStatus(step) { + if (this.showStatus == -1.5 && step.id == 0) { + step.msg = '项目主管部门打回' + step.STATE = '待提交' + step.REPULSE = step.REPULSE + } if (this.showStatus == -2 && step.id == 0) { step.msg = '作业负责人审核打回' step.STATE = '待提交' @@ -440,6 +445,9 @@ return 'success' } if (this.showStatus == step.id) { + if(step.name == '项目主管部门意见'){ + step.STATE = '待审核' + } if(step.name == '作业负责人意见'){ step.STATE = '待审核' } @@ -460,6 +468,9 @@ } return 'active' } else if (this.showStatus > step.id) { + if(step.name == '项目主管部门意见'){ + step.STATE = '已审核' + } if(step.name == '动火作业提交'){ step.STATE = '已提交' } 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 12fd77d..7be1b0a 100644 --- a/pages/application/hotwork_cfd/hotwork-apply/hotwork-apply-list.vue +++ b/pages/application/hotwork_cfd/hotwork-apply/hotwork-apply-list.vue @@ -390,6 +390,11 @@ }, getShowStatus(step) { + if (this.showStatus == -1.5 && step.id == 0) { + step.msg = '项目主管部门打回' + step.STATE = '待提交' + step.REPULSE = step.REPULSE + } if (this.showStatus == -2 && step.id == 0) { step.msg = '作业负责人审核打回' step.STATE = '待提交' @@ -453,6 +458,9 @@ return 'success' } if (this.showStatus == step.id) { + if(step.name == '项目主管部门意见'){ + step.STATE = '待审核' + } if(step.name == '作业负责人意见'){ step.STATE = '待审核' } @@ -473,6 +481,9 @@ } return 'active' } else if (this.showStatus > step.id) { + if(step.name == '项目主管部门意见'){ + step.STATE = '已审核' + } if(step.name == '动火作业提交'){ step.STATE = '已提交' } 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 a329063..9829d8b 100644 --- a/pages/application/hotwork_cfd/hotwork-approve/hotwork-approve-list.vue +++ b/pages/application/hotwork_cfd/hotwork-approve/hotwork-approve-list.vue @@ -378,6 +378,11 @@ this.confessUserNames = STATUS.confessUserNames }, getShowStatus(step) { + if (this.showStatus == -1.5 && step.id == 0) { + step.msg = '项目主管部门打回' + step.STATE = '待提交' + step.REPULSE = step.REPULSE + } if (this.showStatus == -2 && step.id == 0) { step.msg = '作业负责人审核打回' step.STATE = '待提交' @@ -435,6 +440,9 @@ return 'success' } if (this.showStatus == step.id) { + if(step.name == '项目主管部门意见'){ + step.STATE = '待审核' + } if(step.name == '作业负责人意见'){ step.STATE = '待审核' } @@ -455,6 +463,9 @@ } return 'active' } else if (this.showStatus > step.id) { + if(step.name == '项目主管部门意见'){ + step.STATE = '已审核' + } if(step.name == '动火作业提交'){ step.STATE = '已提交' } 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 6bdf0e4..7b484ed 100644 --- a/pages/application/hotwork_cfd/hotwork-audit/hotwork-audit-list.vue +++ b/pages/application/hotwork_cfd/hotwork-audit/hotwork-audit-list.vue @@ -378,6 +378,11 @@ this.confessUserNames = STATUS.confessUserNames }, getShowStatus(step) { + if (this.showStatus == -1.5 && step.id == 0) { + step.msg = '项目主管部门打回' + step.STATE = '待提交' + step.REPULSE = step.REPULSE + } if (this.showStatus == -2 && step.id == 0) { step.msg = '作业负责人审核打回' step.STATE = '待提交' @@ -435,6 +440,9 @@ return 'success' } if (this.showStatus == step.id) { + if(step.name == '项目主管部门意见'){ + step.STATE = '待审核' + } if(step.name == '作业负责人意见'){ step.STATE = '待审核' } @@ -455,6 +463,9 @@ } return 'active' } else if (this.showStatus > step.id) { + if(step.name == '项目主管部门意见'){ + step.STATE = '已审核' + } if(step.name == '动火作业提交'){ step.STATE = '已提交' } 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 e005cdf..c6aae74 100644 --- a/pages/application/hotwork_cfd/hotwork-confess/hotwork-confess-list.vue +++ b/pages/application/hotwork_cfd/hotwork-confess/hotwork-confess-list.vue @@ -383,6 +383,11 @@ this.confessUserNames = STATUS.confessUserNames }, getShowStatus(step) { + if (this.showStatus == -1.5 && step.id == 0) { + step.msg = '项目主管部门打回' + step.STATE = '待提交' + step.REPULSE = step.REPULSE + } if (this.showStatus == -2 && step.id == 0) { step.msg = '作业负责人审核打回' step.STATE = '待提交' @@ -440,6 +445,9 @@ return 'success' } if (this.showStatus == step.id) { + if(step.name == '项目主管部门意见'){ + step.STATE = '待审核' + } if(step.name == '作业负责人意见'){ step.STATE = '待审核' } @@ -460,6 +468,9 @@ } return 'active' } else if (this.showStatus > step.id) { + if(step.name == '项目主管部门意见'){ + step.STATE = '已审核' + } if(step.name == '动火作业提交'){ step.STATE = '已提交' } 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 ca62052..9e7bed4 100644 --- a/pages/application/hotwork_cfd/hotwork-confirm/hotwork-confirm-list.vue +++ b/pages/application/hotwork_cfd/hotwork-confirm/hotwork-confirm-list.vue @@ -395,6 +395,11 @@ this.confessUserNames = STATUS.confessUserNames }, getShowStatus(step) { + if (this.showStatus == -1.5 && step.id == 0) { + step.msg = '项目主管部门打回' + step.STATE = '待提交' + step.REPULSE = step.REPULSE + } if (this.showStatus == -2 && step.id == 0) { step.msg = '作业负责人审核打回' step.STATE = '待提交' @@ -452,6 +457,9 @@ return 'success' } if (this.showStatus == step.id) { + if(step.name == '项目主管部门意见'){ + step.STATE = '待审核' + } if(step.name == '作业负责人意见'){ step.STATE = '待审核' } @@ -472,6 +480,9 @@ } return 'active' } else if (this.showStatus > step.id) { + if(step.name == '项目主管部门意见'){ + step.STATE = '已审核' + } if(step.name == '动火作业提交'){ step.STATE = '已提交' } 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 eaca383..1250a76 100644 --- a/pages/application/hotwork_cfd/hotwork-gas/hotwork-gas-list.vue +++ b/pages/application/hotwork_cfd/hotwork-gas/hotwork-gas-list.vue @@ -366,6 +366,11 @@ this.confessUserNames = STATUS.confessUserNames }, getShowStatus(step) { + if (this.showStatus == -1.5 && step.id == 0) { + step.msg = '项目主管部门打回' + step.STATE = '待提交' + step.REPULSE = step.REPULSE + } if (this.showStatus == -2 && step.id == 0) { step.msg = '作业负责人审核打回' } diff --git a/pages/application/hotwork_cfd/hotwork-guardian/hotwork-guardian-list.vue b/pages/application/hotwork_cfd/hotwork-guardian/hotwork-guardian-list.vue index 7266474..54db0e7 100644 --- a/pages/application/hotwork_cfd/hotwork-guardian/hotwork-guardian-list.vue +++ b/pages/application/hotwork_cfd/hotwork-guardian/hotwork-guardian-list.vue @@ -383,6 +383,11 @@ this.confessUserNames = STATUS.confessUserNames }, getShowStatus(step) { + if (this.showStatus == -1.5 && step.id == 0) { + step.msg = '项目主管部门打回' + step.STATE = '待提交' + step.REPULSE = step.REPULSE + } if (this.showStatus == -2 && step.id == 0) { step.msg = '作业负责人审核打回' step.STATE = '待提交' @@ -440,6 +445,9 @@ return 'success' } if (this.showStatus == step.id) { + if(step.name == '项目主管部门意见'){ + step.STATE = '待审核' + } if(step.name == '作业负责人意见'){ step.STATE = '待审核' } @@ -460,6 +468,9 @@ } return 'active' } else if (this.showStatus > step.id) { + if(step.name == '项目主管部门意见'){ + step.STATE = '已审核' + } if(step.name == '动火作业提交'){ step.STATE = '已提交' } 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 cb2dc76..8caf925 100644 --- a/pages/application/hotwork_cfd/hotwork-leader/hotwork-leader-list.vue +++ b/pages/application/hotwork_cfd/hotwork-leader/hotwork-leader-list.vue @@ -378,6 +378,11 @@ this.confessUserNames = STATUS.confessUserNames }, getShowStatus(step) { + if (this.showStatus == -1.5 && step.id == 0) { + step.msg = '项目主管部门打回' + step.STATE = '待提交' + step.REPULSE = step.REPULSE + } if (this.showStatus == -2 && step.id == 0) { step.msg = '作业负责人审核打回' step.STATE = '待提交' @@ -435,6 +440,9 @@ return 'success' } if (this.showStatus == step.id) { + if(step.name == '项目主管部门意见'){ + step.STATE = '待审核' + } if(step.name == '作业负责人意见'){ step.STATE = '待审核' } @@ -455,6 +463,9 @@ } return 'active' } else if (this.showStatus > step.id) { + if(step.name == '项目主管部门意见'){ + step.STATE = '已审核' + } if(step.name == '动火作业提交'){ step.STATE = '已提交' } 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 e39f459..806884f 100644 --- a/pages/application/hotwork_cfd/hotwork-monitor/hotwork-monitor-list.vue +++ b/pages/application/hotwork_cfd/hotwork-monitor/hotwork-monitor-list.vue @@ -395,6 +395,11 @@ this.confessUserNames = STATUS.confessUserNames }, getShowStatus(step) { + if (this.showStatus == -1.5 && step.id == 0) { + step.msg = '项目主管部门打回' + step.STATE = '待提交' + step.REPULSE = step.REPULSE + } if (this.showStatus == -2 && step.id == 0) { step.msg = '作业负责人审核打回' step.STATE = '待提交' @@ -452,6 +457,9 @@ return 'success' } if (this.showStatus == step.id) { + if(step.name == '项目主管部门意见'){ + step.STATE = '待审核' + } if(step.name == '作业负责人意见'){ step.STATE = '待审核' } @@ -472,6 +480,9 @@ } return 'active' } else if (this.showStatus > step.id) { + if(step.name == '项目主管部门意见'){ + step.STATE = '已审核' + } if(step.name == '动火作业提交'){ step.STATE = '已提交' } 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 a277290..911ae32 100644 --- a/pages/application/hotwork_cfd/hotwork-safety/hotwork-safety-list.vue +++ b/pages/application/hotwork_cfd/hotwork-safety/hotwork-safety-list.vue @@ -372,6 +372,11 @@ this.confessUserNames = STATUS.confessUserNames }, getShowStatus(step) { + if (this.showStatus == -1.5 && step.id == 0) { + step.msg = '项目主管部门打回' + step.STATE = '待提交' + step.REPULSE = step.REPULSE + } if (this.showStatus == -2 && step.id == 0) { step.msg = '作业负责人审核打回' step.STATE = '待提交' @@ -429,6 +434,9 @@ return 'success' } if (this.showStatus == step.id) { + if(step.name == '项目主管部门意见'){ + step.STATE = '待审核' + } if(step.name == '作业负责人意见'){ step.STATE = '待审核' } @@ -449,6 +457,9 @@ } return 'active' } else if (this.showStatus > step.id) { + if(step.name == '项目主管部门意见'){ + step.STATE = '已审核' + } if(step.name == '动火作业提交'){ step.STATE = '已提交' } 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 260c48d..e5ce9ec 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 @@ -377,7 +377,12 @@ this.confessUserNames = STATUS.confessUserNames }, getShowStatus(step) { - if (this.showStatus == -2 && step.id == 0) { + if (this.showStatus == -1.5 && step.id == 0) { + step.msg = '项目主管部门打回' + step.STATE = '待提交' + step.REPULSE = step.REPULSE + } + if (this.showStatus == -2 && step.id == 0) { step.msg = '作业负责人审核打回' step.STATE = '待提交' step.REPULSE = step.REPULSE @@ -434,6 +439,9 @@ return 'success' } if (this.showStatus == step.id) { + if(step.name == '项目主管部门意见'){ + step.STATE = '待审核' + } if(step.name == '作业负责人意见'){ step.STATE = '待审核' } @@ -454,6 +462,9 @@ } return 'active' } else if (this.showStatus > step.id) { + if(step.name == '项目主管部门意见'){ + step.STATE = '已审核' + } if(step.name == '动火作业提交'){ step.STATE = '已提交' }