From d2547913ef2e150d8bb18bc8f7423515c7ed71d0 Mon Sep 17 00:00:00 2001 From: zhaowei <zhaowei> Date: 星期五, 25 四月 2025 14:04:29 +0800 Subject: [PATCH] 1、调整设备台账铭牌二维码大小 2、待机停机页面功能开发 --- src/views/flowable/workflow/FlowCompleted.vue | 44 ++++++++++++++++++++++++++++++++++++++------ 1 files changed, 38 insertions(+), 6 deletions(-) diff --git a/src/views/flowable/workflow/FlowCompleted.vue b/src/views/flowable/workflow/FlowCompleted.vue index c851a89..deccb7b 100644 --- a/src/views/flowable/workflow/FlowCompleted.vue +++ b/src/views/flowable/workflow/FlowCompleted.vue @@ -27,7 +27,7 @@ <a-col :xl="6" :lg="7" :md="8" :sm="24"> <span style="float: left;overflow: hidden;" class="table-page-search-submitButtons"> <a-button type="primary" @click="searchQuery" icon="search">鏌ヨ</a-button> - <a-button type="primary" @click="searchReset" icon="reload" style="margin-left: 8px">閲嶇疆</a-button> + <a-button @click="searchReset" icon="reload" style="margin-left: 8px">閲嶇疆</a-button> </span> </a-col> </a-row> @@ -80,6 +80,10 @@ </div> <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> @@ -90,11 +94,15 @@ import { JeecgListMixin } from '@/mixins/JeecgListMixin' 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 }, @@ -162,9 +170,9 @@ list: '/assign/flow/finishedList' }, dictOptions: {}, - selectShenpiData: {}, - selectDispatchFileXqData: {}, - selectInspectionOrderXqData: {} + selectWeekMaintenanceData: {}, + selectInspectionOrderXqData: {}, + selectRepairOrderData: {} } }, created() { @@ -188,6 +196,9 @@ case 'WEEK_MAINTENANCE': this.handleWeekMaintenance(item) break + case 'eam_repair': + this.handleRepairOrder(item) + break default: alert('娌℃壘鍒拌娴佺▼') } @@ -199,8 +210,11 @@ return result }, - handleWeekMaintenance() { - + handleWeekMaintenance(record) { + this.selectWeekMaintenanceData = Object.assign({}, record) + this.$refs.weekMaintenanceApprovalModal.handleDetail(record) + this.$refs.weekMaintenanceApprovalModal.title = '璇︽儏' + this.$refs.weekMaintenanceApprovalModal.disableSubmit = true }, handInspectionOrder(record) { @@ -220,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