From 61a19a514eed8796ee2c6e7ab1111addf053cf67 Mon Sep 17 00:00:00 2001 From: lyh <925863403@qq.com> Date: 星期三, 28 五月 2025 15:46:18 +0800 Subject: [PATCH] 1.新增NC文件批次页签 2.批次页签新增 数控加工确认表按钮,点击按钮出现对应批次确认表 3.处理修改查询电子样板与NC文件查询页面处理文件名折叠问题 --- src/views/flowable/workflow/FlowTodo.vue | 18 +++++++++++++++--- 1 files changed, 15 insertions(+), 3 deletions(-) diff --git a/src/views/flowable/workflow/FlowTodo.vue b/src/views/flowable/workflow/FlowTodo.vue index 4a2f84c..c8f36b2 100644 --- a/src/views/flowable/workflow/FlowTodo.vue +++ b/src/views/flowable/workflow/FlowTodo.vue @@ -126,6 +126,7 @@ @searchReset="searchReset"></second-maintenance-approval-modal> <third-maintenance-approval-modal ref="thirdMaintenanceApprovalModal" :selectShenpiData="selectThirdMaintenanceData" @searchReset="searchReset"></third-maintenance-approval-modal> + <equipment-seal-up-approval-modal ref="equipmentSealUpApprovalModelRef" @searchReset="searchReset"/> </a-card> </template> @@ -149,7 +150,7 @@ import EquipmentLeanOutApprovalModal from '@views/flowable/workflow/leanOut/EquipmentLeanOutApprovalModal.vue' import SecondMaintenanceApprovalModal from '@views/flowable/workflow/secondMaintenance/SecondMaintenanceApprovalModal.vue' import ThirdMaintenanceApprovalModal from '@views/flowable/workflow/thirdMaintenance/ThirdMaintenanceApprovalModal.vue' - + import EquipmentSealUpApprovalModal from '@views/flowable/workflow/sealUp/EquipmentSealUpApprovalModal.vue' export default { name: 'NcDeviceCharactersList', mixins: [JeecgListMixin, mixinDevice], @@ -166,7 +167,8 @@ EquipmentLeanOutApprovalModal, SecondMaintenanceApprovalModal, ThirdMaintenanceApprovalModal, - OutBoundOrderHandle + OutBoundOrderHandle, + EquipmentSealUpApprovalModal, }, data() { return { @@ -332,6 +334,9 @@ case 'toolOutStorageApproval': this.handleToolOutStorageApproval(item) break + case 'equipment_seal_up': + this.handleEquipmentSealUp(item) + break default: alert('娌℃壘鍒拌娴佺▼') } @@ -441,10 +446,17 @@ handleToolOutStorageApproval(item) { if (item && item.dataId) { this.selectOutBoundOrderData = Object.assign({}, item) + this.$refs.outBoundOrderHandle.auditVisible = true this.$refs.outBoundOrderHandle.clearTableSource() this.$refs.outBoundOrderHandle.getAllApproveData(item) } - } + }, + handleEquipmentSealUp(item) { + this.$refs.equipmentSealUpApprovalModelRef.visible = true + this.$refs.equipmentSealUpApprovalModelRef.title = item.name + this.$refs.equipmentSealUpApprovalModelRef.handleDetail(item) + this.$refs.equipmentSealUpApprovalModelRef.disableSubmit = false + }, } } </script> -- Gitblit v1.9.3