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/FlowCompleted.vue | 75 ++++++++++++++++---------------------
1 files changed, 32 insertions(+), 43 deletions(-)
diff --git a/src/views/flowable/workflow/FlowCompleted.vue b/src/views/flowable/workflow/FlowCompleted.vue
index 61e49f9..0038b4a 100644
--- a/src/views/flowable/workflow/FlowCompleted.vue
+++ b/src/views/flowable/workflow/FlowCompleted.vue
@@ -144,11 +144,6 @@
:selectShenpiData="selectLossBoundOrderData"
@searchReset="searchReset"
></loss-bound-handle>
-
- <equipment-lean-out-approval-modal
- ref='equipmentLeanOutApprovalModelRef'
- @searchReset='searchReset'
- />
<equipment-seal-up-approval-modal
ref='equipmentSealUpApprovalModelRef'
@searchReset='searchReset'
@@ -166,15 +161,15 @@
@searchReset='searchReset'
:selectSparePartApplyData='selectSparePartApplyData'
></spare-part-apply-handle>
- <equipment-return-approval-modal
- ref='equipmentReturnApprovalModelRef'
+ <equipment-lean-out-and-return-approval-modal
+ ref='EquipmentLeanOutAndReturnApprovalModalRef'
@searchReset='searchReset'
/>
- <inbound-order-handle
+ <inbound-order-handle-xq
ref='inboundOrderApprovalModal'
:selectInboundOrderData='selectInboundOrderData'
@searchReset='searchReset'
- ></inbound-order-handle>
+ ></inbound-order-handle-xq>
<second-maintenance-approval-modal
ref='secondMaintenanceApprovalModal'
:selectShenpiData='selectSecondMaintenanceData'
@@ -185,11 +180,11 @@
:selectShenpiData='selectThirdMaintenanceData'
@searchReset='searchReset'
></third-maintenance-approval-modal>
- <guide-card-batch-handle
- ref='guideCardBatchHandle'
+ <guide-card-batch-xq
+ ref='GuideCardBatchXq'
:selectShenpiData='selectGuideCardData'
@searchReset='searchReset'
- ></guide-card-batch-handle>
+ ></guide-card-batch-xq>
</a-card>
</template>
@@ -207,16 +202,15 @@
import OutBoundOrderHandle from '@views/flowable/workflow/outBoundOrder/OutBoundOrderHandle.vue'
import lossBoundHandle from '@views/flowable/workflow/lossBound/lossBoundHandle.vue'
import stocktakingBoundHandle from '@views/flowable/workflow/stocktakingBound/stocktakingBoundHandle.vue'
-import EquipmentLeanOutApprovalModal from '@views/flowable/workflow/leanOut/EquipmentLeanOutApprovalModal.vue'
import EquipmentSealUpApprovalModal from '@views/flowable/workflow/sealUp/EquipmentSealUpApprovalModal.vue'
import EquipmentTransferApprovalModal from '@views/flowable/workflow/transfer/EquipmentTransferApprovalModal.vue'
import EquipmentScrapApprovalModal from '@views/flowable/workflow/scrap/EquipmentScrapApprovalModal.vue'
import SparePartApplyHandle from '@views/flowable/workflow/sparePartApply/SparePartApplyHandle.vue'
-import EquipmentReturnApprovalModal from '@views/flowable/workflow/leanOut/EquipmentReturnApprovalModal.vue'
-import GuideCardBatchHandle from '@views/flowable/workflow/guideCardBatch/GuideCardBatchHandle.vue'
+import EquipmentLeanOutAndReturnApprovalModal from '@views/flowable/workflow/leanOut/EquipmentLeanOutAndReturnApprovalModal.vue'
+import GuideCardBatchXq from '@views/flowable/workflow/guideCardBatch/GuideCardBatchXq.vue'
import SecondMaintenanceApprovalModal from '@views/flowable/workflow/secondMaintenance/SecondMaintenanceApprovalModal.vue'
import ThirdMaintenanceApprovalModal from '@views/flowable/workflow/thirdMaintenance/ThirdMaintenanceApprovalModal.vue'
-import InboundOrderHandle from '@views/flowable/workflow/inboundOrder/InboundOrderHandle.vue'
+import InboundOrderHandleXq from '@views/flowable/workflow/inboundOrder/InboundOrderHandleXq.vue'
export default {
name: 'NcDeviceCharactersList',
@@ -231,16 +225,15 @@
InspectionOrderHandle,
JDictSelectTag,
OutBoundOrderHandle,
- EquipmentLeanOutApprovalModal,
EquipmentSealUpApprovalModal,
EquipmentTransferApprovalModal,
EquipmentScrapApprovalModal,
SparePartApplyHandle,
- EquipmentReturnApprovalModal,
+ EquipmentLeanOutAndReturnApprovalModal,
SecondMaintenanceApprovalModal,
ThirdMaintenanceApprovalModal,
- InboundOrderHandle,
- GuideCardBatchHandle
+ InboundOrderHandleXq,
+ GuideCardBatchXq
},
data() {
@@ -279,7 +272,7 @@
{
title: '娴佺▼鍙戣捣浜哄悕绉�',
align: 'center',
- dataIndex: 'startUserName',
+ dataIndex: 'proposer_dictText',
width: 250
},
{
@@ -373,9 +366,6 @@
case 'equipment_unseal':
this.handleEquipmentUnSeal(item)
break
- case 'equipment_lean_out':
- this.handleEquipmentLeanOut(item)
- break
case 'equipment_transfer':
this.handleEquipmentTransfer(item)
break
@@ -385,8 +375,9 @@
case 'spare_part_apply':
this.handleSparePartApplyApproval(item)
break
+ case 'equipment_lean_out':
case 'equipment_return':
- this.handleEquipmentReturn(item)
+ this.handleEquipmentLeanOutAndReturn(item)
break
case 'toolInStorageApproval':
this.handleToolInStorage(item)
@@ -411,18 +402,18 @@
return result
},
- handleEquipmentReturn(item) {
- this.$refs.equipmentReturnApprovalModelRef.visible = true
- this.$refs.equipmentReturnApprovalModelRef.title = item.name
- this.$refs.equipmentReturnApprovalModelRef.handleDetail(item)
- this.$refs.equipmentReturnApprovalModelRef.disableSubmit = true
+ handleEquipmentLeanOutAndReturn(item) {
+ this.$refs.EquipmentLeanOutAndReturnApprovalModalRef.visible = true
+ this.$refs.EquipmentLeanOutAndReturnApprovalModalRef.title = item.name
+ this.$refs.EquipmentLeanOutAndReturnApprovalModalRef.handleDetail(item)
+ this.$refs.EquipmentLeanOutAndReturnApprovalModalRef.disableSubmit = true
},
handleToolInStorage(item) {
- if (item && item.dataId) {
- this.selectInboundOrderData = Object.assign({}, item)
- this.$refs.inboundOrderApprovalModal.auditVisible = true
- this.$refs.inboundOrderApprovalModal.getAllApproveData(item)
- }
+ console.log('item----->', item)
+ this.selectInboundOrderData = item
+ this.selectGuideCardData.title = item.description
+ this.$refs.inboundOrderApprovalModal.clearTableSource()
+ this.$refs.inboundOrderApprovalModal.getAllApproveData(item)
},
handleSecondMaintenance(item) {
if (item && item.dataId) {
@@ -444,8 +435,12 @@
handleGuideCardApproval(item) {
console.log('item----->', item)
this.selectGuideCardData = item
- this.$refs.guideCardBatchHandle.clearTableSource()
- this.$refs.guideCardBatchHandle.getAllApproveData(item)
+ this.selectGuideCardData.assignee_dictText = item.todoUsers_dictText
+ this.selectGuideCardData.procInstId = item.procInsId
+ this.selectGuideCardData.processInstanceId = item.procInsId
+ this.selectGuideCardData.title = item.description
+ this.$refs.GuideCardBatchXq.clearTableSource()
+ this.$refs.GuideCardBatchXq.getAllApproveData(item)
},
handDrDetial(item) {
this.selectShenpiData = item
@@ -541,12 +536,6 @@
this.$refs.lossBoundHandle.clearTableSource()
this.$refs.lossBoundHandle.getAllApproveData(item)
- },
- handleEquipmentLeanOut(item) {
- this.$refs.equipmentLeanOutApprovalModelRef.visible = false
- this.$refs.equipmentLeanOutApprovalModelRef.disableSubmit = true
- this.$refs.equipmentLeanOutApprovalModelRef.handleDetail(item)
- this.$refs.equipmentLeanOutApprovalModelRef.title = item.name
},
handleEquipmentSealUp(item) {
this.$refs.equipmentSealUpApprovalModelRef.visible = true
--
Gitblit v1.9.3