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 | 139 ++++++++++++++++++++++++++++++++++++++++------
1 files changed, 120 insertions(+), 19 deletions(-)
diff --git a/src/views/flowable/workflow/FlowCompleted.vue b/src/views/flowable/workflow/FlowCompleted.vue
index f6dbded..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'
@@ -161,6 +156,35 @@
ref='equipmentScrapApprovalModelRef'
@searchReset='searchReset'
/>
+ <spare-part-apply-handle
+ ref='sparePartApplyModal'
+ @searchReset='searchReset'
+ :selectSparePartApplyData='selectSparePartApplyData'
+ ></spare-part-apply-handle>
+ <equipment-lean-out-and-return-approval-modal
+ ref='EquipmentLeanOutAndReturnApprovalModalRef'
+ @searchReset='searchReset'
+ />
+ <inbound-order-handle-xq
+ ref='inboundOrderApprovalModal'
+ :selectInboundOrderData='selectInboundOrderData'
+ @searchReset='searchReset'
+ ></inbound-order-handle-xq>
+ <second-maintenance-approval-modal
+ ref='secondMaintenanceApprovalModal'
+ :selectShenpiData='selectSecondMaintenanceData'
+ @searchReset='searchReset'
+ ></second-maintenance-approval-modal>
+ <third-maintenance-approval-modal
+ ref='thirdMaintenanceApprovalModal'
+ :selectShenpiData='selectThirdMaintenanceData'
+ @searchReset='searchReset'
+ ></third-maintenance-approval-modal>
+ <guide-card-batch-xq
+ ref='GuideCardBatchXq'
+ :selectShenpiData='selectGuideCardData'
+ @searchReset='searchReset'
+ ></guide-card-batch-xq>
</a-card>
</template>
@@ -178,10 +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 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 InboundOrderHandleXq from '@views/flowable/workflow/inboundOrder/InboundOrderHandleXq.vue'
export default {
name: 'NcDeviceCharactersList',
@@ -196,10 +225,16 @@
InspectionOrderHandle,
JDictSelectTag,
OutBoundOrderHandle,
- EquipmentLeanOutApprovalModal,
EquipmentSealUpApprovalModal,
EquipmentTransferApprovalModal,
- EquipmentScrapApprovalModal
+ EquipmentScrapApprovalModal,
+ SparePartApplyHandle,
+ EquipmentLeanOutAndReturnApprovalModal,
+ SecondMaintenanceApprovalModal,
+ ThirdMaintenanceApprovalModal,
+ InboundOrderHandleXq,
+ GuideCardBatchXq
+
},
data() {
return {
@@ -237,7 +272,7 @@
{
title: '娴佺▼鍙戣捣浜哄悕绉�',
align: 'center',
- dataIndex: 'startUserName',
+ dataIndex: 'proposer_dictText',
width: 250
},
{
@@ -273,10 +308,16 @@
selectOutBoundOrderData: {},
selectLossBoundOrderData: {},
selectStocktakingBoundOrderData: {},
+ selectSparePartApplyData: {},
// selectEquipmentLeanOutData: {},
// selectEquipmentSealUpData: {},
// selectEquipmentTransferData: {},
// selectEquipmentScrapData: {},
+ selectSecondMaintenanceData: {},
+ selectThirdMaintenanceData: {},
+ selectInboundOrderData: {},
+ selectGuideCardData: {},
+
}
},
@@ -313,7 +354,7 @@
case 'toolOutStorageApproval':
this.handleToolOutStorageApproval(item)
break
- case 'toolsStocktakingBound':
+ case 'toolsStocktakingBoundApproval':
this.handleToolStocktakingApproval(item)
break
case 'toolsLossApproval':
@@ -325,14 +366,30 @@
case 'equipment_unseal':
this.handleEquipmentUnSeal(item)
break
- case 'equipment_lean_out':
- this.handleEquipmentLeanOut(item)
- break
case 'equipment_transfer':
this.handleEquipmentTransfer(item)
break
case 'equipment_scrap':
this.handleEquipmentScrap(item)
+ break
+ case 'spare_part_apply':
+ this.handleSparePartApplyApproval(item)
+ break
+ case 'equipment_lean_out':
+ case 'equipment_return':
+ this.handleEquipmentLeanOutAndReturn(item)
+ break
+ case 'toolInStorageApproval':
+ this.handleToolInStorage(item)
+ break
+ case 'second_maintenance':
+ this.handleSecondMaintenance(item)
+ break
+ case 'third_maintenance':
+ this.handleThirdMaintenance(item)
+ break
+ case 'programConfirmApproval':
+ this.handleGuideCardApproval(item)
break
default:
alert('娌℃壘鍒拌娴佺▼')
@@ -343,6 +400,47 @@
let parts = title.split('锛�') // 娉ㄦ剰鍐掑彿鏄叏瑙掑瓧绗︼紝浣跨敤瀵瑰簲鐨勫瓧杩涜鍒嗗壊
let result = parts[0]
return result
+ },
+
+ 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) {
+ 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) {
+ this.selectSecondMaintenanceData = Object.assign({}, item)
+ this.$refs.secondMaintenanceApprovalModal.handleDetail(item)
+ this.$refs.secondMaintenanceApprovalModal.title = item.name
+ this.$refs.secondMaintenanceApprovalModal.disableSubmit = true
+ }
+ },
+ handleThirdMaintenance(item) {
+ if (item && item.dataId) {
+ this.selectThirdMaintenanceData = Object.assign({}, item)
+ this.$refs.thirdMaintenanceApprovalModal.handleDetail(item)
+ this.$refs.thirdMaintenanceApprovalModal.title = item.name
+ this.$refs.thirdMaintenanceApprovalModal.disableSubmit = true
+ }
+ },
+ //DNC-绋嬪簭纭琛ㄦ祦绋�
+ handleGuideCardApproval(item) {
+ console.log('item----->', item)
+ this.selectGuideCardData = 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
@@ -439,12 +537,6 @@
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
this.$refs.equipmentSealUpApprovalModelRef.title = item.name
@@ -469,6 +561,15 @@
this.$refs.equipmentScrapApprovalModelRef.handleDetail(item)
this.$refs.equipmentScrapApprovalModelRef.disableSubmit = true
},
+ handleSparePartApplyApproval(item) {
+ this.selectSparePartApplyData = Object.assign({}, item)
+ item.procInstId = item.procInsId
+ item.processInstanceId = item.procInsId
+ this.selectSparePartApplyData.assignee_dictText = item.todoUsers_dictText
+ this.$refs.sparePartApplyModal.auditVisible = false
+ this.$refs.sparePartApplyModal.clearTableSource()
+ this.$refs.sparePartApplyModal.getAllApproveData(item)
+ },
}
}
</script>
--
Gitblit v1.9.3