From 698ef949a5a503e4c0aeae28e5570093a9744d86 Mon Sep 17 00:00:00 2001
From: zhaowei <zhaowei>
Date: 星期四, 24 七月 2025 11:31:21 +0800
Subject: [PATCH] 我的已办增加流程详情功能
---
src/views/flowable/workflow/TechnicalStatusEvaluation/TechnicalStatusEvaluationApplicationApprovalModal.vue | 9 -
src/views/eam/maintenance/modules/EamThirdMaintenanceOrderModal.vue | 11 -
src/views/eam/maintenance/EamThirdMaintenanceOrderList.vue | 12
src/views/eam/repair/modules/EamRepairOrderList/EamRepairOrderModal.vue | 14 +
src/views/flowable/workflow/thirdMaintenance/ThirdMaintenanceApprovalModal.vue | 4
src/views/eam/technical/EamTechnicalStatusEvaluationOrderList.vue | 16 +-
src/views/flowable/workflow/secondMaintenance/SecondMaintenanceApprovalModal.vue | 46 +++---
src/views/flowable/workflow/repairOrder/RepairOrderApprovalModal.vue | 14 +
src/views/eam/repair/EamRepairOrderList.vue | 2
src/views/flowable/workflow/TechnicalStatusEvaluation/TechnicalStatusEvaluationApprovalModal.vue | 4
src/views/eam/technical/EamTechnicalStatusEvaluationOrderChangeList.vue | 2
src/views/flowable/workflow/FlowCompleted.vue | 226 +++++++++++++++++++++++++++----
src/views/flowable/workflow/FlowTodo.vue | 31 ++++
13 files changed, 295 insertions(+), 96 deletions(-)
diff --git a/src/views/eam/maintenance/EamThirdMaintenanceOrderList.vue b/src/views/eam/maintenance/EamThirdMaintenanceOrderList.vue
index b3aa941..8f1e428 100644
--- a/src/views/eam/maintenance/EamThirdMaintenanceOrderList.vue
+++ b/src/views/eam/maintenance/EamThirdMaintenanceOrderList.vue
@@ -79,7 +79,7 @@
<eamThirdMaintenanceOrder-modal ref="modalForm" @ok="modalFormOk"/>
<third-maintenance-approval-modal ref="thirdMaintenanceApprovalModal"
- :selectShenpiData="selectThirdMaintenanceData"/>
+ :selectShenpiData="selectedRowData"/>
<!--宸ュ崟鍙樻洿寮圭獥-->
<eam-third-maintenance-change-modal ref="orderChangeModal" @ok="modalFormOk"/>
@@ -93,8 +93,7 @@
import { deleteAction, getAction } from '@api/manage'
import ThirdMaintenanceApprovalModal
from '@views/flowable/workflow/thirdMaintenance/ThirdMaintenanceApprovalModal.vue'
- import EamThirdMaintenanceChangeModal
- from '@views/eam/technical/modules/EamThirdMaintenanceChangeModal.vue'
+ import EamThirdMaintenanceChangeModal from './modules/EamThirdMaintenanceChangeModal.vue'
export default {
name: 'EamThirdMaintenanceOrderList',
@@ -115,7 +114,7 @@
return {
description: '璁惧涓夌骇淇濆吇绠＄悊椤甸潰',
disableMixinCreated: true,
- selectThirdMaintenanceData: {},
+ selectedRowData: {},
// 琛ㄥご
columns: [
{
@@ -285,6 +284,7 @@
dataIndex: 'action',
align: 'center',
fixed: 'right',
+ width: 200,
scopedSlots: { customRender: 'action' }
}
this.columns = [...this.columns, operationColumn]
@@ -356,11 +356,11 @@
* @param record
*/
handleDetail(record) {
- this.selectThirdMaintenanceData = Object.assign({}, record)
+ this.selectedRowData = Object.assign({}, record)
this.$refs.thirdMaintenanceApprovalModal.title = '璇︽儏'
this.$refs.thirdMaintenanceApprovalModal.visible = true
this.$refs.thirdMaintenanceApprovalModal.disableSubmit = true
- this.$refs.thirdMaintenanceApprovalModal.recordDetail(record)
+ this.$refs.thirdMaintenanceApprovalModal.handleDetail(record)
},
onMaintenanceDateChange(dateString) {
diff --git a/src/views/eam/maintenance/modules/EamThirdMaintenanceOrderModal.vue b/src/views/eam/maintenance/modules/EamThirdMaintenanceOrderModal.vue
index 2ff8c43..d4900dc 100644
--- a/src/views/eam/maintenance/modules/EamThirdMaintenanceOrderModal.vue
+++ b/src/views/eam/maintenance/modules/EamThirdMaintenanceOrderModal.vue
@@ -13,7 +13,8 @@
<a-col :span="8">
<a-form-model-item prop="equipmentId" label="缁熶竴缂栫爜">
<maintenance-equipment-select placeholder="璇疯緭鍏ョ粺涓�缂栫爜鎴栧悕绉版悳绱�" v-model="model.equipmentId"
- maintenanceCategory="THIRD_MAINTENANCE" @autocompleteForm="autocompleteForm"/>
+ maintenanceCategory="THIRD_MAINTENANCE"
+ @autocompleteForm="autocompleteForm"/>
</a-form-model-item>
</a-col>
<a-col :span="8">
@@ -87,12 +88,8 @@
confirmLoading: false,
spinning: false,
validatorRules: {
- equipmentId: [
- { required: true, message: '璇疯緭鍏ョ粺涓�缂栫爜鎴栧悕绉版悳绱�' }
- ],
- maintenanceDate: [
- { required: true, message: '璇烽�夋嫨璁″垝淇濆吇鏃ユ湡!' }
- ]
+ equipmentId: [{ required: true, message: '璇疯緭鍏ョ粺涓�缂栫爜鎴栧悕绉版悳绱�', trigger: 'change' }],
+ maintenanceDate: [{ required: true, message: '璇烽�夋嫨璁″垝淇濆吇鏃ユ湡', trigger: 'change' }]
},
url: {
add: '/eam/thirdMaintenanceOrder/add',
diff --git a/src/views/eam/repair/EamRepairOrderList.vue b/src/views/eam/repair/EamRepairOrderList.vue
index f4f9e4f..e5f457b 100644
--- a/src/views/eam/repair/EamRepairOrderList.vue
+++ b/src/views/eam/repair/EamRepairOrderList.vue
@@ -276,7 +276,7 @@
this.$refs.repairOrderApprovalModal.visible = true
this.$refs.repairOrderApprovalModal.title = '璇︽儏'
this.$refs.repairOrderApprovalModal.disableSubmit = true
- this.$refs.repairOrderApprovalModal.recordDetail(record)
+ this.$refs.repairOrderApprovalModal.handleDetail(record)
}
}
}
diff --git a/src/views/eam/repair/modules/EamRepairOrderList/EamRepairOrderModal.vue b/src/views/eam/repair/modules/EamRepairOrderList/EamRepairOrderModal.vue
index 70eaaa5..c9d41a0 100644
--- a/src/views/eam/repair/modules/EamRepairOrderList/EamRepairOrderModal.vue
+++ b/src/views/eam/repair/modules/EamRepairOrderList/EamRepairOrderModal.vue
@@ -5,14 +5,24 @@
<a-form-model ref="form" :model="model" :rules="validatorRules" :labelCol="labelCol" :wrapperCol="wrapperCol">
<a-row>
<a-col :span="customSpan">
- <a-form-model-item label="缁翠慨寮�濮嬫椂闂�" prop="actualStartTime" :labelCol="labelCol" :wrapperCol="wrapperCol">
+ <a-form-model-item label="缁熶竴缂栫爜">
+ <lx-search-equipment-select v-model="model.equipmentId" disabled/>
+ </a-form-model-item>
+ </a-col>
+ <a-col :span="customSpan">
+ <a-form-model-item label="宸ュ崟鍙�">
+ <a-input v-model="model.repairCode" readOnly/>
+ </a-form-model-item>
+ </a-col>
+ <a-col :span="customSpan">
+ <a-form-model-item label="缁翠慨寮�濮嬫椂闂�" prop="actualStartTime">
<a-date-picker show-time v-model="model.actualStartTime" :allowClear="false"
value-format="YYYY-MM-DD HH:mm:ss"
style="width:100%"/>
</a-form-model-item>
</a-col>
<a-col :span="customSpan">
- <a-form-model-item label="缁翠慨缁撴潫鏃堕棿" prop="actualEndTime" :labelCol="labelCol" :wrapperCol="wrapperCol">
+ <a-form-model-item label="缁翠慨缁撴潫鏃堕棿" prop="actualEndTime">
<a-date-picker show-time v-model="model.actualEndTime" :allowClear="false"
value-format="YYYY-MM-DD HH:mm:ss"
style="width:100%"/>
diff --git a/src/views/eam/technical/EamTechnicalStatusEvaluationOrderChangeList.vue b/src/views/eam/technical/EamTechnicalStatusEvaluationOrderChangeList.vue
index 5ac868f..af6f18f 100644
--- a/src/views/eam/technical/EamTechnicalStatusEvaluationOrderChangeList.vue
+++ b/src/views/eam/technical/EamTechnicalStatusEvaluationOrderChangeList.vue
@@ -231,12 +231,12 @@
description: res.message
})
that.loadData()
- that.loading = false
} else {
that.$notification.warning({
message: '娑堟伅',
description: res.message
})
+ that.loading = false
}
})
},
diff --git a/src/views/eam/technical/EamTechnicalStatusEvaluationOrderList.vue b/src/views/eam/technical/EamTechnicalStatusEvaluationOrderList.vue
index 8a25359..4eb05c3 100644
--- a/src/views/eam/technical/EamTechnicalStatusEvaluationOrderList.vue
+++ b/src/views/eam/technical/EamTechnicalStatusEvaluationOrderList.vue
@@ -129,6 +129,12 @@
fixed: 'left'
},
{
+ title: '閴村畾鐘舵��',
+ align: 'center',
+ dataIndex: 'evaluationStatus_dictText',
+ fixed: 'left'
+ },
+ {
title: '宸ュ崟鍙�',
align: 'center',
dataIndex: 'orderNum'
@@ -162,11 +168,6 @@
title: '棰嗗彇浜�',
align: 'center',
dataIndex: 'evaluator_dictText'
- },
- {
- title: '閴村畾鐘舵��',
- align: 'center',
- dataIndex: 'evaluationStatus_dictText'
},
{
title: '鍒涘缓鏂瑰紡',
@@ -263,7 +264,8 @@
dataIndex: 'action',
align: 'center',
scopedSlots: { customRender: 'action' },
- fixed: 'right'
+ fixed: 'right',
+ width: 200
}
],
url: {
@@ -316,7 +318,7 @@
this.$refs.technicalStatusEvaluationApprovalModal.title = '璇︽儏'
this.$refs.technicalStatusEvaluationApprovalModal.visible = true
this.$refs.technicalStatusEvaluationApprovalModal.disableSubmit = true
- this.$refs.technicalStatusEvaluationApprovalModal.recordDetail(record)
+ this.$refs.technicalStatusEvaluationApprovalModal.handleDetail(record)
}
}
}
diff --git a/src/views/flowable/workflow/FlowCompleted.vue b/src/views/flowable/workflow/FlowCompleted.vue
index 2240529..d664cec 100644
--- a/src/views/flowable/workflow/FlowCompleted.vue
+++ b/src/views/flowable/workflow/FlowCompleted.vue
@@ -39,18 +39,77 @@
</span>
</a-table>
+ <!--涓変繚宸ュ崟-->
<third-maintenance-approval-modal ref="thirdMaintenanceApprovalModal" :selectShenpiData="selectedRowData"/>
+
+ <!--鍋滅敤鐢宠-->
+ <technical-status-deactivate-approval-modal ref="technicalStatusDeactivateApprovalModal"
+ :selectShenpiData="selectedRowData"/>
+
+ <!--鎶�鏈姸鎬侀壌瀹氱敵璇�-->
+ <technical-status-evaluation-application-approval-modal ref="technicalStatusEvaluationApplicationApprovalModal"
+ :selectShenpiData="selectedRowData"/>
+
+ <!--鎶�鏈姸鎬佸彉鏇寸敵璇�-->
+ <technical-status-change-approval-modal ref="technicalStatusChangeApprovalModal"
+ :selectShenpiData="selectedRowData"/>
+
+ <!--鎶�鏈壌瀹氬伐鍗曞彉鏇�-->
+ <technical-status-evaluation-order-change-approval-modal ref="evaluationOrderChangeApprovalModal"
+ :selectShenpiData="selectedRowData"/>
+
+ <!--鎶�鏈壌瀹氬伐鍗�-->
+ <technical-status-evaluation-approval-modal ref="technicalStatusApprovalModal" :selectShenpiData="selectedRowData"/>
+
+ <!--浜屼繚宸ュ崟-->
+ <second-maintenance-approval-modal ref="secondMaintenanceApprovalModal" :selectShenpiData="selectedRowData"/>
+
+ <!--鐐规宸ュ崟-->
+ <inspection-order-handle ref="inspectionOrderHandle" :selectShenpiData="selectedRowData"/>
+
+ <!--缁翠慨宸ュ崟-->
+ <repair-order-approval-modal ref="repairOrderApprovalModal" :selectShenpiData="selectedRowData"/>
+
+ <!--淇濆吇瑙勮寖-->
+ <maintenance-standard-approval-modal ref="maintenanceStandardApprovalModal" :selectShenpiData="selectedRowData"/>
+
+ <!--涓変繚鍙樻洿-->
+ <third-maintenance-order-change-approval-modal ref="thirdMaintenanceOrderChangeApprovalModal"
+ :selectShenpiData="selectedRowData"/>
</a-card>
</template>
<script>
import { JeecgListMixin } from '@/mixins/JeecgListMixin'
import ThirdMaintenanceApprovalModal from './thirdMaintenance/ThirdMaintenanceApprovalModal'
+ import TechnicalStatusDeactivateApprovalModal from './TechnicalStatus/TechnicalStatusDeactivateApprovalModal'
+ import TechnicalStatusEvaluationApplicationApprovalModal
+ from './TechnicalStatusEvaluation/TechnicalStatusEvaluationApplicationApprovalModal'
+ import TechnicalStatusChangeApprovalModal from './TechnicalStatus/TechnicalStatusChangeApprovalModal'
+ import TechnicalStatusEvaluationApprovalModal
+ from './TechnicalStatusEvaluation/TechnicalStatusEvaluationApprovalModal'
+ import TechnicalStatusEvaluationOrderChangeApprovalModal
+ from './TechnicalStatusEvaluation/TechnicalStatusEvaluationOrderChangeApprovalModal'
+ import SecondMaintenanceApprovalModal from './secondMaintenance/SecondMaintenanceApprovalModal'
+ import InspectionOrderHandle from './InspectionOrder/InspectionOrderHandle'
+ import RepairOrderApprovalModal from './repairOrder/RepairOrderApprovalModal'
+ import MaintenanceStandardApprovalModal from './MaintenanceStandard/MaintenanceStandardApprovalModal'
+ import ThirdMaintenanceOrderChangeApprovalModal from './thirdMaintenance/ThirdMaintenanceOrderChangeApprovalModal'
export default {
name: 'FlowCompleted',
mixins: [JeecgListMixin],
components: {
+ ThirdMaintenanceOrderChangeApprovalModal,
+ MaintenanceStandardApprovalModal,
+ RepairOrderApprovalModal,
+ InspectionOrderHandle,
+ SecondMaintenanceApprovalModal,
+ TechnicalStatusEvaluationOrderChangeApprovalModal,
+ TechnicalStatusEvaluationApprovalModal,
+ TechnicalStatusChangeApprovalModal,
+ TechnicalStatusEvaluationApplicationApprovalModal,
+ TechnicalStatusDeactivateApprovalModal,
ThirdMaintenanceApprovalModal
},
data() {
@@ -116,19 +175,41 @@
},
methods: {
handleDetail(record) {
- console.log('鐐瑰嚮浜嗚鎯�')
- console.log('record----->', record)
let processType = this.splitProcessType(record.category)
console.log('processType--->', processType)
switch (processType) {
+ case 'third_maintenance':
+ this.handleThirdMaintenance(record)
+ break
+ case 'TECHNICAL_STATUS_DEACTIVATE_PROCESS':
+ this.handleTechnicalStatusDeactivate(record)
+ break
+ case 'TECHNICAL_STATUS_EVALUATION_APPLY_PROCESS':
+ this.handleTechnicalStatusEvaluationApply(record)
+ break
+ case 'TECHNICAL_STATUS_CHANGE_PROCESS':
+ this.handleTechnicalStatusChange(record)
+ break
+ case 'EVALUATION_ORDER_CHANGE_PROCESS':
+ this.handleEvaluationOrderChange(record)
+ break
+ case 'TECHNICAL_STATUS_EVALUATION':
+ this.handleTechnicalStatusEvaluation(record)
+ break
+ case 'second_maintenance':
+ this.handleSecondMaintenance(record)
+ break
case 'sbdjApproval':
this.handInspectionOrder(record)
break
- case 'eam_repair':
+ case 'eam_repair_order':
this.handleRepairOrder(record)
break
- case 'third_maintenance':
- this.handleThirdMaintenance(record)
+ case 'maintenance_standard':
+ this.handleMaintenanceStandard(record)
+ break
+ case 'third_maintenance_change':
+ this.handleThirdMaintenanceOrderChange(record)
break
default:
alert('娌℃壘鍒拌娴佺▼')
@@ -148,44 +229,123 @@
},
/**
- * 鐐瑰嚮鐐规娴佺▼璇︽儏鏃惰Е鍙�
+ * 鐐瑰嚮鍋滅敤鍔犲伐璁惧鐢宠鍒嗙被娴佺▼瀹℃壒鏃惰Е鍙�
* @param record
*/
- handInspectionOrder(record) {
- console.log('record----->', record)
- this.selectInspectionOrderXqData = Object.assign({}, record)
- const { todoUsers_dictText, procInsId, description, taskName } = this.selectInspectionOrderXqData
- this.selectInspectionOrderXqData.assignee_dictText = todoUsers_dictText
- this.selectInspectionOrderXqData.procInstId = procInsId
- this.selectInspectionOrderXqData.processInstanceId = procInsId
- this.selectInspectionOrderXqData.title = description
- this.$refs.modalFormInspectionOrderXq.visible = true
- this.$refs.modalFormInspectionOrderXq.title = taskName
- this.$refs.modalFormInspectionOrderXq.disableSubmit = true
- this.$refs.modalFormInspectionOrderXq.getAllApproveData({
- ...record,
- procInstId: procInsId,
- processInstanceId: procInsId
- })
- this.$refs.modalFormInspectionOrderXq.getBasicInformation(record)
+ handleTechnicalStatusDeactivate(record) {
+ this.selectedRowData = Object.assign({}, record)
+ this.$refs.technicalStatusDeactivateApprovalModal.visible = true
+ this.$refs.technicalStatusDeactivateApprovalModal.title = record.name
+ this.$refs.technicalStatusDeactivateApprovalModal.disableSubmit = true
+ this.$refs.technicalStatusDeactivateApprovalModal.handleApprove(record)
},
/**
- * 鐐瑰嚮璁惧缁翠慨鍒嗙被娴佺▼璇︽儏鏃惰Е鍙�
+ * 鐐瑰嚮鎶�鏈姸鎬侀壌瀹氱敵璇峰垎绫绘祦绋嬪鎵规椂瑙﹀彂
+ * @param record
+ */
+ handleTechnicalStatusEvaluationApply(record) {
+ this.selectedRowData = Object.assign({}, record)
+ this.$refs.technicalStatusEvaluationApplicationApprovalModal.visible = true
+ this.$refs.technicalStatusEvaluationApplicationApprovalModal.title = record.name
+ this.$refs.technicalStatusEvaluationApplicationApprovalModal.disableSubmit = true
+ this.$refs.technicalStatusEvaluationApplicationApprovalModal.handleApprove(record)
+ },
+
+ /**
+ * 鐐瑰嚮鎶�鏈姸鎬佸彉鏇村垎绫绘祦绋嬪鎵规椂瑙﹀彂
+ * @param record
+ */
+ handleTechnicalStatusChange(record) {
+ this.selectedRowData = Object.assign({}, record)
+ this.$refs.technicalStatusChangeApprovalModal.visible = true
+ this.$refs.technicalStatusChangeApprovalModal.title = record.name
+ this.$refs.technicalStatusChangeApprovalModal.disableSubmit = true
+ this.$refs.technicalStatusChangeApprovalModal.handleApprove(record)
+ },
+
+ /**
+ * 鐐瑰嚮鎶�鏈壌瀹氬伐鍗曞彉鏇存祦绋嬫墽琛屽鎵规椂瑙﹀彂
+ * @param record
+ */
+ handleEvaluationOrderChange(record) {
+ this.selectedRowData = Object.assign({}, record)
+ this.$refs.evaluationOrderChangeApprovalModal.visible = true
+ this.$refs.evaluationOrderChangeApprovalModal.title = record.name
+ this.$refs.evaluationOrderChangeApprovalModal.disableSubmit = true
+ this.$refs.evaluationOrderChangeApprovalModal.handleApprove(record)
+ },
+
+ /**
+ * 鐐瑰嚮鎶�鏈姸鎬侀壌瀹氭祦绋嬫墽琛屽鎵规椂瑙﹀彂
+ * @param record
+ */
+ handleTechnicalStatusEvaluation(record) {
+ this.selectedRowData = Object.assign({}, record)
+ this.$refs.technicalStatusApprovalModal.visible = true
+ this.$refs.technicalStatusApprovalModal.title = record.name
+ this.$refs.technicalStatusApprovalModal.disableSubmit = true
+ this.$refs.technicalStatusApprovalModal.handleApprove(record)
+ },
+
+ /**
+ * 鐐瑰嚮浜屼繚娴佺▼鎵ц瀹℃壒鏃惰Е鍙�
+ * @param record
+ */
+ handleSecondMaintenance(record) {
+ this.selectedRowData = Object.assign({}, record)
+ this.$refs.secondMaintenanceApprovalModal.visible = true
+ this.$refs.secondMaintenanceApprovalModal.title = record.name
+ this.$refs.secondMaintenanceApprovalModal.disableSubmit = true
+ this.$refs.secondMaintenanceApprovalModal.handleApprove(record)
+ },
+
+ /**
+ * 鐐瑰嚮鐐规宸ュ崟娴佺▼鎵ц瀹℃壒鏃惰Е鍙�
+ * @param record
+ */
+ handInspectionOrder(record) {
+ this.selectedRowData = Object.assign({}, record)
+ this.$refs.inspectionOrderHandle.visible = true
+ this.$refs.inspectionOrderHandle.title = record.name
+ this.$refs.inspectionOrderHandle.disableSubmit = true
+ this.$refs.inspectionOrderHandle.handleApprove(record)
+ },
+
+ /**
+ * 鐐瑰嚮璁惧缁翠慨鍒嗙被娴佺▼鎵ц瀹℃壒鏃惰Е鍙�
* @param record
*/
handleRepairOrder(record) {
- this.selectRepairOrderData = Object.assign({}, record)
- const { procInsId, taskName } = this.selectRepairOrderData
+ this.selectedRowData = Object.assign({}, record)
this.$refs.repairOrderApprovalModal.visible = true
+ this.$refs.repairOrderApprovalModal.title = record.name
this.$refs.repairOrderApprovalModal.disableSubmit = true
- this.$refs.repairOrderApprovalModal.title = taskName
- this.$refs.modalFormInspectionOrderXq.getAllApproveData({
- ...record,
- procInstId: procInsId,
- processInstanceId: procInsId
- })
- this.$refs.repairOrderApprovalModal.getBasicInformation(record)
+ this.$refs.repairOrderApprovalModal.handleApprove(record)
+ },
+
+ /**
+ * 鐐瑰嚮淇濆吇瑙勮寖鍒嗙被娴佺▼鎵ц瀹℃壒鏃惰Е鍙�
+ * @param record
+ */
+ handleMaintenanceStandard(record) {
+ this.selectedRowData = Object.assign({}, record)
+ this.$refs.maintenanceStandardApprovalModal.visible = true
+ this.$refs.maintenanceStandardApprovalModal.title = record.name
+ this.$refs.maintenanceStandardApprovalModal.disableSubmit = true
+ this.$refs.maintenanceStandardApprovalModal.handleApprove(record)
+ },
+
+ /**
+ * 鐐瑰嚮涓変繚鍙樻洿鍒嗙被娴佺▼瀹℃壒鏃惰Е鍙�
+ * @param record
+ */
+ handleThirdMaintenanceOrderChange(record) {
+ this.selectedRowData = Object.assign({}, record)
+ this.$refs.thirdMaintenanceOrderChangeApprovalModal.visible = true
+ this.$refs.thirdMaintenanceOrderChangeApprovalModal.title = record.name
+ this.$refs.thirdMaintenanceOrderChangeApprovalModal.disableSubmit = true
+ this.$refs.thirdMaintenanceOrderChangeApprovalModal.handleApprove(record)
},
splitProcessType(title) {
diff --git a/src/views/flowable/workflow/FlowTodo.vue b/src/views/flowable/workflow/FlowTodo.vue
index 64c32b7..9ecfc00 100644
--- a/src/views/flowable/workflow/FlowTodo.vue
+++ b/src/views/flowable/workflow/FlowTodo.vue
@@ -120,6 +120,11 @@
<technical-status-deactivate-approval-modal ref="technicalStatusDeactivateApprovalModal"
:selectShenpiData="selectedRowData"
@modalFormOk="modalFormOk"/>
+
+ <!--涓変繚鍙樻洿-->
+ <third-maintenance-order-change-approval-modal ref="thirdMaintenanceOrderChangeApprovalModal"
+ :selectShenpiData="selectedRowData"
+ @modalFormOk="modalFormOk"/>
</a-card>
</template>
@@ -139,11 +144,13 @@
import TechnicalStatusEvaluationApplicationApprovalModal
from './TechnicalStatusEvaluation/TechnicalStatusEvaluationApplicationApprovalModal'
import TechnicalStatusDeactivateApprovalModal from './TechnicalStatus/TechnicalStatusDeactivateApprovalModal'
+ import ThirdMaintenanceOrderChangeApprovalModal from './thirdMaintenance/ThirdMaintenanceOrderChangeApprovalModal'
export default {
name: 'FlowTodo',
mixins: [JeecgListMixin],
components: {
+ ThirdMaintenanceOrderChangeApprovalModal,
TechnicalStatusDeactivateApprovalModal,
TechnicalStatusEvaluationApplicationApprovalModal,
TechnicalStatusChangeApprovalModal,
@@ -266,6 +273,9 @@
case 'TECHNICAL_STATUS_DEACTIVATE_PROCESS':
this.handleTechnicalStatusDeactivate(record)
break
+ case 'third_maintenance_change':
+ this.handleThirdMaintenanceOrderChange(record)
+ break
default:
alert('娌℃壘鍒拌娴佺▼')
}
@@ -290,9 +300,13 @@
this.selectedRowData = Object.assign({}, record)
this.$refs.technicalStatusApprovalModal.visible = true
this.$refs.technicalStatusApprovalModal.title = record.name
- this.$refs.technicalStatusApprovalModal.handleDetail(record)
+ this.$refs.technicalStatusApprovalModal.handleApprove(record)
},
+ /**
+ * 鐐瑰嚮鎶�鏈壌瀹氬伐鍗曞彉鏇存祦绋嬫墽琛屽鎵规椂瑙﹀彂
+ * @param record
+ */
handleEvaluationOrderChange(record) {
this.selectedRowData = Object.assign({}, record)
this.$refs.evaluationOrderChangeApprovalModal.visible = true
@@ -330,7 +344,7 @@
this.selectedRowData = Object.assign({}, record)
this.$refs.thirdMaintenanceApprovalModal.visible = true
this.$refs.thirdMaintenanceApprovalModal.title = record.name
- this.$refs.thirdMaintenanceApprovalModal.handleDetail(record)
+ this.$refs.thirdMaintenanceApprovalModal.handleApprove(record)
},
/**
@@ -341,7 +355,7 @@
this.selectedRowData = Object.assign({}, record)
this.$refs.repairOrderApprovalModal.visible = true
this.$refs.repairOrderApprovalModal.title = record.name
- this.$refs.repairOrderApprovalModal.handleDetail(record)
+ this.$refs.repairOrderApprovalModal.handleApprove(record)
},
/**
@@ -377,6 +391,17 @@
this.$refs.technicalStatusDeactivateApprovalModal.handleApprove(record)
},
+ /**
+ * 鐐瑰嚮涓変繚鍙樻洿鍒嗙被娴佺▼瀹℃壒鏃惰Е鍙�
+ * @param record
+ */
+ handleThirdMaintenanceOrderChange(record) {
+ this.selectedRowData = Object.assign({}, record)
+ this.$refs.thirdMaintenanceOrderChangeApprovalModal.visible = true
+ this.$refs.thirdMaintenanceOrderChangeApprovalModal.title = record.name
+ this.$refs.thirdMaintenanceOrderChangeApprovalModal.handleApprove(record)
+ },
+
batchHandle() {
const categorySet = new Set(this.selectionRows.map(item => item.category))
const nameSet = new Set(this.selectionRows.map(item => item.name))
diff --git a/src/views/flowable/workflow/TechnicalStatusEvaluation/TechnicalStatusEvaluationApplicationApprovalModal.vue b/src/views/flowable/workflow/TechnicalStatusEvaluation/TechnicalStatusEvaluationApplicationApprovalModal.vue
index 8fbf118..c1a2bb3 100644
--- a/src/views/flowable/workflow/TechnicalStatusEvaluation/TechnicalStatusEvaluationApplicationApprovalModal.vue
+++ b/src/views/flowable/workflow/TechnicalStatusEvaluation/TechnicalStatusEvaluationApplicationApprovalModal.vue
@@ -6,7 +6,7 @@
<a-form-model ref="form" :model="model" :rules="validatorRules" :labelCol="labelCol" :wrapperCol="wrapperCol">
<a-row id="outer-row" :gutter="24">
<!--宸︿晶鍩虹淇℃伅鍒�-->
- <a-col :span="!disableSubmit?8:14" class="scroll-col">
+ <a-col :span="selectShenpiData.procInstId?8:14" class="scroll-col">
<a-tabs>
<a-tab-pane tab="鍩虹淇℃伅">
<a-row>
@@ -21,11 +21,6 @@
@autocompleteForm="autocompleteForm" disabled/>
</a-form-model-item>
</a-col>
- </a-row>
-
- <a-row>
-
-
</a-row>
<a-row>
@@ -68,7 +63,7 @@
</a-col>
<!--鍙充晶瀹℃壒鍒�-->
- <a-col :span="!disableSubmit?6:10" class="scroll-col">
+ <a-col :span="selectShenpiData.procInstId?6:10" class="scroll-col">
<a-tabs v-if="displayDepartHeaderFlag">
<a-tab-pane tab="浣跨敤鍗曚綅瀹ょ骇棰嗗纭">
<a-row>
diff --git a/src/views/flowable/workflow/TechnicalStatusEvaluation/TechnicalStatusEvaluationApprovalModal.vue b/src/views/flowable/workflow/TechnicalStatusEvaluation/TechnicalStatusEvaluationApprovalModal.vue
index 20a3606..984eca6 100644
--- a/src/views/flowable/workflow/TechnicalStatusEvaluation/TechnicalStatusEvaluationApprovalModal.vue
+++ b/src/views/flowable/workflow/TechnicalStatusEvaluation/TechnicalStatusEvaluationApprovalModal.vue
@@ -525,7 +525,7 @@
* 涓婚〉闈㈢偣鍑绘墽琛屽鎵规椂瑙﹀彂
* @param record 涓婚〉闈㈠垪琛ㄨ璁板綍
*/
- async handleDetail(record) {
+ async handleApprove(record) {
this.model = {}
this.detail.safetyEquipmentCheckList = this.detail.precisionCheckList = this.detail.otherCheckList = []
this.handleTabToFirstTable()
@@ -537,7 +537,7 @@
* 涓婚〉闈㈢偣鍑昏鎯呮椂瑙﹀彂
* @param record 涓婚〉闈㈠垪琛ㄨ璁板綍
*/
- recordDetail(record) {
+ handleDetail(record) {
this.detail.safetyEquipmentCheckList = this.detail.precisionCheckList = this.detail.otherCheckList = []
this.model = Object.assign({}, record)
this.handleTabToFirstTable()
diff --git a/src/views/flowable/workflow/repairOrder/RepairOrderApprovalModal.vue b/src/views/flowable/workflow/repairOrder/RepairOrderApprovalModal.vue
index 57590e6..6c5ade3 100644
--- a/src/views/flowable/workflow/repairOrder/RepairOrderApprovalModal.vue
+++ b/src/views/flowable/workflow/repairOrder/RepairOrderApprovalModal.vue
@@ -10,6 +10,16 @@
<a-tab-pane tab="鍩虹淇℃伅">
<a-row>
<a-col :span="12">
+ <a-form-model-item label="缁熶竴缂栫爜" :labelCol="labelCol" :wrapperCol="wrapperCol">
+ <lx-search-equipment-select v-model="model.equipmentId" disabled/>
+ </a-form-model-item>
+ </a-col>
+ <a-col :span="12">
+ <a-form-model-item label="宸ュ崟鍙�" :labelCol="labelCol" :wrapperCol="wrapperCol">
+ <a-input v-model="model.repairCode" readOnly/>
+ </a-form-model-item>
+ </a-col>
+ <a-col :span="12">
<a-form-model-item label="缁翠慨寮�濮嬫椂闂�" :labelCol="labelCol" :wrapperCol="wrapperCol">
<a-input v-model="model.actualStartTime" readOnly/>
</a-form-model-item>
@@ -188,7 +198,7 @@
* 涓婚〉闈㈢偣鍑绘墽琛屽鎵规椂瑙﹀彂
* @param record 涓婚〉闈㈠垪琛ㄨ璁板綍
*/
- async handleDetail(record) {
+ async handleApprove(record) {
this.spinning = true
this.activeTabKey = '1'
this.model = {}
@@ -201,7 +211,7 @@
* 涓婚〉闈㈢偣鍑昏鎯呮椂瑙﹀彂
* @param record 涓婚〉闈㈠垪琛ㄨ璁板綍
*/
- recordDetail(record) {
+ handleDetail(record) {
this.spinning = true
this.activeTabKey = '1'
this.model = Object.assign({}, record)
diff --git a/src/views/flowable/workflow/secondMaintenance/SecondMaintenanceApprovalModal.vue b/src/views/flowable/workflow/secondMaintenance/SecondMaintenanceApprovalModal.vue
index cf5982c..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,7 +148,7 @@
<a-button
v-if="activeTabKey!=='3'"
:disabled="disableSubmit ||
- (model.maintenanceStatus&&model.maintenanceStatus!='UNDER_MAINTENANCE') ||
+ (model.maintenanceStatus&&model.maintenanceStatus!=='UNDER_MAINTENANCE') ||
(activeTabKey==='1'&&selectedOperatorMaintenanceRowKeys.length === 0)||
(activeTabKey==='2'&&selectedRepairerMaintenanceRowKeys.length === 0)"
slot="tabBarExtraContent"
@@ -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>
@@ -499,7 +499,7 @@
handleTabToFirstTable() {
this.$nextTick(() => {
console.log('taskDefKey', this.selectShenpiData.taskDefKey)
- if ((this.selectShenpiData.taskDefKey && this.selectShenpiData.taskDefKey === 'operator_task') || !this.selectShenpiData.taskDefKey) this.activeTabKey = 1
+ 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
})
},
diff --git a/src/views/flowable/workflow/thirdMaintenance/ThirdMaintenanceApprovalModal.vue b/src/views/flowable/workflow/thirdMaintenance/ThirdMaintenanceApprovalModal.vue
index 930726f..99e165f 100644
--- a/src/views/flowable/workflow/thirdMaintenance/ThirdMaintenanceApprovalModal.vue
+++ b/src/views/flowable/workflow/thirdMaintenance/ThirdMaintenanceApprovalModal.vue
@@ -382,7 +382,7 @@
* 涓婚〉闈㈢偣鍑绘墽琛屽鎵规椂瑙﹀彂
* @param record 涓婚〉闈㈠垪琛ㄨ璁板綍
*/
- async handleDetail(record) {
+ async handleApprove(record) {
this.model = {}
this.detail.dataSource = []
this.getBasicInformationByApi(record)
@@ -393,7 +393,7 @@
* 涓婚〉闈㈢偣鍑昏鎯呮椂瑙﹀彂
* @param record 涓婚〉闈㈠垪琛ㄨ璁板綍
*/
- recordDetail(record) {
+ handleDetail(record) {
this.spinning = true
this.detail.dataSource = []
this.model = Object.assign({
--
Gitblit v1.9.3