From bb72d5ca5485a3d5a5c6ad629cf7447c60a6a30a Mon Sep 17 00:00:00 2001
From: cuikaidong <ckd2942379034@163.com>
Date: 星期五, 23 五月 2025 09:09:46 +0800
Subject: [PATCH] 合并处理
---
src/views/flowable/workflow/FlowTodo.vue | 32 +++++++++++++++++++++++++++++---
1 files changed, 29 insertions(+), 3 deletions(-)
diff --git a/src/views/flowable/workflow/FlowTodo.vue b/src/views/flowable/workflow/FlowTodo.vue
index c488506..c8f36b2 100644
--- a/src/views/flowable/workflow/FlowTodo.vue
+++ b/src/views/flowable/workflow/FlowTodo.vue
@@ -111,6 +111,8 @@
@searchReset="searchReset"></week-maintenance-approval-modal>
<repair-order-approval-modal ref="repairOrderApprovalModal" @searchReset="searchReset"
:selectShenpiData="selectRepairOrderData"></repair-order-approval-modal>
+ <out-bound-order-handle ref="outBoundOrderHandle" :selectShenpiData="selectOutBoundOrderData"
+ @searchReset="searchReset"></out-bound-order-handle>
<!--鎵归噺澶勭悊-->
<inspection-order-batch-handle ref="inspectionOrderBatchHandleRef" @searchReset="searchReset"
@@ -124,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>
@@ -143,11 +146,11 @@
import AssignFileStreamHandle from '@views/flowable/workflow/assignFileStream/AssignFileStreamHandle.vue'
import DispatchFileHandle from '@views/flowable/workflow/dispatchFile/DispatchFileHandle.vue'
import DispatchFileBachHandleStyle from '@views/flowable/workflow/dispatchFile/DispatchFileBachHandleStyle#Drawer.vue'
-
+ import OutBoundOrderHandle from '@views/flowable/workflow/outBoundOrder/OutBoundOrderHandle.vue'
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],
@@ -163,7 +166,9 @@
InspectionOrderHandle,
EquipmentLeanOutApprovalModal,
SecondMaintenanceApprovalModal,
- ThirdMaintenanceApprovalModal
+ ThirdMaintenanceApprovalModal,
+ OutBoundOrderHandle,
+ EquipmentSealUpApprovalModal,
},
data() {
return {
@@ -245,6 +250,7 @@
selectThirdMaintenanceData: {},
selectBachData: {},
selectRepairOrderData: {},
+ selectOutBoundOrderData: {},
//涓氬姟淇℃伅ID
dataId: undefined
}
@@ -324,6 +330,12 @@
break
case 'third_maintenance':
this.handleThirdMaintenance(item)
+ break
+ case 'toolOutStorageApproval':
+ this.handleToolOutStorageApproval(item)
+ break
+ case 'equipment_seal_up':
+ this.handleEquipmentSealUp(item)
break
default:
alert('娌℃壘鍒拌娴佺▼')
@@ -431,6 +443,20 @@
this.$refs.thirdMaintenanceApprovalModal.disableSubmit = false
}
},
+ 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