From b1c4b9509b3b84594bbc9a541f308101d3a17140 Mon Sep 17 00:00:00 2001
From: lyh <925863403@qq.com>
Date: 星期四, 24 七月 2025 10:20:56 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/master'
---
src/views/flowable/workflow/TechnicalStatus/TechnicalStatusChangeApprovalModal.vue | 4 ++--
1 files changed, 2 insertions(+), 2 deletions(-)
diff --git a/src/views/flowable/workflow/TechnicalStatus/TechnicalStatusChangeApprovalModal.vue b/src/views/flowable/workflow/TechnicalStatus/TechnicalStatusChangeApprovalModal.vue
index b3de472..79e25b8 100644
--- a/src/views/flowable/workflow/TechnicalStatus/TechnicalStatusChangeApprovalModal.vue
+++ b/src/views/flowable/workflow/TechnicalStatus/TechnicalStatusChangeApprovalModal.vue
@@ -231,10 +231,10 @@
},
computed: {
displayDepartHeaderFlag() {
- return this.model.changeStatus && ['DEPART_HEADER_SIGNING', 'DEPART_LEADER_SIGNING', 'COMPLETED'].includes(this.model.changeStatus)
+ return this.model.changeStatus && ['DEPART_HEADER_SIGNING', 'DEPART_LEADER_SIGNING', 'COMPLETED', 'REJECTED'].includes(this.model.changeStatus)
},
displayDepartLeaderFlag() {
- return this.model.changeStatus && ['DEPART_LEADER_SIGNING', 'COMPLETED'].includes(this.model.changeStatus)
+ return this.model.changeStatus && ['DEPART_LEADER_SIGNING', 'COMPLETED', 'REJECTED'].includes(this.model.changeStatus) && this.model.departHeaderSignatureResult === '1'
}
},
methods: {
--
Gitblit v1.9.3