From 8905bdd0a74c4bd6cabc206c36a299341488041e Mon Sep 17 00:00:00 2001
From: zhaowei <zhaowei>
Date: 星期四, 11 九月 2025 11:00:26 +0800
Subject: [PATCH] 合并设备借出与归还流程，增加借出归还列表详情功能
---
src/views/flowable/workflow/FlowTodo.vue | 84 ++++++++++++++++++++++++++++++-----------
1 files changed, 61 insertions(+), 23 deletions(-)
diff --git a/src/views/flowable/workflow/FlowTodo.vue b/src/views/flowable/workflow/FlowTodo.vue
index 76b8b69..e952e41 100644
--- a/src/views/flowable/workflow/FlowTodo.vue
+++ b/src/views/flowable/workflow/FlowTodo.vue
@@ -238,8 +238,8 @@
:taskList='selectionRows'
@searchReset='searchReset'
/>
- <equipment-lean-out-approval-modal
- ref='equipmentLeanOutApprovalModelRef'
+ <equipment-lean-out-and-return-approval-modal
+ ref='equipmentLeanOutAndReturnModalRef'
@searchReset='searchReset'
/>
@@ -306,7 +306,7 @@
import GuideCardBatchHandle from '@views/flowable/workflow/guideCardBatch/GuideCardBatchHandle.vue'
import AssignEquipmentFileStreamHandle from '@views/flowable/workflow/assignEquipmentFileStream/AssignEquipmentFileStreamHandle.vue'
import OutBoundOrderHandle from '@views/flowable/workflow/outBoundOrder/OutBoundOrderHandle.vue'
-import EquipmentLeanOutApprovalModal from '@views/flowable/workflow/leanOut/EquipmentLeanOutApprovalModal.vue'
+import EquipmentLeanOutAndReturnApprovalModal from '@views/flowable/workflow/leanOut/EquipmentLeanOutAndReturnApprovalModal.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'
@@ -333,7 +333,7 @@
WeekMaintenanceApprovalModal,
RepairOrderApprovalModal,
InspectionOrderHandle,
- EquipmentLeanOutApprovalModal,
+ EquipmentLeanOutAndReturnApprovalModal,
SecondMaintenanceApprovalModal,
ThirdMaintenanceApprovalModal,
OutBoundOrderHandle,
@@ -365,7 +365,7 @@
title: '娴佺▼鍒嗙被',
align: 'center',
dataIndex: 'category_dictText',
- width: 100
+ width: 200
},
{
title: '娴佺▼鍚嶇О',
@@ -391,13 +391,13 @@
title: '鍓嶉┍鑺傜偣',
align: 'center',
dataIndex: 'preNode',
- width: 200
+ width: 250
},
{
title: '褰撳墠鑺傜偣',
align: 'center',
dataIndex: 'name',
- width: 200
+ width: 250
},
{
title: '褰撳墠鑺傜偣寮�濮嬫椂闂�',
@@ -432,9 +432,9 @@
selectStocktakingBoundOrderData: {},
selectInboundOrderData: {},
selectSparePartApplyData: {},
- selectGuideCardData:{},
- selectEquipmentAssignProductData:{},
- selectEquipmentSealUpData:{},
+ selectGuideCardData: {},
+ selectEquipmentAssignProductData: {},
+ selectEquipmentSealUpData: {},
//涓氬姟淇℃伅ID
dataId: undefined
}
@@ -497,7 +497,7 @@
case 'ggApproval':
this.handDispatchFileDetial(item)
break
- case 'standardized_approval':
+ case 'ncFileSettingProcessApproval':
this.handStandardizedDetial(item)
break
case 'sbdjApproval':
@@ -510,7 +510,8 @@
this.handleRepairOrder(item)
break
case 'equipment_lean_out':
- this.handleEquipmentLeanOut(item)
+ case 'equipment_return':
+ this.handleEquipmentLeanOutAndReturn(item)
break
case 'second_maintenance':
this.handleSecondMaintenance(item)
@@ -521,7 +522,7 @@
case 'toolOutStorageApproval':
this.handleToolOutStorageApproval(item)
break
- case 'toolsStocktakingBound':
+ case 'toolsStocktakingBoundApproval':
this.handleToolStocktakingApproval(item)
break
case 'toolsLossApproval':
@@ -529,6 +530,9 @@
break
case 'equipment_seal_up':
this.handleEquipmentSealUp(item)
+ break
+ case 'equipment_unseal':
+ this.handleEquipmentUnSeal(item)
break
case 'toolInStorageApproval':
this.handleToolInStorage(item)
@@ -580,6 +584,26 @@
} else if (categorySet.has('WEEK_MAINTENANCE')) {
this.$refs.weenMaintenanceBatchApprovalModalRef.handleDetail(this.selectionRows[0])
this.$refs.weenMaintenanceBatchApprovalModalRef.title = this.selectionRows[0].name
+ } else if (categorySet.has('ggApproval')) {
+ let ids = ''
+ for (let a = 0; a < this.selectedRowKeys.length; a++) {
+ ids += this.selectedRowKeys[a] + ','
+ }
+ getAction(this.url.isSameNode + '?taskIds=' + ids).then((res) => {
+ if (res.success) {
+ let taskDefKey = res.result
+ this.selectBachData.taskIds = ids
+ this.selectBachData.taskDefKey = taskDefKey
+ this.$refs.modalFormDispatchFileBatch.title = '鎵归噺澶勭悊'
+ this.$refs.modalFormDispatchFileBatch.edit(this.selectBachData)
+ this.$refs.modalFormDispatchFileBatch.disableSubmit = false
+ } else {
+ this.$notification.warning({
+ message: '娑堟伅',
+ description: res.message
+ })
+ }
+ })
}
},
@@ -588,21 +612,21 @@
let result = parts[0]
return result
},
-
+ //DNC-鎸囨淳NC绋嬪簭鑷宠澶�
handDrDetial(item) {
this.selectShenpiData = item
this.$refs.modalFormApproval.clearTableSource()
this.$refs.modalFormApproval.getAllApproveData(item)
},
-
+ //DNC-NC绋嬪簭绛炬淳
handDispatchFileDetial(item) {
console.log('item----->', item)
this.selectDispatchFileXqData = item
this.$refs.modalFormDispatchFileXq.clearTableSource()
this.$refs.modalFormDispatchFileXq.getAllApproveData(item)
},
- //瀹氬瀷瀹℃壒椤甸潰
- handStandardizedDetial(item){
+ //DNC-瀹氬瀷瀹℃壒椤甸潰
+ handStandardizedDetial(item) {
this.selectDispatchFileXqData = item
this.$refs.StandardizedProcessHandle.clearTableSource()
this.$refs.StandardizedProcessHandle.getAllApproveData(item)
@@ -637,12 +661,18 @@
this.$refs.repairOrderApprovalModal.getAllApproveData(record)
this.$refs.repairOrderApprovalModal.getBasicInformation(record)
},
- handleEquipmentLeanOut(item) {
- this.$refs.equipmentLeanOutApprovalModelRef.visible = true
- this.$refs.equipmentLeanOutApprovalModelRef.title = item.name
- this.$refs.equipmentLeanOutApprovalModelRef.handleDetail(item)
- this.$refs.equipmentLeanOutApprovalModelRef.disableSubmit = false
+
+ /**
+ * 璁惧鍊熷嚭涓庡綊杩�
+ * @param item
+ */
+ handleEquipmentLeanOutAndReturn(item) {
+ this.$refs.equipmentLeanOutAndReturnModalRef.visible = true
+ this.$refs.equipmentLeanOutAndReturnModalRef.title = item.name
+ this.$refs.equipmentLeanOutAndReturnModalRef.handleDetail(item)
+ this.$refs.equipmentLeanOutAndReturnModalRef.disableSubmit = false
},
+
handleSecondMaintenance(item) {
if (item && item.dataId) {
this.selectSecondMaintenanceData = Object.assign({}, item)
@@ -690,6 +720,13 @@
this.$refs.equipmentSealUpApprovalModelRef.handleDetail(item)
this.$refs.equipmentSealUpApprovalModelRef.disableSubmit = false
},
+
+ handleEquipmentUnSeal(item) {
+ this.$refs.equipmentSealUpApprovalModelRef.visible = true
+ 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)
@@ -712,6 +749,7 @@
},
handleSparePartApplyApproval(item) {
if (item && item.dataId) {
+ debugger
this.selectSparePartApplyData = Object.assign({}, item)
this.$refs.sparePartApplyModal.auditVisible = true
this.$refs.sparePartApplyModal.clearTableSource()
@@ -726,7 +764,7 @@
this.$refs.guideCardBatchHandle.getAllApproveData(item)
},
//DNC-璁惧缁撴瀯鏍戞寚娲句骇鍝佺粨鏋勬爲
- handleEquipmentAssignProductApproval(item){
+ handleEquipmentAssignProductApproval(item) {
console.log('item----->', item)
this.selectEquipmentSealUpData = item
this.$refs.assignEquipmentFileStreamHandle.clearTableSource()
--
Gitblit v1.9.3