From b903759eab59a5f4ad35af0985da12d42d419ec0 Mon Sep 17 00:00:00 2001
From: zhaowei <zhaowei>
Date: 星期四, 10 四月 2025 10:46:14 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/master'
---
src/views/flowable/workflow/FlowTodo.vue | 27 ++++++++++++++++++++-------
1 files changed, 20 insertions(+), 7 deletions(-)
diff --git a/src/views/flowable/workflow/FlowTodo.vue b/src/views/flowable/workflow/FlowTodo.vue
index 510cacd..42b5430 100644
--- a/src/views/flowable/workflow/FlowTodo.vue
+++ b/src/views/flowable/workflow/FlowTodo.vue
@@ -105,7 +105,8 @@
<DispatchFileBachHandleStyle ref="modalFormDispatchFileBatch" @searchReset="searchReset" @ok="modalFormOk"></DispatchFileBachHandleStyle>
<InspectionOrderHandle ref="modalFormInspectionOrder" :selectShenpiData="selectInspectionOrderData" @searchReset="searchReset"></InspectionOrderHandle>
<InspectionOrderHandleBzz ref="modalFormInspectionOrderBzz" :selectShenpiData="selectInspectionOrderDataBzz" @searchReset="searchReset"></InspectionOrderHandleBzz>
- <week-maintenance-approval-modal ref = "weekMaintenanceApprovalModal" :maintenanceId="dataId"></week-maintenance-approval-modal>
+ <week-maintenance-approval-modal ref = "weekMaintenanceApprovalModal" ></week-maintenance-approval-modal>
+ <repair-order-approval-modal ref="repairOrderApprovalModal" :selectShenpiData="selectRepairOrderData" ></repair-order-approval-modal>
</a-card>
</template>
@@ -118,9 +119,10 @@
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 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 InspectionOrderHandleBzz from '@views/flowable/workflow/InspectionOrder/InspectionOrderHandleBzz.vue'
-import WeekMaintenanceApprovalModal from '@views/flowable/workflow/weekMaintenance/WeekMaintenanceApprovalModal';
import { getAction } from '@api/manage'
export default {
@@ -131,9 +133,10 @@
JDictSelectTag,
DispatchFileHandle,
DispatchFileBachHandleStyle,
+ WeekMaintenanceApprovalModal,
+ RepairOrderApprovalModal,
InspectionOrderHandle,
InspectionOrderHandleBzz,
- WeekMaintenanceApprovalModal
},
data () {
return {
@@ -211,6 +214,7 @@
selectInspectionOrderData:{},
selectInspectionOrderDataBzz:{},
selectBachData:{},
+ selectRepairOrderData: {},
//涓氬姟淇℃伅ID
dataId: undefined,
}
@@ -241,6 +245,9 @@
break
case 'WEEK_MAINTENANCE':
this.handleWeekMaintenance(item)
+ break
+ case 'eam_repair':
+ this.handleRepairOrder(item)
break
default:
alert('娌℃壘鍒拌娴佺▼')
@@ -308,10 +315,16 @@
}
},
handleWeekMaintenance(item) {
- this.dataId = item.dataId;
- this.$refs.weekMaintenanceApprovalModal.add()
- this.$refs.weekMaintenanceApprovalModal.title = item.preNode;
- this.$refs.weekMaintenanceApprovalModal.disableSubmit = false;
+ if(item && item.dataId) {
+ this.$refs.weekMaintenanceApprovalModal.handleDetail(item.dataId)
+ this.$refs.weekMaintenanceApprovalModal.title = item.name;
+ this.$refs.weekMaintenanceApprovalModal.disableSubmit = false;
+ }
+ },
+ handleRepairOrder(item) {
+ this.selectRepairOrderData = item
+ this.$refs.repairOrderApprovalModal.clearTableSource()
+ this.$refs.repairOrderApprovalModal.getAllApproveData(item)
}
}
}
--
Gitblit v1.9.3