From a22a69946912221dab4d32987dda6c4c8ba3c5d8 Mon Sep 17 00:00:00 2001
From: cuilei <ray_tsu1@163.com>
Date: 星期二, 24 六月 2025 17:43:24 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/master'
---
src/views/flowable/workflow/FlowTodo.vue | 34 ++++++++++++++++++++++++++--------
1 files changed, 26 insertions(+), 8 deletions(-)
diff --git a/src/views/flowable/workflow/FlowTodo.vue b/src/views/flowable/workflow/FlowTodo.vue
index 1e8d371..e70779b 100644
--- a/src/views/flowable/workflow/FlowTodo.vue
+++ b/src/views/flowable/workflow/FlowTodo.vue
@@ -280,6 +280,11 @@
:selectShenpiData='selectGuideCardData'
@searchReset='searchReset'
></guide-card-batch-handle>
+ <AssignEquipmentFileStreamHandle
+ ref='assignEquipmentFileStreamHandle'
+ :selectShenpiData='selectEquipmentSealUpData'
+ @searchReset='searchReset'
+ ></AssignEquipmentFileStreamHandle>
</a-card>
</template>
@@ -292,7 +297,6 @@
import WeekMaintenanceApprovalModal from '@views/flowable/workflow/weekMaintenance/WeekMaintenanceApprovalModal'
import RepairOrderApprovalModal from '@views/flowable/workflow/repairOrder/RepairOrderApprovalModal'
import InspectionOrderHandle from '@views/flowable/workflow/InspectionOrder/InspectionOrderHandle.vue'
-
import { getAction } from '@api/manage'
import InspectionOrderBatchHandle from './InspectionOrder/InspectionOrderBatchHandle'
import WeekMaintenanceBatchApprovalModal from './weekMaintenance/WeekMaintenanceBatchApprovalModal'
@@ -300,10 +304,10 @@
import DispatchFileHandle from '@views/flowable/workflow/dispatchFile/DispatchFileHandle.vue'
import DispatchFileBachHandleStyle from '@views/flowable/workflow/dispatchFile/DispatchFileBachHandleStyle#Drawer.vue'
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 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'
@@ -339,7 +343,8 @@
EquipmentScrapApprovalModal,
SparePartApplyHandle,
StandardizedProcessHandle,
- GuideCardBatchHandle
+ GuideCardBatchHandle,
+ AssignEquipmentFileStreamHandle
},
data() {
return {
@@ -428,6 +433,8 @@
selectInboundOrderData: {},
selectSparePartApplyData: {},
selectGuideCardData:{},
+ selectEquipmentAssignProductData:{},
+ selectEquipmentSealUpData:{},
//涓氬姟淇℃伅ID
dataId: undefined
}
@@ -490,7 +497,7 @@
case 'ggApproval':
this.handDispatchFileDetial(item)
break
- case 'standardized_approval':
+ case 'ncFileSettingProcessApproval':
this.handStandardizedDetial(item)
break
case 'sbdjApproval':
@@ -538,6 +545,9 @@
case 'programConfirmApproval':
this.handleGuideCardApproval(item)
break
+ case 'equipmentAssignProductApproval':
+ this.handleEquipmentAssignProductApproval(item)
+ break
default:
alert('娌℃壘鍒拌娴佺▼')
}
@@ -578,20 +588,20 @@
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)
},
- //瀹氬瀷瀹℃壒椤甸潰
+ //DNC-瀹氬瀷瀹℃壒椤甸潰
handStandardizedDetial(item){
this.selectDispatchFileXqData = item
this.$refs.StandardizedProcessHandle.clearTableSource()
@@ -708,12 +718,20 @@
this.$refs.sparePartApplyModal.getAllApproveData(item)
}
},
+ //DNC-绋嬪簭纭琛ㄦ祦绋�
handleGuideCardApproval(item) {
console.log('item----->', item)
this.selectGuideCardData = item
this.$refs.guideCardBatchHandle.clearTableSource()
this.$refs.guideCardBatchHandle.getAllApproveData(item)
},
+ //DNC-璁惧缁撴瀯鏍戞寚娲句骇鍝佺粨鏋勬爲
+ handleEquipmentAssignProductApproval(item){
+ console.log('item----->', item)
+ this.selectEquipmentSealUpData = item
+ this.$refs.assignEquipmentFileStreamHandle.clearTableSource()
+ this.$refs.assignEquipmentFileStreamHandle.getAllApproveData(item)
+ }
}
}
</script>
--
Gitblit v1.9.3