From 1b8b8bafca4fe4c3556bda5e66e3ff6252bd7acc Mon Sep 17 00:00:00 2001
From: cuilei <ray_tsu1@163.com>
Date: 星期一, 16 六月 2025 14:27:32 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/master'
---
src/views/flowable/workflow/FlowTodo.vue | 18 +++++++++++++++++-
1 files changed, 17 insertions(+), 1 deletions(-)
diff --git a/src/views/flowable/workflow/FlowTodo.vue b/src/views/flowable/workflow/FlowTodo.vue
index dede3fd..e40a1fd 100644
--- a/src/views/flowable/workflow/FlowTodo.vue
+++ b/src/views/flowable/workflow/FlowTodo.vue
@@ -183,6 +183,11 @@
:selectShenpiData='selectDispatchFileXqData'
@searchReset='searchReset'
></DispatchFileHandle>
+ <StandardizedProcessHandle
+ ref='StandardizedProcessHandle'
+ :selectShenpiData='selectDispatchFileXqData'
+ @searchReset='searchReset'
+ ></StandardizedProcessHandle>
<DispatchFileBachHandleStyle
ref='modalFormDispatchFileBatch'
@ok='modalFormOk'
@@ -301,6 +306,7 @@
import lossBoundHandle from '@views/flowable/workflow/lossBound/lossBoundHandle.vue'
import InboundOrderHandle from '@views/flowable/workflow/inboundOrder/InboundOrderHandle.vue'
import SparePartApplyHandle from '@views/flowable/workflow/sparePartApply/SparePartApplyHandle.vue'
+import StandardizedProcessHandle from '@views/flowable/workflow/standardizedProcess/StandardizedProcessHandle.vue'
export default {
name: 'NcDeviceCharactersList',
@@ -325,7 +331,8 @@
InboundOrderHandle,
EquipmentTransferApprovalModal,
EquipmentScrapApprovalModal,
- SparePartApplyHandle
+ SparePartApplyHandle,
+ StandardizedProcessHandle
},
data() {
return {
@@ -475,6 +482,9 @@
case 'ggApproval':
this.handDispatchFileDetial(item)
break
+ case 'standardized_approval':
+ this.handStandardizedDetial(item)
+ break
case 'sbdjApproval':
this.handInspectionOrder(item)
break
@@ -570,6 +580,12 @@
this.$refs.modalFormDispatchFileXq.clearTableSource()
this.$refs.modalFormDispatchFileXq.getAllApproveData(item)
},
+ //瀹氬瀷瀹℃壒椤甸潰
+ handStandardizedDetial(item){
+ this.selectDispatchFileXqData = item
+ this.$refs.StandardizedProcessHandle.clearTableSource()
+ this.$refs.StandardizedProcessHandle.getAllApproveData(item)
+ },
handInspectionOrder(record) {
console.log('record----->', record)
--
Gitblit v1.9.3