From dbfa630021b25516dee45ae71b4277bcf4aa6aa4 Mon Sep 17 00:00:00 2001
From: zhaowei <zhaowei>
Date: 星期二, 22 七月 2025 20:42:48 +0800
Subject: [PATCH] 1、技术状态鉴定申请功能及流程 2、技术鉴定工单审批中检查明细展示限制条件调整

---
 src/views/flowable/workflow/TechnicalStatusEvaluation/TechnicalStatusEvaluationApprovalModal.vue |   20 ++++++++++----------
 1 files changed, 10 insertions(+), 10 deletions(-)

diff --git a/src/views/flowable/workflow/TechnicalStatusEvaluation/TechnicalStatusEvaluationApprovalModal.vue b/src/views/flowable/workflow/TechnicalStatusEvaluation/TechnicalStatusEvaluationApprovalModal.vue
index 43b9901..20a3606 100644
--- a/src/views/flowable/workflow/TechnicalStatusEvaluation/TechnicalStatusEvaluationApprovalModal.vue
+++ b/src/views/flowable/workflow/TechnicalStatusEvaluation/TechnicalStatusEvaluationApprovalModal.vue
@@ -53,9 +53,9 @@
 
             <a-tabs :active-key="activeTabKey" @change="handleTabChange">
               <a-tab-pane :key="1" tab="瀹夊叏瑁呯疆妫�鏌�" forceRender
-                          v-if="disableSubmit||
-                          selectShenpiData.taskDefKey&&(selectShenpiData.taskDefKey=='safety_equipment_check'||selectShenpiData.taskDefKey=='safety_equipment_check_confirm')||
-                          model.evaluationStatus&&model.evaluationStatus!='UNDER_EVALUATION'&&detail.safetyEquipmentCheckList.length>0">
+                          v-if="(disableSubmit&&detail.safetyEquipmentCheckList.length>0)||
+                          (selectShenpiData.taskDefKey&&(selectShenpiData.taskDefKey=='safety_equipment_check'||selectShenpiData.taskDefKey=='safety_equipment_check_confirm'))||
+                          (model.evaluationStatus&&model.evaluationStatus!='UNDER_EVALUATION'&&model.evaluationStatus!='WAIT_EVALUATION')">
                 <j-vxe-table ref="editableDetailTable1" rowNumber bordered alwaysEdit keep-source
                              :dataSource="detail.safetyEquipmentCheckList"
                              :columns="detail.safetyEquipmentCheckColumns">
@@ -93,9 +93,9 @@
               </a-tab-pane>
 
               <a-tab-pane :key="2" tab="璁惧绮惧害妫�鏌�" forceRender
-                          v-if="disableSubmit||
-                          selectShenpiData.taskDefKey&&(selectShenpiData.taskDefKey=='equipment_precision_check'||selectShenpiData.taskDefKey=='equipment_precision_check_confirm')||
-                          model.evaluationStatus&&model.evaluationStatus!='UNDER_EVALUATION'&&detail.precisionCheckList.length>0">
+                          v-if="(disableSubmit&&detail.precisionCheckList.length>0)||
+                          (selectShenpiData.taskDefKey&&(selectShenpiData.taskDefKey=='equipment_precision_check'||selectShenpiData.taskDefKey=='equipment_precision_check_confirm'))||
+                         (model.evaluationStatus&&model.evaluationStatus!='UNDER_EVALUATION'&&model.evaluationStatus!='WAIT_EVALUATION')">
                 <j-vxe-table ref="editableDetailTable2" rowNumber bordered
                              alwaysEdit keep-source
                              :dataSource="detail.precisionCheckList" :columns="detail.precisionCheckColumns">
@@ -132,9 +132,9 @@
               </a-tab-pane>
 
               <a-tab-pane :key="3" tab="鍏朵粬妫�鏌�" forceRender
-                          v-if="disableSubmit||
-                          selectShenpiData.taskDefKey&&(selectShenpiData.taskDefKey=='other_check'||selectShenpiData.taskDefKey=='other_check_confirm')||
-                          model.evaluationStatus&&model.evaluationStatus!='UNDER_EVALUATION'&&detail.otherCheckList.length>0">
+                          v-if="(disableSubmit&&detail.otherCheckList.length>0)||
+                          (selectShenpiData.taskDefKey&&(selectShenpiData.taskDefKey=='other_check'||selectShenpiData.taskDefKey=='other_check_confirm'))||
+                          (model.evaluationStatus&&model.evaluationStatus!='UNDER_EVALUATION'&&model.evaluationStatus!='WAIT_EVALUATION')">
                 <j-vxe-table ref="editableDetailTable3" rowNumber bordered
                              alwaysEdit keep-source
                              :dataSource="detail.otherCheckList" :columns="detail.otherCheckColumns">
@@ -323,7 +323,7 @@
     name: 'TechnicalStatusEvaluationApprovalModal',
     mixins: [JVxeTableModelMixin],
     components: {
-      TechnicalStatusEquipmentSelect,
+      TechnicalStatusEquipmentSelect
     },
     props: {
       selectShenpiData: {

--
Gitblit v1.9.3