From 9520029a84be8df133a539968f05f20bf8041750 Mon Sep 17 00:00:00 2001
From: zhaowei <zhaowei>
Date: 星期四, 24 七月 2025 11:31:39 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/master'
---
src/views/flowable/workflow/thirdMaintenance/ThirdMaintenanceApprovalModal.vue | 9 ++++-----
1 files changed, 4 insertions(+), 5 deletions(-)
diff --git a/src/views/flowable/workflow/thirdMaintenance/ThirdMaintenanceApprovalModal.vue b/src/views/flowable/workflow/thirdMaintenance/ThirdMaintenanceApprovalModal.vue
index db0962e..99e165f 100644
--- a/src/views/flowable/workflow/thirdMaintenance/ThirdMaintenanceApprovalModal.vue
+++ b/src/views/flowable/workflow/thirdMaintenance/ThirdMaintenanceApprovalModal.vue
@@ -2,7 +2,6 @@
<j-modal :title="title" :visible="visible" :confirmLoading="confirmLoading"
:okButtonProps="{ class:{'jee-hidden': disableSubmit} }" fullscreen @ok="handleOk" @cancel="handleCancel"
cancelText="鍏抽棴">
-
<a-spin :spinning="spinning">
<a-form-model ref="form" :model="model" :rules="validatorRules" :labelCol="labelCol" :wrapperCol="wrapperCol">
<a-row :gutter="24" id="outer-row">
@@ -63,7 +62,7 @@
<a-col :span="model.maintenanceStatus&&model.maintenanceStatus!='WAIT_MAINTENANCE'?10:16" class="scroll-col">
<a-tabs v-model="activeTabKey" @change="$refs.editableDetailTable.clearValidate()">
<a-tab-pane key="1" tab="淇濆吇椤规槑缁�">
- <j-vxe-table ref="editableDetailTable" rowSelection bordered alwaysEdit keep-source :height="300"
+ <j-vxe-table ref="editableDetailTable" rowSelection bordered alwaysEdit keep-source
:dataSource="detail.dataSource" :columns="detail.columns"
@selectRowChange="handleTableSelectRowChange">
<!--淇濆吇缁撴灉-->
@@ -357,7 +356,7 @@
},
computed: {
displayEvaluationFlag() {
- return this.model.maintenanceStatus && ['WAIT_CHECK', 'UNDER_MAINTENANCE', 'UNDER_FIRST_ACCEPTANCE', 'UNDER_SECOND_ACCEPTANCE', 'OPERATOR_SIGNATURE', 'REPAIRMAN_SIGNATURE', 'REPAIR_MANAGER_SIGNATURE', 'INSPECTOR_SIGNATURE', 'COMPLETE'].includes(this.model.maintenanceStatus)
+ return this.model.maintenanceStatus && ['WAIT_CHECK', 'UNDER_MAINTENANCE', 'UNDER_FIRST_ACCEPTANCE', 'UNDER_SECOND_ACCEPTANCE', 'OPERATOR_SIGNATURE', 'REPAIRMAN_SIGNATURE', 'REPAIR_MANAGER_SIGNATURE', 'INSPECTOR_SIGNATURE', 'COMPLETE', 'CANCEL'].includes(this.model.maintenanceStatus)
},
displayFirstAcceptanceFlag() {
return this.model.maintenanceStatus && ['UNDER_FIRST_ACCEPTANCE', 'UNDER_SECOND_ACCEPTANCE', 'OPERATOR_SIGNATURE', 'REPAIRMAN_SIGNATURE', 'REPAIR_MANAGER_SIGNATURE', 'INSPECTOR_SIGNATURE', 'COMPLETE'].includes(this.model.maintenanceStatus)
@@ -383,7 +382,7 @@
* 涓婚〉闈㈢偣鍑绘墽琛屽鎵规椂瑙﹀彂
* @param record 涓婚〉闈㈠垪琛ㄨ璁板綍
*/
- async handleDetail(record) {
+ async handleApprove(record) {
this.model = {}
this.detail.dataSource = []
this.getBasicInformationByApi(record)
@@ -394,7 +393,7 @@
* 涓婚〉闈㈢偣鍑昏鎯呮椂瑙﹀彂
* @param record 涓婚〉闈㈠垪琛ㄨ璁板綍
*/
- recordDetail(record) {
+ handleDetail(record) {
this.spinning = true
this.detail.dataSource = []
this.model = Object.assign({
--
Gitblit v1.9.3