From 31d62d0ac0bf6fdcb200ffeaa7b4e15aaf2d4946 Mon Sep 17 00:00:00 2001
From: zhaowei <zhaowei>
Date: 星期五, 25 七月 2025 16:40:47 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/master'
---
src/views/flowable/workflow/TechnicalStatusEvaluation/TechnicalStatusEvaluationApplicationApprovalModal.vue | 27 +++++++++++----------------
1 files changed, 11 insertions(+), 16 deletions(-)
diff --git a/src/views/flowable/workflow/TechnicalStatusEvaluation/TechnicalStatusEvaluationApplicationApprovalModal.vue b/src/views/flowable/workflow/TechnicalStatusEvaluation/TechnicalStatusEvaluationApplicationApprovalModal.vue
index ad928cb..c1a2bb3 100644
--- a/src/views/flowable/workflow/TechnicalStatusEvaluation/TechnicalStatusEvaluationApplicationApprovalModal.vue
+++ b/src/views/flowable/workflow/TechnicalStatusEvaluation/TechnicalStatusEvaluationApplicationApprovalModal.vue
@@ -6,7 +6,7 @@
<a-form-model ref="form" :model="model" :rules="validatorRules" :labelCol="labelCol" :wrapperCol="wrapperCol">
<a-row id="outer-row" :gutter="24">
<!--宸︿晶鍩虹淇℃伅鍒�-->
- <a-col :span="!disableSubmit?8:14" class="scroll-col">
+ <a-col :span="selectShenpiData.procInstId?8:14" class="scroll-col">
<a-tabs>
<a-tab-pane tab="鍩虹淇℃伅">
<a-row>
@@ -21,11 +21,6 @@
@autocompleteForm="autocompleteForm" disabled/>
</a-form-model-item>
</a-col>
- </a-row>
-
- <a-row>
-
-
</a-row>
<a-row>
@@ -68,7 +63,7 @@
</a-col>
<!--鍙充晶瀹℃壒鍒�-->
- <a-col :span="!disableSubmit?6:10" class="scroll-col">
+ <a-col :span="selectShenpiData.procInstId?6:10" class="scroll-col">
<a-tabs v-if="displayDepartHeaderFlag">
<a-tab-pane tab="浣跨敤鍗曚綅瀹ょ骇棰嗗纭">
<a-row>
@@ -77,13 +72,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 +93,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 +114,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 +196,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