From 5546db8dd730b8b6be737021b607be417a3b63fb Mon Sep 17 00:00:00 2001
From: cuikaidong <ckd2942379034@163.com>
Date: 星期一, 26 五月 2025 17:43:47 +0800
Subject: [PATCH] 设备归属功能增加
---
src/views/flowable/workflow/FlowTodo.vue | 38 ++++++++++++++++++++++++++++++++------
1 files changed, 32 insertions(+), 6 deletions(-)
diff --git a/src/views/flowable/workflow/FlowTodo.vue b/src/views/flowable/workflow/FlowTodo.vue
index 34c75f5..9d49b55 100644
--- a/src/views/flowable/workflow/FlowTodo.vue
+++ b/src/views/flowable/workflow/FlowTodo.vue
@@ -121,8 +121,7 @@
<loss-bound-handle ref="lossBoundHandle" :selectShenpiData="selectLossBoundOrderData"
@searchReset="searchReset"></loss-bound-handle>
-<!-- <loss-bound-handle ref="lossBoundHandle" :selectShenpiData="selectLossBoundOrderData"-->
-<!-- @searchReset="searchReset"></loss-bound-handle>-->
+
<!--鎵归噺澶勭悊-->
<inspection-order-batch-handle ref="inspectionOrderBatchHandleRef" @searchReset="searchReset"
:taskList="selectionRows" />
@@ -137,6 +136,9 @@
<third-maintenance-approval-modal ref="thirdMaintenanceApprovalModal" :selectShenpiData="selectThirdMaintenanceData"
@searchReset="searchReset"></third-maintenance-approval-modal>
<equipment-seal-up-approval-modal ref="equipmentSealUpApprovalModelRef" @searchReset="searchReset" />
+ <inbound-order-handle ref="inboundOrderApprovalModal" :selectInboundOrderData="selectInboundOrderData"
+ @searchReset="searchReset"></inbound-order-handle>
+ <equipment-transfer-approval-modal ref="equipmentTransferApprovalModelRef" @searchReset="searchReset" />
</a-card>
</template>
@@ -158,12 +160,13 @@
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 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'
+import EquipmentTransferApprovalModal from '@views/flowable/workflow/transfer/EquipmentTransferApprovalModal.vue'
import stocktakingBoundHandle from '@views/flowable/workflow/stocktakingBound/stocktakingBoundHandle.vue'
import lossBoundHandle from '@views/flowable/workflow/lossBound/lossBoundHandle.vue'
+import InboundOrderHandle from '@views/flowable/workflow/inboundOrder/InboundOrderHandle.vue'
export default {
name: 'NcDeviceCharactersList',
@@ -184,7 +187,9 @@
SecondMaintenanceApprovalModal,
ThirdMaintenanceApprovalModal,
OutBoundOrderHandle,
- EquipmentSealUpApprovalModal
+ EquipmentSealUpApprovalModal,
+ InboundOrderHandle,
+ EquipmentTransferApprovalModal
},
data() {
return {
@@ -269,6 +274,7 @@
selectOutBoundOrderData: {},
selectLossBoundOrderData: {},
selectStocktakingBoundOrderData: {},
+ selectInboundOrderData:{},
//涓氬姟淇℃伅ID
dataId: undefined
}
@@ -360,6 +366,12 @@
break
case 'equipment_seal_up':
this.handleEquipmentSealUp(item)
+ break
+ case 'toolInStorageApproval':
+ this.handleToolInStorage(item)
+ break
+ case 'equipment_transfer':
+ this.handleEquipmentTransfer(item)
break
default:
alert('娌℃壘鍒拌娴佺▼')
@@ -496,7 +508,21 @@
this.$refs.equipmentSealUpApprovalModelRef.title = item.name
this.$refs.equipmentSealUpApprovalModelRef.handleDetail(item)
this.$refs.equipmentSealUpApprovalModelRef.disableSubmit = false
- }
+ },
+ handleToolInStorage(item) {
+ if (item && item.dataId) {
+ this.selectInboundOrderData = Object.assign({}, item)
+ this.$refs.inboundOrderApprovalModal.auditVisible = true
+ this.$refs.inboundOrderApprovalModal.clearTableSource()
+ this.$refs.inboundOrderApprovalModal.getAllApproveData(item)
+ }
+ },
+ handleEquipmentTransfer(item) {
+ this.$refs.equipmentTransferApprovalModelRef.visible = true
+ this.$refs.equipmentTransferApprovalModelRef.title = item.name
+ this.$refs.equipmentTransferApprovalModelRef.handleDetail(item)
+ this.$refs.equipmentTransferApprovalModelRef.disableSubmit = false
+ },
}
}
</script>
--
Gitblit v1.9.3