From 31d62d0ac0bf6fdcb200ffeaa7b4e15aaf2d4946 Mon Sep 17 00:00:00 2001 From: zhaowei <zhaowei> Date: 星期五, 25 七月 2025 16:40:47 +0800 Subject: [PATCH] Merge remote-tracking branch 'origin/master' --- src/views/flowable/workflow/FlowTodo.vue | 42 ++++++++++++++++++++++++++++++++++++++++++ 1 files changed, 42 insertions(+), 0 deletions(-) diff --git a/src/views/flowable/workflow/FlowTodo.vue b/src/views/flowable/workflow/FlowTodo.vue index 9ecfc00..8b57b8f 100644 --- a/src/views/flowable/workflow/FlowTodo.vue +++ b/src/views/flowable/workflow/FlowTodo.vue @@ -125,6 +125,16 @@ <third-maintenance-order-change-approval-modal ref="thirdMaintenanceOrderChangeApprovalModal" :selectShenpiData="selectedRowData" @modalFormOk="modalFormOk"/> + + <!--鐪熺┖鐑鐞嗙倝涓変繚--> + <third-maintenance-furnace-approval-modal ref="thirdMaintenanceFurnaceApprovalModal" + :selectShenpiData="selectedRowData" + @modalFormOk="modalFormOk"/> + + <!--璁惧浜嬫晠鐧昏--> + <report-accidents-register-approval-modal ref="reportAccidentsRegisterApprovalModal" + :selectShenpiData="selectedRowData" + @modalFormOk="modalFormOk"/> </a-card> </template> @@ -145,11 +155,15 @@ from './TechnicalStatusEvaluation/TechnicalStatusEvaluationApplicationApprovalModal' import TechnicalStatusDeactivateApprovalModal from './TechnicalStatus/TechnicalStatusDeactivateApprovalModal' import ThirdMaintenanceOrderChangeApprovalModal from './thirdMaintenance/ThirdMaintenanceOrderChangeApprovalModal' + import ThirdMaintenanceFurnaceApprovalModal from './thirdMaintenance/ThirdMaintenanceFurnaceApprovalModal' + import ReportAccidentsRegisterApprovalModal from './repairOrder/ReportAccidentsRegisterApprovalModal' export default { name: 'FlowTodo', mixins: [JeecgListMixin], components: { + ReportAccidentsRegisterApprovalModal, + ThirdMaintenanceFurnaceApprovalModal, ThirdMaintenanceOrderChangeApprovalModal, TechnicalStatusDeactivateApprovalModal, TechnicalStatusEvaluationApplicationApprovalModal, @@ -276,6 +290,12 @@ case 'third_maintenance_change': this.handleThirdMaintenanceOrderChange(record) break + case 'third_maintenance_furnace_process': + this.handleThirdMaintenanceFurnace(record) + break + case 'eam_report_accidents_register': + this.handleAccidentsRegister(record) + break default: alert('娌℃壘鍒拌娴佺▼') } @@ -402,6 +422,28 @@ this.$refs.thirdMaintenanceOrderChangeApprovalModal.handleApprove(record) }, + /** + * 鐐瑰嚮鐪熺┖鐑鐞嗙倝涓変繚宸ュ崟娴佺▼鎵ц瀹℃壒鏃惰Е鍙� + * @param record + */ + handleThirdMaintenanceFurnace(record) { + this.selectedRowData = Object.assign({}, record) + this.$refs.thirdMaintenanceFurnaceApprovalModal.visible = true + this.$refs.thirdMaintenanceFurnaceApprovalModal.title = record.name + this.$refs.thirdMaintenanceFurnaceApprovalModal.handleApprove(record) + }, + + /** + * 鐐瑰嚮璁惧浜嬫晠鐧昏娴佺▼鎵ц瀹℃壒鏃惰Е鍙� + * @param record + */ + handleAccidentsRegister(record) { + this.selectedRowData = Object.assign({}, record) + this.$refs.reportAccidentsRegisterApprovalModal.visible = true + this.$refs.reportAccidentsRegisterApprovalModal.title = record.name + this.$refs.reportAccidentsRegisterApprovalModal.handleApprove(record) + }, + batchHandle() { const categorySet = new Set(this.selectionRows.map(item => item.category)) const nameSet = new Set(this.selectionRows.map(item => item.name)) -- Gitblit v1.9.3