From 3db6d5c4d17ab9942a5c89a167c1f06ca485f355 Mon Sep 17 00:00:00 2001
From: zhaowei <zhaowei>
Date: 星期三, 16 七月 2025 21:21:14 +0800
Subject: [PATCH] 二保工单审批调整
---
src/views/flowable/workflow/TechnicalStatusEvaluation/TechnicalStatusEvaluationApprovalModal.vue | 222 ++++++++++++++++++++++++++++++++++---------------------
1 files changed, 137 insertions(+), 85 deletions(-)
diff --git a/src/views/flowable/workflow/TechnicalStatusEvaluation/TechnicalStatusEvaluationApprovalModal.vue b/src/views/flowable/workflow/TechnicalStatusEvaluation/TechnicalStatusEvaluationApprovalModal.vue
index 8fd1110..a7a7904 100644
--- a/src/views/flowable/workflow/TechnicalStatusEvaluation/TechnicalStatusEvaluationApprovalModal.vue
+++ b/src/views/flowable/workflow/TechnicalStatusEvaluation/TechnicalStatusEvaluationApprovalModal.vue
@@ -5,6 +5,8 @@
<a-spin :spinning="spinning">
<a-form-model ref="form" :model="model" :rules="validatorRules" :labelCol="labelCol" :wrapperCol="wrapperCol">
<a-row id="outer-row" :gutter="24">
+
+ <!--宸︿晶鍩虹淇℃伅鍒�-->
<a-col :span="8" class="scroll-col">
<a-tabs>
<a-tab-pane tab="鍩虹淇℃伅">
@@ -44,20 +46,25 @@
</a-tabs>
</a-col>
+ <!-- 涓棿鏄庣粏椤瑰垪-->
<a-col
:span="model.evaluationStatus&&model.evaluationStatus!='UNDER_EVALUATION'&&model.evaluationStatus!='WAIT_EVALUATION'?10:16"
class="scroll-col">
<a-tabs :active-key="activeTabKey" @change="handleTabChange">
<a-tab-pane :key="1" tab="瀹夊叏瑁呯疆妫�鏌�" forceRender
- v-if="selectShenpiData.taskDefKey&&selectShenpiData.taskDefKey=='safety_equipment_check'||selectShenpiData.taskDefKey&&selectShenpiData.taskDefKey=='safety_equipment_check_confirm'||!Boolean(selectShenpiData.taskDefKey)">
+ 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">
<j-vxe-table ref="editableDetailTable1" rowNumber bordered alwaysEdit keep-source :height="300"
:dataSource="detail.safetyEquipmentCheckList"
:columns="detail.safetyEquipmentCheckColumns">
<template v-slot:safetyEquipmentCheckResult="props">
<j-dict-select-tag v-model="props.row.safetyEquipmentCheckResult"
placeholder="璇烽�夋嫨妫�鏌ョ粨鏋�"
- :disabled="disableSubmit||(model.evaluationStatus!='UNDER_EVALUATION'&&model.evaluationStatus!='WAIT_EVALUATION')||(model.evaluationStatus=='UNDER_EVALUATION'&&selectShenpiData.taskDefKey=='safety_equipment_check_confirm')"
+ :disabled="disableSubmit||
+ model.evaluationStatus!='UNDER_EVALUATION'||
+ selectShenpiData.taskDefKey=='safety_equipment_check_confirm'"
@change="$refs['editableDetailTable'+activeTabKey].validateTable()"
dictCode="yes_no_none" style="width: 100%"/>
</template>
@@ -70,13 +77,14 @@
<a-form-model-item prop="safetyCheckConfirmResult" :labelCol="labelColLong"
:wrapperCol="wrapperColLong" label="纭绫诲瀷">
<j-dict-select-tag type='radio' v-model='model.safetyCheckConfirmResult'
- dictCode='approved_rejected'
- placeholder="璇烽�夋嫨纭绫诲瀷"/>
+ :disabled="disableSubmit||selectShenpiData.taskDefKey!='safety_equipment_check_confirm'"
+ dictCode='approved_rejected'/>
</a-form-model-item>
</a-col>
<a-col :span="24">
<a-form-model-item :labelCol="labelColLong" :wrapperCol="wrapperColLong" label="纭鎰忚">
- <a-textarea placeholder="璇疯緭鍏ユ剰瑙�" v-model="model.safetyCheckConfirmComment"/>
+ <a-textarea placeholder="璇疯緭鍏ユ剰瑙�" v-model="model.safetyCheckConfirmComment"
+ :disabled="disableSubmit||selectShenpiData.taskDefKey!='safety_equipment_check_confirm'"/>
</a-form-model-item>
</a-col>
</a-row>
@@ -85,13 +93,17 @@
</a-tab-pane>
<a-tab-pane :key="2" tab="璁惧绮惧害妫�鏌�" forceRender
- v-if="selectShenpiData.taskDefKey&&selectShenpiData.taskDefKey=='equipment_precision_check'||selectShenpiData.taskDefKey&&selectShenpiData.taskDefKey=='equipment_precision_check_confirm'||!Boolean(selectShenpiData.taskDefKey)">
+ 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">
<j-vxe-table ref="editableDetailTable2" rowNumber bordered
alwaysEdit keep-source :height="300"
:dataSource="detail.precisionCheckList" :columns="detail.precisionCheckColumns">
<template v-slot:precisionCheckResult="props">
<a-input-number v-model="props.row.precisionCheckResult"
- :disabled="disableSubmit||(model.evaluationStatus!='UNDER_EVALUATION'&&model.evaluationStatus!='WAIT_EVALUATION')||(model.evaluationStatus=='UNDER_EVALUATION'&&selectShenpiData.taskDefKey=='equipment_precision_check_confirm')"
+ :disabled="disableSubmit||
+ model.evaluationStatus!='UNDER_EVALUATION'||
+ selectShenpiData.taskDefKey=='equipment_precision_check_confirm'"
@blur="$refs['editableDetailTable'+activeTabKey].validateTable()"
placeholder="璇疯緭鍏ユ鏌ョ粨鏋�" style="width: 100%"/>
</template>
@@ -104,14 +116,14 @@
<a-form-model-item prop="precisionCheckConfirmResult" :labelCol="labelColLong"
:wrapperCol="wrapperColLong" label="纭绫诲瀷">
<j-dict-select-tag type='radio' v-model='model.precisionCheckConfirmResult'
- dictCode='approved_rejected'
- placeholder="璇烽�夋嫨纭绫诲瀷"/>
+ :disabled="disableSubmit||selectShenpiData.taskDefKey!='equipment_precision_check_confirm'"
+ dictCode='approved_rejected'/>
</a-form-model-item>
</a-col>
<a-col :span="24">
- <a-form-model-item prop="precisionCheckConfirmComment" :labelCol="labelColLong"
- :wrapperCol="wrapperColLong" label="纭鎰忚">
- <a-textarea placeholder="璇疯緭鍏ユ剰瑙�" v-model="model.precisionCheckConfirmComment"/>
+ <a-form-model-item :labelCol="labelColLong" :wrapperCol="wrapperColLong" label="纭鎰忚">
+ <a-textarea placeholder="璇疯緭鍏ユ剰瑙�" v-model="model.precisionCheckConfirmComment"
+ :disabled="disableSubmit||selectShenpiData.taskDefKey!='equipment_precision_check_confirm'"/>
</a-form-model-item>
</a-col>
</a-row>
@@ -120,13 +132,15 @@
</a-tab-pane>
<a-tab-pane :key="3" tab="鍏朵粬妫�鏌�" forceRender
- v-if="selectShenpiData.taskDefKey&&selectShenpiData.taskDefKey=='other_check'||selectShenpiData.taskDefKey&&selectShenpiData.taskDefKey=='other_check_confirm'||!Boolean(selectShenpiData.taskDefKey)">
+ v-if="disableSubmit||
+ selectShenpiData.taskDefKey&&(selectShenpiData.taskDefKey=='other_check'||selectShenpiData.taskDefKey=='other_check_confirm')||
+ model.evaluationStatus&&model.evaluationStatus!='UNDER_EVALUATION'&&detail.otherCheckList.length>0">
<j-vxe-table ref="editableDetailTable3" rowNumber bordered
alwaysEdit keep-source :height="300"
:dataSource="detail.otherCheckList" :columns="detail.otherCheckColumns">
<template v-slot:otherCheckResult="props">
<a-textarea v-model="props.row.otherCheckResult" :rows="1"
- :disabled="disableSubmit||(model.evaluationStatus!='UNDER_EVALUATION'&&model.evaluationStatus!='WAIT_EVALUATION')||(model.evaluationStatus=='UNDER_EVALUATION'&&selectShenpiData.taskDefKey=='other_check_confirm')"
+ :disabled="disableSubmit||model.evaluationStatus!='UNDER_EVALUATION'||selectShenpiData.taskDefKey=='other_check_confirm'"
@blur="$refs['editableDetailTable'+activeTabKey].validateTable()"
placeholder="璇疯緭鍏ユ鏌ョ粨鏋�"
:autoSize="false"/>
@@ -141,13 +155,13 @@
:wrapperCol="wrapperColLong" label="纭绫诲瀷">
<j-dict-select-tag type='radio' v-model='model.otherCheckConfirmResult'
dictCode='approved_rejected'
- placeholder="璇烽�夋嫨纭绫诲瀷"/>
+ :disabled="disableSubmit||selectShenpiData.taskDefKey!='other_check_confirm'"/>
</a-form-model-item>
</a-col>
<a-col :span="24">
- <a-form-model-item prop="otherCheckConfirmComment" :labelCol="labelColLong"
- :wrapperCol="wrapperColLong" label="纭鎰忚">
- <a-textarea placeholder="璇疯緭鍏ユ剰瑙�" v-model="model.otherCheckConfirmComment"/>
+ <a-form-model-item :labelCol="labelColLong" :wrapperCol="wrapperColLong" label="纭鎰忚">
+ <a-textarea placeholder="璇疯緭鍏ユ剰瑙�" v-model="model.otherCheckConfirmComment"
+ :disabled="disableSubmit||selectShenpiData.taskDefKey!='other_check_confirm'"/>
</a-form-model-item>
</a-col>
</a-row>
@@ -157,50 +171,51 @@
<template v-if="selectShenpiData.procInstId">
<a-tab-pane key='4' tab='娴佺▼鍥�'>
- <img :src="imageSrc" alt="Fetched Image"/>
+ <img :src="imageSrc" alt="Fetched Image" style="width: 100%"/>
</a-tab-pane>
</template>
</a-tabs>
</a-col>
- <a-col :span="6"
+ <!--鍙充晶瀹℃壒鍒�-->
+ <a-col :span="6" class="scroll-col"
v-if="model.evaluationStatus&&model.evaluationStatus!='UNDER_EVALUATION'&&model.evaluationStatus!='WAIT_EVALUATION'">
- <a-tabs>
+ <a-tabs v-if="displayRepairerFlag">
<a-tab-pane tab="缁翠慨宸ョ‘璁�">
<a-row>
<a-col :span="24">
- <a-form-model-item prop="confirmDealType" label="瀹夊叏瑁呯疆鏄惁榻愬叏" :labelCol="rightColLabelCol"
+ <a-form-model-item prop="safetyEquipmentCheckResult" label="瀹夊叏瑁呯疆鏄惁榻愬叏" :labelCol="rightColLabelCol"
:wrapperCol="rightColWrapperCol">
<j-dict-select-tag type='radio' v-model='model.safetyEquipmentCheckResult' dictCode='yn'
- :disabled="disableSubmit || inspectorConfirmDisable"/>
+ :disabled="disableSubmit||(model.evaluationStatus&&model.evaluationStatus!='REPAIRER_SIGNING')"/>
</a-form-model-item>
</a-col>
<a-col :span="24">
- <a-form-model-item prop="confirmDealType" label="璁惧鍔熻兘鏄惁榻愬叏" :labelCol="rightColLabelCol"
+ <a-form-model-item prop="precisionCheckResult" label="璁惧鍔熻兘鏄惁榻愬叏" :labelCol="rightColLabelCol"
:wrapperCol="rightColWrapperCol">
<j-dict-select-tag type='radio' v-model='model.precisionCheckResult' dictCode='yn'
- placeholder="璇烽�夋嫨纭绫诲瀷" :disabled="disableSubmit || inspectorConfirmDisable"/>
+ :disabled="disableSubmit||(model.evaluationStatus&&model.evaluationStatus!='REPAIRER_SIGNING')"/>
</a-form-model-item>
</a-col>
<a-col :span="24">
- <a-form-model-item prop="confirmDealType" label="绮惧害鏄惁杈惧埌瑕佹眰" :labelCol="rightColLabelCol"
+ <a-form-model-item prop="functionalCheckResult" label="绮惧害鏄惁杈惧埌瑕佹眰" :labelCol="rightColLabelCol"
:wrapperCol="rightColWrapperCol">
<j-dict-select-tag type='radio' v-model='model.functionalCheckResult' dictCode='yes_no_none'
- placeholder="璇烽�夋嫨纭绫诲瀷" :disabled="disableSubmit || inspectorConfirmDisable"/>
+ :disabled="disableSubmit||(model.evaluationStatus&&model.evaluationStatus!='REPAIRER_SIGNING')"/>
</a-form-model-item>
</a-col>
<a-col :span="24">
- <a-form-model-item prop="confirmDealType" label="妫�鏌ユ槸鍚﹀悎鏍�" :labelCol="rightColLabelCol"
+ <a-form-model-item prop="otherCheckResult" label="鍏朵粬妫�鏌ユ槸鍚﹀悎鏍�" :labelCol="rightColLabelCol"
:wrapperCol="rightColWrapperCol">
<j-dict-select-tag type='radio' v-model='model.otherCheckResult' dictCode='yes_no_none'
- placeholder="璇烽�夋嫨纭绫诲瀷" :disabled="disableSubmit || inspectorConfirmDisable"/>
+ :disabled="disableSubmit||(model.evaluationStatus&&model.evaluationStatus!='REPAIRER_SIGNING')"/>
</a-form-model-item>
</a-col>
</a-row>
</a-tab-pane>
</a-tabs>
- <a-tabs>
+ <a-tabs v-if="displayRepairLeaderFlag">
<a-tab-pane tab="缁翠慨瀹や富浠荤‘璁�">
<a-row>
<a-col :span="24">
@@ -208,42 +223,40 @@
:wrapperCol="rightColWrapperCol">
<j-dict-select-tag type='radio' v-model='model.repairManagerSignatureResult'
dictCode='approved_rejected'
- placeholder="璇烽�夋嫨纭绫诲瀷" :disabled="disableSubmit || inspectorConfirmDisable"/>
+ :disabled="disableSubmit||(model.evaluationStatus&&model.evaluationStatus!='REPAIR_MANAGER_SIGNING')"/>
</a-form-model-item>
</a-col>
<a-col :span="24">
- <a-form-model-item prop="repairManagerComment" label="纭鎰忚" :labelCol="rightColLabelCol"
- :wrapperCol="rightColWrapperCol">
+ <a-form-model-item label="纭鎰忚" :labelCol="rightColLabelCol" :wrapperCol="rightColWrapperCol">
<a-textarea placeholder="璇疯緭鍏ユ剰瑙�" v-model="model.repairManagerComment"
- :disabled="disableSubmit || completionDisable"/>
+ :disabled="disableSubmit||(model.evaluationStatus&&model.evaluationStatus!='REPAIR_MANAGER_SIGNING')"/>
</a-form-model-item>
</a-col>
</a-row>
</a-tab-pane>
</a-tabs>
- <a-tabs>
+ <a-tabs v-if="displayTechnicianFlag">
<a-tab-pane tab="宸ヨ壓鍛樼‘璁�">
<a-row>
<a-col :span="24">
<a-form-model-item prop="sampleCheckResult" label="璇曚欢妫�鏌ョ粨鏋�" :labelCol="rightColLabelCol"
:wrapperCol="rightColWrapperCol">
<j-dict-select-tag type='radio' v-model='model.sampleCheckResult' dictCode='yn'
- :disabled="disableSubmit || inspectorConfirmDisable"/>
+ :disabled="disableSubmit||(model.evaluationStatus&&model.evaluationStatus!='PROCESS_TECHNICIAN_SIGNING')"/>
</a-form-model-item>
</a-col>
<a-col :span="24">
- <a-form-model-item prop="processTechnicianComment" label="纭鎰忚" :labelCol="rightColLabelCol"
- :wrapperCol="rightColWrapperCol">
+ <a-form-model-item label="纭鎰忚" :labelCol="rightColLabelCol" :wrapperCol="rightColWrapperCol">
<a-textarea placeholder="璇疯緭鍏ユ剰瑙�" v-model="model.processTechnicianComment"
- :disabled="disableSubmit || completionDisable"/>
+ :disabled="disableSubmit||(model.evaluationStatus&&model.evaluationStatus!='PROCESS_TECHNICIAN_SIGNING')"/>
</a-form-model-item>
</a-col>
</a-row>
</a-tab-pane>
</a-tabs>
- <a-tabs>
+ <a-tabs v-if="displayTechnicalLeaderFlag">
<a-tab-pane tab="浣跨敤鍗曚綅鎶�鏈富绠＄‘璁�">
<a-row>
<a-col :span="24">
@@ -251,44 +264,43 @@
:labelCol="rightColLabelCol" :wrapperCol="rightColWrapperCol">
<j-dict-select-tag type='radio' v-model='model.departTechnicalLeaderSignatureResult'
dictCode='approved_rejected'
- :disabled="disableSubmit || inspectorConfirmDisable"/>
+ :disabled="disableSubmit||(model.evaluationStatus&&model.evaluationStatus!='DEPART_TECHNICAL_LEADER_SIGNING')"/>
</a-form-model-item>
</a-col>
<a-col :span="24">
- <a-form-model-item prop="departTechnicalLeaderComment" label="纭鎰忚" :labelCol="rightColLabelCol"
- :wrapperCol="rightColWrapperCol">
+ <a-form-model-item label="纭鎰忚" :labelCol="rightColLabelCol" :wrapperCol="rightColWrapperCol">
<a-textarea placeholder="璇疯緭鍏ユ剰瑙�" v-model="model.departTechnicalLeaderComment"
- :disabled="disableSubmit || completionDisable"/>
+ :disabled="disableSubmit||(model.evaluationStatus&&model.evaluationStatus!='DEPART_TECHNICAL_LEADER_SIGNING')"/>
</a-form-model-item>
</a-col>
</a-row>
</a-tab-pane>
</a-tabs>
- <a-tabs>
+ <a-tabs v-if="displayInspectorFlag">
<a-tab-pane tab="璁惧妫�楠屽憳纭">
<a-row>
<a-col :span="24">
<a-form-model-item prop="evaluationResult" label="閴村畾缁撴灉" :labelCol="rightColLabelCol"
:wrapperCol="rightColWrapperCol">
<j-dict-select-tag type='radio' v-model='model.evaluationResult'
- dictCode='equipment_technology_status'
- placeholder="璇烽�夋嫨纭绫诲瀷" :disabled="disableSubmit || inspectorConfirmDisable"/>
+ dictCode='equipment_technology_status' @change="handleEvaluationResultChange"
+ :disabled="disableSubmit||(model.evaluationStatus&&model.evaluationStatus!='INSPECTOR_SIGNING')"/>
</a-form-model-item>
</a-col>
<a-col :span="24">
- <a-form-model-item prop="evaluationReason" label="闄�/绂佺敤鍘熷洜" :labelCol="rightColLabelCol"
- :wrapperCol="rightColWrapperCol">
+ <a-form-model-item prop="evaluationReason"
+ v-if="model.evaluationResult&&model.evaluationResult!='QUALIFIED'" label="闄�/绂佺敤鍘熷洜"
+ :labelCol="rightColLabelCol" :wrapperCol="rightColWrapperCol">
<j-select-multiple v-model='model.evaluationReason'
- dictCode='technical_status_evaluation_result_reason'
- placeholder="璇烽�夋嫨闄�/绂佺敤鍘熷洜"/>
+ :disabled="disableSubmit||(model.evaluationStatus&&model.evaluationStatus!='INSPECTOR_SIGNING')"
+ dictCode='technical_status_evaluation_result_reason' placeholder="璇烽�夋嫨闄�/绂佺敤鍘熷洜"/>
</a-form-model-item>
</a-col>
<a-col :span="24">
- <a-form-model-item prop="inspectorComment" label="纭鎰忚" :labelCol="rightColLabelCol"
- :wrapperCol="rightColWrapperCol">
+ <a-form-model-item label="纭鎰忚" :labelCol="rightColLabelCol" :wrapperCol="rightColWrapperCol">
<a-textarea placeholder="璇疯緭鍏ユ剰瑙�" v-model="model.inspectorComment"
- :disabled="disableSubmit || completionDisable"/>
+ :disabled="disableSubmit||(model.evaluationStatus&&model.evaluationStatus!='INSPECTOR_SIGNING')"/>
</a-form-model-item>
</a-col>
</a-row>
@@ -354,15 +366,18 @@
imageSrc: null,
activeTabKey: 1,
validatorRules: {
- safetyCheckConfirmResult: [
- { required: true, message: '璇烽�夋嫨纭绫诲瀷' }
- ],
- confirmComment: [
- { required: true, message: '璇疯緭鍏ョ‘璁ゆ剰瑙�!' }
- ],
- leaderConfirmComment: [
- { required: true, message: '璇疯緭鍏ュ垵楠屾敹鎰忚!' }
- ]
+ safetyCheckConfirmResult: [{ required: true, message: '璇烽�夋嫨纭绫诲瀷' }],
+ precisionCheckConfirmResult: [{ required: true, message: '璇烽�夋嫨纭绫诲瀷' }],
+ otherCheckConfirmResult: [{ required: true, message: '璇烽�夋嫨纭绫诲瀷' }],
+ safetyEquipmentCheckResult: [{ required: true, message: '璇烽�夋嫨瀹夊叏瑁呯疆鏄惁榻愬叏' }],
+ precisionCheckResult: [{ required: true, message: '璇烽�夋嫨璁惧鍔熻兘鏄惁榻愬叏' }],
+ functionalCheckResult: [{ required: true, message: '璇烽�夋嫨绮惧害鏄惁杈惧埌瑕佹眰' }],
+ otherCheckResult: [{ required: true, message: '璇烽�夋嫨鍏朵粬妫�鏌ユ槸鍚﹀悎鏍�' }],
+ repairManagerSignatureResult: [{ required: true, message: '璇烽�夋嫨纭绫诲瀷' }],
+ sampleCheckResult: [{ required: true, message: '璇烽�夋嫨璇曚欢妫�鏌ョ粨鏋�' }],
+ departTechnicalLeaderSignatureResult: [{ required: true, message: '璇烽�夋嫨纭绫诲瀷' }],
+ evaluationResult: [{ required: true, message: '璇烽�夋嫨閴村畾缁撴灉' }],
+ evaluationReason: [{ required: true, message: '璇烽�夋嫨闄�/绂佺敤鍘熷洜' }]
},
url: {
queryById: '/eam/eamTechnicalStatusEvaluationOrder/queryById',
@@ -491,14 +506,20 @@
}
},
computed: {
- confirmDisable: function() {
- return ['WAIT_ADMIN_CONFIRM', 'WAIT_INSPECTOR_CONFIRM', 'COMPLETE'].includes(this.model.maintenanceStatus)
+ displayRepairerFlag() {
+ return this.model.evaluationStatus && ['REPAIRER_SIGNING', 'REPAIR_MANAGER_SIGNING', 'PROCESS_TECHNICIAN_SIGNING', 'DEPART_TECHNICAL_LEADER_SIGNING', 'INSPECTOR_SIGNING', 'COMPLETED'].includes(this.model.evaluationStatus)
},
- inspectorConfirmDisable: function() {
- return ['WAIT_INSPECTOR_CONFIRM', 'COMPLETE'].includes(this.model.maintenanceStatus)
+ displayRepairLeaderFlag() {
+ return this.model.evaluationStatus && ['REPAIR_MANAGER_SIGNING', 'PROCESS_TECHNICIAN_SIGNING', 'DEPART_TECHNICAL_LEADER_SIGNING', 'INSPECTOR_SIGNING', 'COMPLETED'].includes(this.model.evaluationStatus)
},
- completionDisable: function() {
- return ['COMPLETE'].includes(this.model.maintenanceStatus)
+ displayTechnicianFlag() {
+ return this.model.evaluationStatus && ['PROCESS_TECHNICIAN_SIGNING', 'DEPART_TECHNICAL_LEADER_SIGNING', 'INSPECTOR_SIGNING', 'COMPLETED'].includes(this.model.evaluationStatus)
+ },
+ displayTechnicalLeaderFlag() {
+ return this.model.evaluationStatus && ['DEPART_TECHNICAL_LEADER_SIGNING', 'INSPECTOR_SIGNING', 'COMPLETED'].includes(this.model.evaluationStatus)
+ },
+ displayInspectorFlag() {
+ return this.model.evaluationStatus && ['INSPECTOR_SIGNING', 'COMPLETED'].includes(this.model.evaluationStatus)
}
},
methods: {
@@ -507,15 +528,12 @@
* @param record 涓婚〉闈㈠垪琛ㄨ璁板綍
*/
async handleDetail(record) {
- this.initParams()
+ this.model = {}
+ this.visible = true
+ this.detail.safetyEquipmentCheckList = this.detail.precisionCheckList = this.detail.otherCheckList = []
+ this.handleTabToFirstTable()
+ this.getBasicInformationByApi(record)
this.getFlowChartImageByApi(record)
- let res = await getAction(this.url.queryById, { id: record.dataId })
- this.model = Object.assign({}, res.result)
- this.model.dataId = record.dataId
- this.model.taskId = record.id
- this.model.userId = record.assignee
- this.model.instanceId = record.procInstId
- this.loadDetail(record.dataId)
},
/**
@@ -523,9 +541,40 @@
* @param record 涓婚〉闈㈠垪琛ㄨ璁板綍
*/
recordDetail(record) {
- this.initParams()
+ this.visible = true
+ this.detail.safetyEquipmentCheckList = this.detail.precisionCheckList = this.detail.otherCheckList = []
this.model = Object.assign({}, record)
+ this.handleTabToFirstTable()
this.loadDetail(record.id)
+ },
+
+ /**
+ * 鑾峰彇鍩虹淇℃伅
+ * @param record 涓婚〉闈㈠垪琛ㄨ璁板綍
+ */
+ getBasicInformationByApi(record) {
+ this.spinning = true
+ const that = this
+ getAction(this.url.queryById, { id: record.dataId })
+ .then(res => {
+ if (res.success) {
+ that.model = Object.assign({}, res.result)
+ that.model.dataId = record.dataId
+ that.model.taskId = record.id
+ that.model.userId = record.assignee
+ that.model.instanceId = record.procInstId
+ }
+ else {
+ that.$notification.warning({
+ message: '娑堟伅',
+ description: res.message
+ })
+ }
+ })
+ .finally(() => {
+ this.loadDetail(record.dataId)
+ })
+
},
/**
@@ -626,12 +675,14 @@
//瑙勮寖閫夋嫨鍙樺寲
loadDetail(orderId) {
+ this.spinning = true
getAction(this.url.detail, { orderId })
.then(res => {
if (res.success) {
this.detail.safetyEquipmentCheckList = res.result.filter(item => item.checkCategory == 'SAFETY_EQUIPMENT_CHECK')
this.detail.precisionCheckList = res.result.filter(item => item.checkCategory == 'PRECISION_CHECK')
this.detail.otherCheckList = res.result.filter(item => item.checkCategory == 'OTHER_CHECK')
+ this.handleTabToFirstTable()
}
})
.finally(() => {
@@ -639,17 +690,14 @@
})
},
- // 鍒濆鍖栨暟鎹�
- initParams() {
- this.model = {}
- this.detail.safetyEquipmentCheckList = this.detail.precisionCheckList = this.detail.otherCheckList = []
- this.visible = true
- this.spinning = true
+ // 鍒囨崲tab鑷崇涓�涓〃鏍�
+ handleTabToFirstTable() {
this.$nextTick(() => {
for (let index = 1; index <= 3; index++) {
if (this.$refs['editableDetailTable' + index]) {
+ console.log('index----------', index)
this.activeTabKey = index
- return
+ break
}
}
})
@@ -664,6 +712,10 @@
this.activeTabKey = tabKey
},
+ handleEvaluationResultChange(value) {
+ if (value == 'QUALIFIED') this.model.evaluationReason = ''
+ },
+
/**
* 鑷畾涔夎〃鏍煎崟鍏冩牸鏍￠獙
* @param cellValue 鍗曞厓鏍煎��
--
Gitblit v1.9.3