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/eam/maintenance/EamInspectionOrderList.vue | 11 ++-
src/views/flowable/workflow/secondMaintenance/SecondMaintenanceApprovalModal.vue | 32 +++++-----
src/views/flowable/workflow/TechnicalStatusEvaluation/TechnicalStatusEvaluationApplicationApprovalModal.vue | 18 +++---
src/views/eam/maintenance/EamThirdMaintenanceOrderList.vue | 11 ++-
src/views/flowable/workflow/TechnicalStatusEvaluation/TechnicalStatusEvaluationOrderChangeApprovalModal.vue | 6 +-
src/views/flowable/workflow/FlowTodo.vue | 2
src/views/eam/base/EamMaintenanceStandardList.vue | 23 +++----
src/views/eam/maintenance/EamSecondMaintenanceOrderList.vue | 24 ++++---
8 files changed, 64 insertions(+), 63 deletions(-)
diff --git a/src/views/eam/base/EamMaintenanceStandardList.vue b/src/views/eam/base/EamMaintenanceStandardList.vue
index 7aac372..a3af2bd 100644
--- a/src/views/eam/base/EamMaintenanceStandardList.vue
+++ b/src/views/eam/base/EamMaintenanceStandardList.vue
@@ -125,7 +125,8 @@
</a-popconfirm>
</template>
- <template v-if="record.standardStatus !== 'WAIT_SUBMIT'&&record.standardStatus!=='ABOLISH'&&record.standardStatus!=='START'">
+ <template
+ v-if="record.standardStatus !== 'WAIT_SUBMIT'&&record.standardStatus!=='ABOLISH'&&record.standardStatus!=='START'">
<a-divider type="vertical"/>
<a @click.stop="handleDetail(record)">璇︽儏</a>
@@ -208,17 +209,22 @@
{
title: '缁熶竴缂栫爜',
align: 'center',
- dataIndex: 'equipmentCode'
+ dataIndex: 'equipmentCode',
},
{
title: '璁惧鍚嶇О',
align: 'center',
- dataIndex: 'equipmentName'
+ dataIndex: 'equipmentName',
},
{
title: '璁惧鍨嬪彿',
align: 'center',
- dataIndex: 'equipmentModel'
+ dataIndex: 'equipmentModel',
+ },
+ {
+ title: '瑙勮寖鐘舵��',
+ align: 'center',
+ dataIndex: 'standardStatus_dictText',
},
{
title: '淇濆吇鍒嗙被',
@@ -241,30 +247,21 @@
title: '淇濆吇鍛ㄦ湡',
align: 'center',
dataIndex: 'maintenancePeriod',
- width: 100
},
{
title: '淇濆吇鍛ㄦ湡鍗曚綅',
align: 'center',
dataIndex: 'periodUnit',
- width: 120
},
{
title: '鍒濆鏃ユ湡',
align: 'center',
dataIndex: 'initialDate',
- width: 100
- },
- {
- title: '瑙勮寖鐘舵��',
- align: 'center',
- dataIndex: 'standardStatus_dictText'
},
{
title: '瑙勮寖鐗堟湰',
align: 'center',
dataIndex: 'standardVersion',
- width: 100
}
],
url: {
diff --git a/src/views/eam/maintenance/EamInspectionOrderList.vue b/src/views/eam/maintenance/EamInspectionOrderList.vue
index 9f36e36..7342365 100644
--- a/src/views/eam/maintenance/EamInspectionOrderList.vue
+++ b/src/views/eam/maintenance/EamInspectionOrderList.vue
@@ -171,6 +171,12 @@
fixed: 'left'
},
{
+ title: '鐐规鐘舵��',
+ align: 'center',
+ dataIndex: 'inspectionStatus_dictText',
+ fixed: 'left'
+ },
+ {
title: '宸ュ崟鍙�',
align: 'center',
dataIndex: 'orderNum'
@@ -202,11 +208,6 @@
title: '鍒涘缓鏂瑰紡',
align: 'center',
dataIndex: 'creationMethod_dictText'
- },
- {
- title: '鐐规鐘舵��',
- align: 'center',
- dataIndex: 'inspectionStatus_dictText'
},
{
title: '鐐规浜�',
diff --git a/src/views/eam/maintenance/EamSecondMaintenanceOrderList.vue b/src/views/eam/maintenance/EamSecondMaintenanceOrderList.vue
index 4e10641..0487a9f 100644
--- a/src/views/eam/maintenance/EamSecondMaintenanceOrderList.vue
+++ b/src/views/eam/maintenance/EamSecondMaintenanceOrderList.vue
@@ -106,7 +106,8 @@
<a-divider v-if="record.maintenanceStatus === 'ABOLISH'" type="vertical"/>
- <a-popconfirm v-if="record.maintenanceStatus === 'ABOLISH'" title="纭畾杩樺師鍚�?" @confirm="() => handlerRestore(record.id)">
+ <a-popconfirm v-if="record.maintenanceStatus === 'ABOLISH'" title="纭畾杩樺師鍚�?"
+ @confirm="() => handlerRestore(record.id)">
<a>杩樺師</a>
</a-popconfirm>
@@ -189,6 +190,12 @@
fixed: 'left'
},
{
+ title: '淇濆吇鐘舵��',
+ align: 'center',
+ dataIndex: 'maintenanceStatus_dictText',
+ fixed: 'left'
+ },
+ {
title: '宸ュ崟鍙�',
align: 'center',
dataIndex: 'orderNum'
@@ -222,11 +229,6 @@
title: '缁翠慨宸�',
align: 'center',
dataIndex: 'repairman_dictText'
- },
- {
- title: '淇濆吇鐘舵��',
- align: 'center',
- dataIndex: 'maintenanceStatus_dictText'
},
{
title: '鍒涘缓鏂瑰紡',
@@ -263,10 +265,10 @@
list: '/eam/secondMaintenanceOrder/list',
abolish: '/eam/secondMaintenanceOrder/abolish',
collect: '/eam/secondMaintenanceOrder/collect',
- restore:'/eam/secondMaintenanceOrder/restore',
+ restore: '/eam/secondMaintenanceOrder/restore',
abolishBatch: '/eam/secondMaintenanceOrder/abolishBatch',
collectBatch: '/eam/secondMaintenanceOrder/collectBatch',
- restoreBatch: '/eam/secondMaintenanceOrder/restoreBatch',
+ restoreBatch: '/eam/secondMaintenanceOrder/restoreBatch'
}
}
},
@@ -325,7 +327,7 @@
this.$refs.secondMaintenanceApprovalModal.title = '璇︽儏'
this.$refs.secondMaintenanceApprovalModal.visible = true
this.$refs.secondMaintenanceApprovalModal.disableSubmit = true
- this.$refs.secondMaintenanceApprovalModal.recordDetail(record)
+ this.$refs.secondMaintenanceApprovalModal.handleDetail(record)
},
/**
@@ -388,7 +390,7 @@
})
},
//杩樺師
- handlerRestore(id){
+ handlerRestore(id) {
let that = this
this.loading = true
getAction(that.url.restore, { id })
@@ -409,7 +411,7 @@
})
},
//鎵归噺杩樺師
- handlerBatchRestore(){
+ handlerBatchRestore() {
if (!this.url.restoreBatch) {
this.$message.error('璇疯缃畊rl.restoreBatch灞炴��!')
return
diff --git a/src/views/eam/maintenance/EamThirdMaintenanceOrderList.vue b/src/views/eam/maintenance/EamThirdMaintenanceOrderList.vue
index f0ec1cb..b3aa941 100644
--- a/src/views/eam/maintenance/EamThirdMaintenanceOrderList.vue
+++ b/src/views/eam/maintenance/EamThirdMaintenanceOrderList.vue
@@ -148,6 +148,12 @@
fixed: 'left'
},
{
+ title: '淇濆吇鐘舵��',
+ align: 'center',
+ dataIndex: 'maintenanceStatus_dictText',
+ fixed: 'left'
+ },
+ {
title: '宸ュ崟鍙�',
align: 'center',
dataIndex: 'orderNum'
@@ -176,11 +182,6 @@
title: '缁翠慨浜�',
align: 'center',
dataIndex: 'repairman_dictText'
- },
- {
- title: '淇濆吇鐘舵��',
- align: 'center',
- dataIndex: 'maintenanceStatus_dictText'
},
{
title: '鍒涘缓鏂瑰紡',
diff --git a/src/views/flowable/workflow/FlowTodo.vue b/src/views/flowable/workflow/FlowTodo.vue
index 1ceba98..64c32b7 100644
--- a/src/views/flowable/workflow/FlowTodo.vue
+++ b/src/views/flowable/workflow/FlowTodo.vue
@@ -308,7 +308,7 @@
this.selectedRowData = Object.assign({}, record)
this.$refs.secondMaintenanceApprovalModal.visible = true
this.$refs.secondMaintenanceApprovalModal.title = record.name
- this.$refs.secondMaintenanceApprovalModal.handleDetail(record)
+ this.$refs.secondMaintenanceApprovalModal.handleApprove(record)
},
/**
diff --git a/src/views/flowable/workflow/TechnicalStatusEvaluation/TechnicalStatusEvaluationApplicationApprovalModal.vue b/src/views/flowable/workflow/TechnicalStatusEvaluation/TechnicalStatusEvaluationApplicationApprovalModal.vue
index ad928cb..8fbf118 100644
--- a/src/views/flowable/workflow/TechnicalStatusEvaluation/TechnicalStatusEvaluationApplicationApprovalModal.vue
+++ b/src/views/flowable/workflow/TechnicalStatusEvaluation/TechnicalStatusEvaluationApplicationApprovalModal.vue
@@ -77,13 +77,13 @@
:wrapperCol="rightColWrapperCol">
<j-dict-select-tag type='radio' v-model='model.departHeaderSignatureResult'
dictCode='approve_reject'
- :disabled="disableSubmit||(model.applicationStatus&&model.applicationStatus!='DEPART_HEADER_SIGNING')"/>
+ :disabled="disableSubmit||(model.applicationStatus&&model.applicationStatus!=='DEPART_HEADER_SIGNING')"/>
</a-form-model-item>
</a-col>
<a-col :span="24">
<a-form-model-item label="纭鎰忚" :labelCol="rightColLabelCol" :wrapperCol="rightColWrapperCol">
<a-textarea placeholder="璇疯緭鍏ユ剰瑙�" v-model="model.departHeaderComment"
- :disabled="disableSubmit||(model.applicationStatus&&model.applicationStatus!='DEPART_HEADER_SIGNING')"/>
+ :disabled="disableSubmit||(model.applicationStatus&&model.applicationStatus!=='DEPART_HEADER_SIGNING')"/>
</a-form-model-item>
</a-col>
</a-row>
@@ -98,13 +98,13 @@
:wrapperCol="rightColWrapperCol">
<j-dict-select-tag type='radio' v-model='model.productionHeaderSignatureResult'
dictCode='approve_reject'
- :disabled="disableSubmit||(model.applicationStatus&&model.applicationStatus!='PRODUCTION_HEADER_SIGNING')"/>
+ :disabled="disableSubmit||(model.applicationStatus&&model.applicationStatus!=='PRODUCTION_HEADER_SIGNING')"/>
</a-form-model-item>
</a-col>
<a-col :span="24">
<a-form-model-item label="纭鎰忚" :labelCol="rightColLabelCol" :wrapperCol="rightColWrapperCol">
<a-textarea placeholder="璇疯緭鍏ユ剰瑙�" v-model="model.productionHeaderComment"
- :disabled="disableSubmit||(model.applicationStatus&&model.applicationStatus!='PRODUCTION_HEADER_SIGNING')"/>
+ :disabled="disableSubmit||(model.applicationStatus&&model.applicationStatus!=='PRODUCTION_HEADER_SIGNING')"/>
</a-form-model-item>
</a-col>
</a-row>
@@ -119,13 +119,13 @@
:labelCol="rightColLabelCol" :wrapperCol="rightColWrapperCol">
<j-dict-select-tag type='radio' v-model='model.productionSupportSignatureResult'
dictCode='approve_reject'
- :disabled="disableSubmit||(model.applicationStatus&&model.applicationStatus!='PRODUCTION_SUPPORT_SIGNING')"/>
+ :disabled="disableSubmit||(model.applicationStatus&&model.applicationStatus!=='PRODUCTION_SUPPORT_SIGNING')"/>
</a-form-model-item>
</a-col>
<a-col :span="24">
<a-form-model-item label="纭鎰忚" :labelCol="rightColLabelCol" :wrapperCol="rightColWrapperCol">
<a-textarea placeholder="璇疯緭鍏ユ剰瑙�" v-model="model.productionSupportComment"
- :disabled="disableSubmit||(model.applicationStatus&&model.applicationStatus!='PRODUCTION_SUPPORT_SIGNING')"/>
+ :disabled="disableSubmit||(model.applicationStatus&&model.applicationStatus!=='PRODUCTION_SUPPORT_SIGNING')"/>
</a-form-model-item>
</a-col>
</a-row>
@@ -201,13 +201,13 @@
},
computed: {
displayDepartHeaderFlag() {
- return this.model.applicationStatus && ['DEPART_HEADER_SIGNING', 'PRODUCTION_HEADER_SIGNING', 'PRODUCTION_SUPPORT_SIGNING', 'COMPLETED'].includes(this.model.applicationStatus)
+ return this.model.applicationStatus && ['DEPART_HEADER_SIGNING', 'PRODUCTION_HEADER_SIGNING', 'PRODUCTION_SUPPORT_SIGNING', 'COMPLETED', 'REJECTED'].includes(this.model.applicationStatus)
},
displayProductionHeaderFlag() {
- return this.model.applicationStatus && ['PRODUCTION_HEADER_SIGNING', 'PRODUCTION_SUPPORT_SIGNING', 'COMPLETED'].includes(this.model.applicationStatus)
+ return this.model.applicationStatus && ['PRODUCTION_HEADER_SIGNING', 'PRODUCTION_SUPPORT_SIGNING', 'COMPLETED', 'REJECTED'].includes(this.model.applicationStatus) && this.model.departHeaderSignatureResult === '1'
},
displayProductionSupportFlag() {
- return this.model.applicationStatus && ['PRODUCTION_SUPPORT_SIGNING', 'COMPLETED'].includes(this.model.applicationStatus)
+ return this.model.applicationStatus && ['PRODUCTION_SUPPORT_SIGNING', 'COMPLETED', 'REJECTED'].includes(this.model.applicationStatus) && this.model.productionHeaderSignatureResult === '1'
}
},
methods: {
diff --git a/src/views/flowable/workflow/TechnicalStatusEvaluation/TechnicalStatusEvaluationOrderChangeApprovalModal.vue b/src/views/flowable/workflow/TechnicalStatusEvaluation/TechnicalStatusEvaluationOrderChangeApprovalModal.vue
index f34b70f..0808fe0 100644
--- a/src/views/flowable/workflow/TechnicalStatusEvaluation/TechnicalStatusEvaluationOrderChangeApprovalModal.vue
+++ b/src/views/flowable/workflow/TechnicalStatusEvaluation/TechnicalStatusEvaluationOrderChangeApprovalModal.vue
@@ -211,13 +211,13 @@
},
computed: {
displayEquipmentManagerFlag() {
- return this.model.changeStatus && ['EQUIPMENT_MANAGER_SIGNING', 'DEPART_MANAGER_SIGNING', 'PRODUCTION_SUPPORT_SIGNING', 'COMPLETED'].includes(this.model.changeStatus)
+ return this.model.changeStatus && ['EQUIPMENT_MANAGER_SIGNING', 'DEPART_MANAGER_SIGNING', 'PRODUCTION_SUPPORT_SIGNING', 'COMPLETED', 'REJECTED'].includes(this.model.changeStatus)
},
displayDepartManagerFlag() {
- return this.model.changeStatus && ['DEPART_MANAGER_SIGNING', 'PRODUCTION_SUPPORT_SIGNING', 'COMPLETED'].includes(this.model.changeStatus)
+ return this.model.changeStatus && ['DEPART_MANAGER_SIGNING', 'PRODUCTION_SUPPORT_SIGNING', 'COMPLETED', 'REJECTED'].includes(this.model.changeStatus) && this.model.equipmentManagerSignatureResult === '1'
},
displayProductionSupportFlag() {
- return this.model.changeStatus && ['PRODUCTION_SUPPORT_SIGNING', 'COMPLETED'].includes(this.model.changeStatus)
+ return this.model.changeStatus && ['PRODUCTION_SUPPORT_SIGNING', 'COMPLETED', 'REJECTED'].includes(this.model.changeStatus) && this.model.departManagerSignatureResult === '1'
}
},
methods: {
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