From 9219b0c4d7aecd6347a120ae0923ee5a6a25da05 Mon Sep 17 00:00:00 2001 From: zhaowei <zhaowei> Date: 星期三, 23 四月 2025 10:34:18 +0800 Subject: [PATCH] 1、我的待办页面 设备维修 分类审批弹窗功能逻辑开发并复用至我的已办和维修工单页面 2、根据会议内容调整系统功能 3、调整设备铭牌打印高度 --- src/views/flowable/workflow/FlowCompleted.vue | 28 +++++++++++++++++++++++++++- 1 files changed, 27 insertions(+), 1 deletions(-) diff --git a/src/views/flowable/workflow/FlowCompleted.vue b/src/views/flowable/workflow/FlowCompleted.vue index 21cf990..deccb7b 100644 --- a/src/views/flowable/workflow/FlowCompleted.vue +++ b/src/views/flowable/workflow/FlowCompleted.vue @@ -82,6 +82,8 @@ <inspection-order-handle ref="modalFormInspectionOrderXq" :selectShenpiData="selectInspectionOrderXqData"/> <week-maintenance-approval-modal ref="weekMaintenanceApprovalModal" :selectShenpiData="selectWeekMaintenanceData"/> + + <repair-order-approval-modal ref="repairOrderApprovalModal" :selectShenpiData="selectRepairOrderData"/> </a-card> </template> @@ -93,11 +95,13 @@ import JDictSelectTag from '@/components/dict/JDictSelectTag.vue' import InspectionOrderHandle from './InspectionOrder/InspectionOrderHandle' import WeekMaintenanceApprovalModal from './weekMaintenance/WeekMaintenanceApprovalModal' + import RepairOrderApprovalModal from './repairOrder/RepairOrderApprovalModal' export default { name: 'NcDeviceCharactersList', mixins: [JeecgListMixin, mixinDevice], components: { + RepairOrderApprovalModal, WeekMaintenanceApprovalModal, InspectionOrderHandle, JDictSelectTag @@ -167,7 +171,8 @@ }, dictOptions: {}, selectWeekMaintenanceData: {}, - selectInspectionOrderXqData: {} + selectInspectionOrderXqData: {}, + selectRepairOrderData: {} } }, created() { @@ -190,6 +195,9 @@ break case 'WEEK_MAINTENANCE': this.handleWeekMaintenance(item) + break + case 'eam_repair': + this.handleRepairOrder(item) break default: alert('娌℃壘鍒拌娴佺▼') @@ -226,6 +234,24 @@ processInstanceId: procInsId }) this.$refs.modalFormInspectionOrderXq.getBasicInformation(record) + }, + + /** + * 鐐瑰嚮璁惧缁翠慨鍒嗙被娴佺▼璇︽儏鏃惰Е鍙� + * @param record + */ + handleRepairOrder(record) { + this.selectRepairOrderData = Object.assign({}, record) + const { procInsId, taskName } = this.selectRepairOrderData + this.$refs.repairOrderApprovalModal.visible = true + this.$refs.repairOrderApprovalModal.disableSubmit = true + this.$refs.repairOrderApprovalModal.title = taskName + this.$refs.modalFormInspectionOrderXq.getAllApproveData({ + ...record, + procInstId: procInsId, + processInstanceId: procInsId + }) + this.$refs.repairOrderApprovalModal.getBasicInformation(record) } } } -- Gitblit v1.9.3