From 3abdf1e1c92438d8e2986b0a2cf89a1d83477d43 Mon Sep 17 00:00:00 2001
From: cuilei <ray_tsu1@163.com>
Date: 星期二, 17 六月 2025 16:21:16 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/master'
---
src/views/flowable/workflow/FlowTodo.vue | 19 ++++++++++++++++++-
1 files changed, 18 insertions(+), 1 deletions(-)
diff --git a/src/views/flowable/workflow/FlowTodo.vue b/src/views/flowable/workflow/FlowTodo.vue
index e40a1fd..1e8d371 100644
--- a/src/views/flowable/workflow/FlowTodo.vue
+++ b/src/views/flowable/workflow/FlowTodo.vue
@@ -275,6 +275,11 @@
:selectSparePartApplyData='selectSparePartApplyData'
@searchReset='searchReset'
></spare-part-apply-handle>
+ <guide-card-batch-handle
+ ref='guideCardBatchHandle'
+ :selectShenpiData='selectGuideCardData'
+ @searchReset='searchReset'
+ ></guide-card-batch-handle>
</a-card>
</template>
@@ -294,6 +299,7 @@
import AssignFileStreamHandle from '@views/flowable/workflow/assignFileStream/AssignFileStreamHandle.vue'
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 OutBoundOrderHandle from '@views/flowable/workflow/outBoundOrder/OutBoundOrderHandle.vue'
import EquipmentLeanOutApprovalModal from '@views/flowable/workflow/leanOut/EquipmentLeanOutApprovalModal.vue'
import SecondMaintenanceApprovalModal
@@ -332,7 +338,8 @@
EquipmentTransferApprovalModal,
EquipmentScrapApprovalModal,
SparePartApplyHandle,
- StandardizedProcessHandle
+ StandardizedProcessHandle,
+ GuideCardBatchHandle
},
data() {
return {
@@ -420,6 +427,7 @@
selectStocktakingBoundOrderData: {},
selectInboundOrderData: {},
selectSparePartApplyData: {},
+ selectGuideCardData:{},
//涓氬姟淇℃伅ID
dataId: undefined
}
@@ -526,6 +534,9 @@
break
case 'spare_part_apply':
this.handleSparePartApplyApproval(item)
+ break
+ case 'programConfirmApproval':
+ this.handleGuideCardApproval(item)
break
default:
alert('娌℃壘鍒拌娴佺▼')
@@ -697,6 +708,12 @@
this.$refs.sparePartApplyModal.getAllApproveData(item)
}
},
+ handleGuideCardApproval(item) {
+ console.log('item----->', item)
+ this.selectGuideCardData = item
+ this.$refs.guideCardBatchHandle.clearTableSource()
+ this.$refs.guideCardBatchHandle.getAllApproveData(item)
+ },
}
}
</script>
--
Gitblit v1.9.3