From a6d93e96d0f9585de5e15b2efa47519f18211350 Mon Sep 17 00:00:00 2001
From: lyh <925863403@qq.com>
Date: 星期四, 31 七月 2025 16:22:18 +0800
Subject: [PATCH] 升版导入修改为单文件导入
---
src/views/flowable/workflow/TechnicalStatusEvaluation/TechnicalStatusEvaluationOrderChangeApprovalModal.vue | 10 +++++-----
1 files changed, 5 insertions(+), 5 deletions(-)
diff --git a/src/views/flowable/workflow/TechnicalStatusEvaluation/TechnicalStatusEvaluationOrderChangeApprovalModal.vue b/src/views/flowable/workflow/TechnicalStatusEvaluation/TechnicalStatusEvaluationOrderChangeApprovalModal.vue
index f34b70f..5e568f9 100644
--- a/src/views/flowable/workflow/TechnicalStatusEvaluation/TechnicalStatusEvaluationOrderChangeApprovalModal.vue
+++ b/src/views/flowable/workflow/TechnicalStatusEvaluation/TechnicalStatusEvaluationOrderChangeApprovalModal.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>
@@ -78,7 +78,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="displayEquipmentManagerFlag">
<a-tab-pane tab="浣跨敤鍗曚綅瀹ょ骇棰嗗纭">
<a-row>
@@ -211,13 +211,13 @@
},
computed: {
displayEquipmentManagerFlag() {
- return this.model.changeStatus && ['EQUIPMENT_MANAGER_SIGNING', 'DEPART_MANAGER_SIGNING', 'PRODUCTION_SUPPORT_SIGNING', 'COMPLETED'].includes(this.model.changeStatus)
+ return this.model.changeStatus && ['EQUIPMENT_MANAGER_SIGNING', 'DEPART_MANAGER_SIGNING', 'PRODUCTION_SUPPORT_SIGNING', 'COMPLETED', 'REJECTED'].includes(this.model.changeStatus)
},
displayDepartManagerFlag() {
- return this.model.changeStatus && ['DEPART_MANAGER_SIGNING', 'PRODUCTION_SUPPORT_SIGNING', 'COMPLETED'].includes(this.model.changeStatus)
+ return this.model.changeStatus && ['DEPART_MANAGER_SIGNING', 'PRODUCTION_SUPPORT_SIGNING', 'COMPLETED', 'REJECTED'].includes(this.model.changeStatus) && this.model.equipmentManagerSignatureResult === '1'
},
displayProductionSupportFlag() {
- return this.model.changeStatus && ['PRODUCTION_SUPPORT_SIGNING', 'COMPLETED'].includes(this.model.changeStatus)
+ return this.model.changeStatus && ['PRODUCTION_SUPPORT_SIGNING', 'COMPLETED', 'REJECTED'].includes(this.model.changeStatus) && this.model.departManagerSignatureResult === '1'
}
},
methods: {
--
Gitblit v1.9.3