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/TechnicalStatusEvaluation/TechnicalStatusEvaluationApplicationApprovalModal.vue | 18 +++++++++---------
1 files changed, 9 insertions(+), 9 deletions(-)
diff --git a/src/views/flowable/workflow/TechnicalStatusEvaluation/TechnicalStatusEvaluationApplicationApprovalModal.vue b/src/views/flowable/workflow/TechnicalStatusEvaluation/TechnicalStatusEvaluationApplicationApprovalModal.vue
index ad928cb..8fbf118 100644
--- a/src/views/flowable/workflow/TechnicalStatusEvaluation/TechnicalStatusEvaluationApplicationApprovalModal.vue
+++ b/src/views/flowable/workflow/TechnicalStatusEvaluation/TechnicalStatusEvaluationApplicationApprovalModal.vue
@@ -77,13 +77,13 @@
:wrapperCol="rightColWrapperCol">
<j-dict-select-tag type='radio' v-model='model.departHeaderSignatureResult'
dictCode='approve_reject'
- :disabled="disableSubmit||(model.applicationStatus&&model.applicationStatus!='DEPART_HEADER_SIGNING')"/>
+ :disabled="disableSubmit||(model.applicationStatus&&model.applicationStatus!=='DEPART_HEADER_SIGNING')"/>
</a-form-model-item>
</a-col>
<a-col :span="24">
<a-form-model-item label="纭鎰忚" :labelCol="rightColLabelCol" :wrapperCol="rightColWrapperCol">
<a-textarea placeholder="璇疯緭鍏ユ剰瑙�" v-model="model.departHeaderComment"
- :disabled="disableSubmit||(model.applicationStatus&&model.applicationStatus!='DEPART_HEADER_SIGNING')"/>
+ :disabled="disableSubmit||(model.applicationStatus&&model.applicationStatus!=='DEPART_HEADER_SIGNING')"/>
</a-form-model-item>
</a-col>
</a-row>
@@ -98,13 +98,13 @@
:wrapperCol="rightColWrapperCol">
<j-dict-select-tag type='radio' v-model='model.productionHeaderSignatureResult'
dictCode='approve_reject'
- :disabled="disableSubmit||(model.applicationStatus&&model.applicationStatus!='PRODUCTION_HEADER_SIGNING')"/>
+ :disabled="disableSubmit||(model.applicationStatus&&model.applicationStatus!=='PRODUCTION_HEADER_SIGNING')"/>
</a-form-model-item>
</a-col>
<a-col :span="24">
<a-form-model-item label="纭鎰忚" :labelCol="rightColLabelCol" :wrapperCol="rightColWrapperCol">
<a-textarea placeholder="璇疯緭鍏ユ剰瑙�" v-model="model.productionHeaderComment"
- :disabled="disableSubmit||(model.applicationStatus&&model.applicationStatus!='PRODUCTION_HEADER_SIGNING')"/>
+ :disabled="disableSubmit||(model.applicationStatus&&model.applicationStatus!=='PRODUCTION_HEADER_SIGNING')"/>
</a-form-model-item>
</a-col>
</a-row>
@@ -119,13 +119,13 @@
:labelCol="rightColLabelCol" :wrapperCol="rightColWrapperCol">
<j-dict-select-tag type='radio' v-model='model.productionSupportSignatureResult'
dictCode='approve_reject'
- :disabled="disableSubmit||(model.applicationStatus&&model.applicationStatus!='PRODUCTION_SUPPORT_SIGNING')"/>
+ :disabled="disableSubmit||(model.applicationStatus&&model.applicationStatus!=='PRODUCTION_SUPPORT_SIGNING')"/>
</a-form-model-item>
</a-col>
<a-col :span="24">
<a-form-model-item label="纭鎰忚" :labelCol="rightColLabelCol" :wrapperCol="rightColWrapperCol">
<a-textarea placeholder="璇疯緭鍏ユ剰瑙�" v-model="model.productionSupportComment"
- :disabled="disableSubmit||(model.applicationStatus&&model.applicationStatus!='PRODUCTION_SUPPORT_SIGNING')"/>
+ :disabled="disableSubmit||(model.applicationStatus&&model.applicationStatus!=='PRODUCTION_SUPPORT_SIGNING')"/>
</a-form-model-item>
</a-col>
</a-row>
@@ -201,13 +201,13 @@
},
computed: {
displayDepartHeaderFlag() {
- return this.model.applicationStatus && ['DEPART_HEADER_SIGNING', 'PRODUCTION_HEADER_SIGNING', 'PRODUCTION_SUPPORT_SIGNING', 'COMPLETED'].includes(this.model.applicationStatus)
+ return this.model.applicationStatus && ['DEPART_HEADER_SIGNING', 'PRODUCTION_HEADER_SIGNING', 'PRODUCTION_SUPPORT_SIGNING', 'COMPLETED', 'REJECTED'].includes(this.model.applicationStatus)
},
displayProductionHeaderFlag() {
- return this.model.applicationStatus && ['PRODUCTION_HEADER_SIGNING', 'PRODUCTION_SUPPORT_SIGNING', 'COMPLETED'].includes(this.model.applicationStatus)
+ return this.model.applicationStatus && ['PRODUCTION_HEADER_SIGNING', 'PRODUCTION_SUPPORT_SIGNING', 'COMPLETED', 'REJECTED'].includes(this.model.applicationStatus) && this.model.departHeaderSignatureResult === '1'
},
displayProductionSupportFlag() {
- return this.model.applicationStatus && ['PRODUCTION_SUPPORT_SIGNING', 'COMPLETED'].includes(this.model.applicationStatus)
+ return this.model.applicationStatus && ['PRODUCTION_SUPPORT_SIGNING', 'COMPLETED', 'REJECTED'].includes(this.model.applicationStatus) && this.model.productionHeaderSignatureResult === '1'
}
},
methods: {
--
Gitblit v1.9.3