From 3a8181119526dd55814fc69ac0566f93009fa71f Mon Sep 17 00:00:00 2001
From: zhaowei <zhaowei>
Date: 星期三, 23 七月 2025 17:31:07 +0800
Subject: [PATCH] 1、各类审批状态提至列表靠前位置 2、新增二保、技术鉴定状态申请以及技术鉴定工单变更流程驳回时的审批节点展示条件
---
src/views/flowable/workflow/secondMaintenance/SecondMaintenanceApprovalModal.vue | 32 ++++++++++++++++----------------
1 files changed, 16 insertions(+), 16 deletions(-)
diff --git a/src/views/flowable/workflow/secondMaintenance/SecondMaintenanceApprovalModal.vue b/src/views/flowable/workflow/secondMaintenance/SecondMaintenanceApprovalModal.vue
index d866f53..cf5982c 100644
--- a/src/views/flowable/workflow/secondMaintenance/SecondMaintenanceApprovalModal.vue
+++ b/src/views/flowable/workflow/secondMaintenance/SecondMaintenanceApprovalModal.vue
@@ -69,7 +69,7 @@
:span="model.maintenanceStatus&&model.maintenanceStatus!='WAIT_MAINTENANCE'&&model.maintenanceStatus!='UNDER_MAINTENANCE'?10:16">
<a-tabs :active-key="activeTabKey" @change="handleTabChange">
<a-tab-pane :key="1" tab="鎿嶄綔宸�"
- v-if="selectShenpiData.taskDefKey&&selectShenpiData.taskDefKey=='operator_task'||
+ v-if="selectShenpiData.taskDefKey&&selectShenpiData.taskDefKey==='operator_task'||
(model.maintenanceStatus&&model.maintenanceStatus!='UNDER_MAINTENANCE')">
<j-vxe-table ref="editableDetailTable1" :rowNumber="false" rowSelection bordered
alwaysEdit keep-source
@@ -104,7 +104,7 @@
</a-tab-pane>
<a-tab-pane :key="2" tab="缁翠慨宸�"
- v-if="selectShenpiData.taskDefKey&&selectShenpiData.taskDefKey=='maintenance_task'||
+ v-if="selectShenpiData.taskDefKey&&selectShenpiData.taskDefKey==='maintenance_task'||
(model.maintenanceStatus&&model.maintenanceStatus!='UNDER_MAINTENANCE')">
<j-vxe-table ref="editableDetailTable2" :rowNumber="false" rowSelection bordered
alwaysEdit kee-source
@@ -149,8 +149,8 @@
v-if="activeTabKey!=='3'"
:disabled="disableSubmit ||
(model.maintenanceStatus&&model.maintenanceStatus!='UNDER_MAINTENANCE') ||
- (activeTabKey=='1'&&selectedOperatorMaintenanceRowKeys.length == 0)||
- (activeTabKey=='2'&&selectedRepairerMaintenanceRowKeys.length == 0)"
+ (activeTabKey==='1'&&selectedOperatorMaintenanceRowKeys.length === 0)||
+ (activeTabKey==='2'&&selectedRepairerMaintenanceRowKeys.length === 0)"
slot="tabBarExtraContent"
type="primary" @click="handleSelectAllInspectionResult">鎵归噺淇濆吇姝ｅ父
</a-button>
@@ -330,10 +330,10 @@
},
computed: {
displayAdminConfirmFlag() {
- return ['WAIT_ADMIN_CONFIRM', 'WAIT_INSPECTOR_CONFIRM', 'COMPLETE'].includes(this.model.maintenanceStatus)
+ return ['WAIT_ADMIN_CONFIRM', 'WAIT_INSPECTOR_CONFIRM', 'COMPLETE', 'REJECTED'].includes(this.model.maintenanceStatus)
},
displayInspectorConfirmFlag() {
- return ['WAIT_INSPECTOR_CONFIRM', 'COMPLETE'].includes(this.model.maintenanceStatus)
+ return ['WAIT_INSPECTOR_CONFIRM', 'COMPLETE', 'REJECTED'].includes(this.model.maintenanceStatus) && this.model.manageUserResult === '1'
}
},
methods: {
@@ -341,7 +341,7 @@
* 涓婚〉闈㈢偣鍑绘墽琛屽鎵规椂瑙﹀彂
* @param record 涓婚〉闈㈠垪琛ㄨ璁板綍
*/
- async handleDetail(record) {
+ async handleApprove(record) {
this.spinning = true
this.model = {}
this.detail.operatorMaintenanceList = this.detail.repairerMaintenanceList = []
@@ -355,7 +355,7 @@
* 涓婚〉闈㈢偣鍑昏鎯呮椂瑙﹀彂
* @param record 涓婚〉闈㈠垪琛ㄨ璁板綍
*/
- recordDetail(record) {
+ handleDetail(record) {
this.spinning = true
this.activeTabKey = 1
this.detail.operatorMaintenanceList = this.detail.repairerMaintenanceList = []
@@ -443,7 +443,7 @@
that.confirmLoading = that.spinning = true
// 浠呭湪淇濆吇涓姸鎬佷紶閫掕〃鏍煎垪琛�
- if (this.model.maintenanceStatus == 'UNDER_MAINTENANCE') {
+ if (this.model.maintenanceStatus === 'UNDER_MAINTENANCE') {
for (let index = 1; index <= 2; index++) {
if (that.$refs['editableDetailTable' + index]) {
this.model.tableDetailList = that.$refs['editableDetailTable' + index].getTableData()
@@ -499,8 +499,8 @@
handleTabToFirstTable() {
this.$nextTick(() => {
console.log('taskDefKey', this.selectShenpiData.taskDefKey)
- if ((this.selectShenpiData.taskDefKey && this.selectShenpiData.taskDefKey == 'operator_task') || !this.selectShenpiData.taskDefKey) this.activeTabKey = 1
- else if (this.selectShenpiData.taskDefKey && this.selectShenpiData.taskDefKey == 'maintenance_task') this.activeTabKey = 2
+ if ((this.selectShenpiData.taskDefKey && this.selectShenpiData.taskDefKey === 'operator_task') || !this.selectShenpiData.taskDefKey) this.activeTabKey = 1
+ else if (this.selectShenpiData.taskDefKey && this.selectShenpiData.taskDefKey === 'maintenance_task') this.activeTabKey = 2
})
},
@@ -509,8 +509,8 @@
getAction(this.url.detail, { orderId })
.then(res => {
if (res.success) {
- this.detail.operatorMaintenanceList = res.result.filter(item => item.itemCategory == 'OPERATOR_MAINTENANCE')
- this.detail.repairerMaintenanceList = res.result.filter(item => item.itemCategory == 'REPAIRER_MAINTENANCE')
+ this.detail.operatorMaintenanceList = res.result.filter(item => item.itemCategory === 'OPERATOR_MAINTENANCE')
+ this.detail.repairerMaintenanceList = res.result.filter(item => item.itemCategory === 'REPAIRER_MAINTENANCE')
}
})
},
@@ -523,16 +523,16 @@
// 鎵归噺閫夋嫨鎵�鏈夌偣妫�缁撴灉
handleSelectAllInspectionResult() {
let selectedRowKeys, prefix
- if (this.activeTabKey == 1) {
+ if (this.activeTabKey === 1) {
selectedRowKeys = this.selectedOperatorMaintenanceRowKeys
prefix = 'operator'
}
- else if (this.activeTabKey == 2) {
+ else if (this.activeTabKey === 2) {
selectedRowKeys = this.selectedRepairerMaintenanceRowKeys
prefix = 'repairer'
}
else selectedRowKeys = []
- if (selectedRowKeys.length == 0) return
+ if (selectedRowKeys.length === 0) return
selectedRowKeys.forEach(key => {
const dataItem = this.detail[prefix + 'MaintenanceList'].find(item => item.id === key)
--
Gitblit v1.9.3