From 752030a34315629a07810faff9bcd6522c1ebf41 Mon Sep 17 00:00:00 2001
From: cuikaidong <ckd2942379034@163.com>
Date: 星期五, 23 五月 2025 09:08:51 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/master'
---
src/views/flowable/workflow/FlowTodo.vue | 76 +++++++++++++++++++++++++++++++++++++-
1 files changed, 74 insertions(+), 2 deletions(-)
diff --git a/src/views/flowable/workflow/FlowTodo.vue b/src/views/flowable/workflow/FlowTodo.vue
index 758545c..58dd734 100644
--- a/src/views/flowable/workflow/FlowTodo.vue
+++ b/src/views/flowable/workflow/FlowTodo.vue
@@ -111,6 +111,8 @@
@searchReset="searchReset"></week-maintenance-approval-modal>
<repair-order-approval-modal ref="repairOrderApprovalModal" @searchReset="searchReset"
:selectShenpiData="selectRepairOrderData"></repair-order-approval-modal>
+ <out-bound-order-handle ref="outBoundOrderHandle" :selectShenpiData="selectOutBoundOrderData"
+ @searchReset="searchReset"></out-bound-order-handle>
<!--鎵归噺澶勭悊-->
<inspection-order-batch-handle ref="inspectionOrderBatchHandleRef" @searchReset="searchReset"
@@ -118,6 +120,13 @@
<week-maintenance-batch-approval-modal ref="weenMaintenanceBatchApprovalModalRef" @searchReset="searchReset"
:taskList="selectionRows"/>
+ <equipment-lean-out-approval-modal ref="equipmentLeanOutApprovalModelRef" @searchReset="searchReset"/>
+
+ <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>
+ <equipment-seal-up-approval-modal ref="equipmentSealUpApprovalModelRef" @searchReset="searchReset"/>
</a-card>
</template>
@@ -137,7 +146,11 @@
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 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 ThirdMaintenanceApprovalModal from '@views/flowable/workflow/thirdMaintenance/ThirdMaintenanceApprovalModal.vue'
+ import EquipmentSealUpApprovalModal from '@views/flowable/workflow/sealUp/EquipmentSealUpApprovalModal.vue'
export default {
name: 'NcDeviceCharactersList',
mixins: [JeecgListMixin, mixinDevice],
@@ -150,7 +163,12 @@
JDictSelectTag,
WeekMaintenanceApprovalModal,
RepairOrderApprovalModal,
- InspectionOrderHandle
+ InspectionOrderHandle,
+ EquipmentLeanOutApprovalModal,
+ SecondMaintenanceApprovalModal,
+ ThirdMaintenanceApprovalModal,
+ OutBoundOrderHandle,
+ EquipmentSealUpApprovalModal,
},
data() {
return {
@@ -228,8 +246,11 @@
selectDispatchFileXqData:{},
selectInspectionOrderData: {},
selectWeekMaintenanceData: {},
+ selectSecondMaintenanceData: {},
+ selectThirdMaintenanceData: {},
selectBachData: {},
selectRepairOrderData: {},
+ selectOutBoundOrderData: {},
//涓氬姟淇℃伅ID
dataId: undefined
}
@@ -300,6 +321,21 @@
break
case 'eam_repair':
this.handleRepairOrder(item)
+ break
+ case 'equipment_lean_out':
+ this.handleEquipmentLeanOut(item)
+ break
+ case 'second_maintenance':
+ this.handleSecondMaintenance(item)
+ break
+ case 'third_maintenance':
+ this.handleThirdMaintenance(item)
+ break
+ case 'toolOutStorageApproval':
+ this.handleToolOutStorageApproval(item)
+ break
+ case 'equipment_seal_up':
+ this.handleEquipmentSealUp(item)
break
default:
alert('娌℃壘鍒拌娴佺▼')
@@ -384,7 +420,43 @@
this.$refs.repairOrderApprovalModal.title = record.name
this.$refs.repairOrderApprovalModal.getAllApproveData(record)
this.$refs.repairOrderApprovalModal.getBasicInformation(record)
+ },
+ handleEquipmentLeanOut(item) {
+ this.$refs.equipmentLeanOutApprovalModelRef.visible = true
+ this.$refs.equipmentLeanOutApprovalModelRef.title = item.name
+ this.$refs.equipmentLeanOutApprovalModelRef.handleDetail(item)
+ this.$refs.equipmentLeanOutApprovalModelRef.disableSubmit = false
+ },
+ 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 = false
+ }
+ },
+ 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 = false
+ }
+ },
+ handleToolOutStorageApproval(item) {
+ if (item && item.dataId) {
+ this.selectOutBoundOrderData = Object.assign({}, item)
+ this.$refs.outBoundOrderHandle.auditVisible = true
+ this.$refs.outBoundOrderHandle.clearTableSource()
+ this.$refs.outBoundOrderHandle.getAllApproveData(item)
+ }
}
+ handleEquipmentSealUp(item) {
+ this.$refs.equipmentSealUpApprovalModelRef.visible = true
+ this.$refs.equipmentSealUpApprovalModelRef.title = item.name
+ this.$refs.equipmentSealUpApprovalModelRef.handleDetail(item)
+ this.$refs.equipmentSealUpApprovalModelRef.disableSubmit = false
+ },
}
}
</script>
--
Gitblit v1.9.3