From 1392d8f3def2c21e7a6fc15cf3f68fc1056ec0b6 Mon Sep 17 00:00:00 2001
From: lyh <925863403@qq.com>
Date: 星期二, 29 七月 2025 19:01:20 +0800
Subject: [PATCH] 三不原则
---
src/views/flowable/workflow/secondMaintenance/SecondMaintenanceApprovalModal.vue | 72 ++++++++++++++++++------------------
1 files changed, 36 insertions(+), 36 deletions(-)
diff --git a/src/views/flowable/workflow/secondMaintenance/SecondMaintenanceApprovalModal.vue b/src/views/flowable/workflow/secondMaintenance/SecondMaintenanceApprovalModal.vue
index d866f53..b98c141 100644
--- a/src/views/flowable/workflow/secondMaintenance/SecondMaintenanceApprovalModal.vue
+++ b/src/views/flowable/workflow/secondMaintenance/SecondMaintenanceApprovalModal.vue
@@ -66,11 +66,11 @@
</a-col>
<a-col class="scroll-col"
- :span="model.maintenanceStatus&&model.maintenanceStatus!='WAIT_MAINTENANCE'&&model.maintenanceStatus!='UNDER_MAINTENANCE'?10:16">
+ :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'||
- (model.maintenanceStatus&&model.maintenanceStatus!='UNDER_MAINTENANCE')">
+ 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
:dataSource="detail.operatorMaintenanceList" :columns="detail.columns"
@@ -78,25 +78,25 @@
<template v-slot:maintenanceResult="props">
<j-dict-select-tag v-model="props.row.maintenanceResult" dictCode="maintenance_result"
placeholder="璇烽�夋嫨淇濆吇缁撴灉"
- :disabled="disableSubmit||(model.maintenanceStatus&&model.maintenanceStatus!='UNDER_MAINTENANCE')"
+ :disabled="disableSubmit||(model.maintenanceStatus&&model.maintenanceStatus!=='UNDER_MAINTENANCE')"
@change="handleInspectionResultSelectChange($event,props.row)"
style="width: 100%"/>
</template>
<template v-slot:exceptionDescription="props">
<a-textarea :rows="1" :autoSize="false" v-model="props.row.exceptionDescription"
- :placeholder="props.row.maintenanceResult&&props.row.maintenanceResult!='1'?'璇疯緭鍏ュ紓甯告弿杩�':''"
+ :placeholder="props.row.maintenanceResult&&props.row.maintenanceResult!=='1'?'璇疯緭鍏ュ紓甯告弿杩�':''"
:disabled="disableSubmit||
- (model.maintenanceStatus&&model.maintenanceStatus!='UNDER_MAINTENANCE') ||
+ (model.maintenanceStatus&&model.maintenanceStatus!=='UNDER_MAINTENANCE') ||
!props.row.maintenanceResult ||
props.row.maintenanceResult === '1'"/>
</template>
<template v-slot:reportFlag="props">
<j-dict-select-tag v-model="props.row.reportFlag" dictCode="yn" style="width: 100%"
- :placeholder="props.row.maintenanceResult&&props.row.maintenanceResult!='1'?'璇烽�夋嫨寮傚父鏄惁鎶ヤ慨':''"
+ :placeholder="props.row.maintenanceResult&&props.row.maintenanceResult!=='1'?'璇烽�夋嫨寮傚父鏄惁鎶ヤ慨':''"
:disabled="disableSubmit ||
- (model.maintenanceStatus&&model.maintenanceStatus!='UNDER_MAINTENANCE') ||
+ (model.maintenanceStatus&&model.maintenanceStatus!=='UNDER_MAINTENANCE') ||
!props.row.maintenanceResult ||
props.row.maintenanceResult === '1'"/>
</template>
@@ -104,8 +104,8 @@
</a-tab-pane>
<a-tab-pane :key="2" tab="缁翠慨宸�"
- v-if="selectShenpiData.taskDefKey&&selectShenpiData.taskDefKey=='maintenance_task'||
- (model.maintenanceStatus&&model.maintenanceStatus!='UNDER_MAINTENANCE')">
+ 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
:dataSource="detail.repairerMaintenanceList" :columns="detail.columns"
@@ -113,26 +113,26 @@
<template v-slot:maintenanceResult="props">
<j-dict-select-tag v-model="props.row.maintenanceResult" dictCode="maintenance_result"
placeholder="璇烽�夋嫨淇濆吇缁撴灉"
- :disabled="disableSubmit||(model.maintenanceStatus&&model.maintenanceStatus!='UNDER_MAINTENANCE')"
+ :disabled="disableSubmit||(model.maintenanceStatus&&model.maintenanceStatus!=='UNDER_MAINTENANCE')"
@change="handleInspectionResultSelectChange($event,props.row)"
style="width: 100%"/>
</template>
<template v-slot:exceptionDescription="props">
<a-textarea :rows="1" :autoSize="false" v-model="props.row.exceptionDescription"
- :placeholder="props.row.maintenanceResult&&props.row.maintenanceResult!='1'?'璇疯緭鍏ュ紓甯告弿杩�':''"
+ :placeholder="props.row.maintenanceResult&&props.row.maintenanceResult!=='1'?'璇疯緭鍏ュ紓甯告弿杩�':''"
:disabled="disableSubmit ||
- (model.maintenanceStatus&&model.maintenanceStatus!='UNDER_MAINTENANCE') ||
+ (model.maintenanceStatus&&model.maintenanceStatus!=='UNDER_MAINTENANCE') ||
!props.row.maintenanceResult ||
props.row.maintenanceResult === '1'"/>
</template>
<template v-slot:reportFlag="props">
<j-dict-select-tag v-model="props.row.reportFlag"
- :placeholder="props.row.maintenanceResult&&props.row.maintenanceResult!='1'?'璇烽�夋嫨寮傚父鏄惁鎶ヤ慨':''"
+ :placeholder="props.row.maintenanceResult&&props.row.maintenanceResult!=='1'?'璇烽�夋嫨寮傚父鏄惁鎶ヤ慨':''"
dictCode="yn" style="width: 100%"
:disabled="disableSubmit||
- (model.maintenanceStatus&&model.maintenanceStatus!='UNDER_MAINTENANCE') ||
+ (model.maintenanceStatus&&model.maintenanceStatus!=='UNDER_MAINTENANCE') ||
!props.row.maintenanceResult ||
props.row.maintenanceResult === '1'"/>
</template>
@@ -148,9 +148,9 @@
<a-button
v-if="activeTabKey!=='3'"
:disabled="disableSubmit ||
- (model.maintenanceStatus&&model.maintenanceStatus!='UNDER_MAINTENANCE') ||
- (activeTabKey=='1'&&selectedOperatorMaintenanceRowKeys.length == 0)||
- (activeTabKey=='2'&&selectedRepairerMaintenanceRowKeys.length == 0)"
+ (model.maintenanceStatus&&model.maintenanceStatus!=='UNDER_MAINTENANCE') ||
+ (activeTabKey==='1'&&selectedOperatorMaintenanceRowKeys.length === 0)||
+ (activeTabKey==='2'&&selectedRepairerMaintenanceRowKeys.length === 0)"
slot="tabBarExtraContent"
type="primary" @click="handleSelectAllInspectionResult">鎵归噺淇濆吇姝ｅ父
</a-button>
@@ -159,7 +159,7 @@
<!--鍙充晶瀹℃壒鍒�-->
<a-col :span="6" class="scroll-col"
- v-if="model.maintenanceStatus&&model.maintenanceStatus!='WAIT_MAINTENANCE'&&model.maintenanceStatus!='UNDER_MAINTENANCE'">
+ v-if="model.maintenanceStatus&&model.maintenanceStatus!=='WAIT_MAINTENANCE'&&model.maintenanceStatus!=='UNDER_MAINTENANCE'">
<a-tabs v-if="displayAdminConfirmFlag">
<a-tab-pane tab="绠＄悊鍛樼‘璁�">
<a-row>
@@ -167,19 +167,19 @@
<a-form-model-item prop="manageUserResult" label="纭绫诲瀷">
<j-dict-select-tag type='radio' v-model='model.manageUserResult' dictCode='approve_reject'
placeholder="璇烽�夋嫨纭绫诲瀷"
- :disabled="disableSubmit || model.maintenanceStatus!='WAIT_ADMIN_CONFIRM'"/>
+ :disabled="disableSubmit || model.maintenanceStatus!=='WAIT_ADMIN_CONFIRM'"/>
</a-form-model-item>
</a-col>
<a-col :span="24">
<a-form-model-item label="闂鎻忚堪">
<a-textarea placeholder="璇锋弿杩伴棶棰�" v-model='model.problemDescription'
- :disabled="disableSubmit || model.maintenanceStatus!='WAIT_ADMIN_CONFIRM'"/>
+ :disabled="disableSubmit || model.maintenanceStatus!=='WAIT_ADMIN_CONFIRM'"/>
</a-form-model-item>
</a-col>
<a-col :span="24">
<a-form-model-item label="澶勭悊鎺柦鎻忚堪">
<a-textarea placeholder="璇锋弿杩板鐞嗘帾鏂�" v-model="model.dealDescription"
- :disabled="disableSubmit || model.maintenanceStatus!='WAIT_ADMIN_CONFIRM'"/>
+ :disabled="disableSubmit || model.maintenanceStatus!=='WAIT_ADMIN_CONFIRM'"/>
</a-form-model-item>
</a-col>
</a-row>
@@ -193,13 +193,13 @@
<a-form-model-item prop="inspectorResult" label="纭绫诲瀷">
<j-dict-select-tag type='radio' v-model='model.inspectorResult' dictCode='approve_reject'
placeholder="璇烽�夋嫨纭绫诲瀷"
- :disabled="disableSubmit || model.maintenanceStatus!='WAIT_INSPECTOR_CONFIRM'"/>
+ :disabled="disableSubmit || model.maintenanceStatus!=='WAIT_INSPECTOR_CONFIRM'"/>
</a-form-model-item>
</a-col>
<a-col :span="24">
<a-form-model-item label="纭鎰忚">
<a-textarea placeholder="璇疯緭鍏ユ剰瑙�" v-model="model.inspectConfirmComment"
- :disabled="disableSubmit || model.maintenanceStatus!='WAIT_INSPECTOR_CONFIRM'"/>
+ :disabled="disableSubmit || model.maintenanceStatus!=='WAIT_INSPECTOR_CONFIRM'"/>
</a-form-model-item>
</a-col>
</a-row>
@@ -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.model.maintenanceStatus !== 'UNDER_MAINTENANCE')) 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