From 95b6a6388e4cc4e6ed0f54cc04212a86cd8cf829 Mon Sep 17 00:00:00 2001
From: zhaowei <zhaowei>
Date: 星期五, 23 五月 2025 13:37:09 +0800
Subject: [PATCH] 1、用户管理新增和编辑用户时设置工单为必填项 2、新增终端登录、首页、设备点检、故障上报、上下班打卡、停机原因维护页面（未与后端联调且客户未确定页面设计）并调整全局路由守卫相关逻辑 3、调整设备结构树设备层级和车间层级区分的判断条件 4、调整电子样板检索与部件借用弹窗列表与搜索区域样式
---
src/views/flowable/workflow/FlowCompleted.vue | 22 ++++++++++++++++++++--
1 files changed, 20 insertions(+), 2 deletions(-)
diff --git a/src/views/flowable/workflow/FlowCompleted.vue b/src/views/flowable/workflow/FlowCompleted.vue
index bbeb956..48bacaf 100644
--- a/src/views/flowable/workflow/FlowCompleted.vue
+++ b/src/views/flowable/workflow/FlowCompleted.vue
@@ -67,6 +67,8 @@
<week-maintenance-approval-modal ref="weekMaintenanceApprovalModal" :selectShenpiData="selectWeekMaintenanceData"/>
<repair-order-approval-modal ref="repairOrderApprovalModal" :selectShenpiData="selectRepairOrderData"/>
+
+ <out-bound-order-handle ref="outBoundOrderHandle" :selectShenpiData="selectOutBoundOrderData"/>
</a-card>
</template>
@@ -81,6 +83,7 @@
import InspectionOrderHandle from './InspectionOrder/InspectionOrderHandle'
import WeekMaintenanceApprovalModal from './weekMaintenance/WeekMaintenanceApprovalModal'
import RepairOrderApprovalModal from './repairOrder/RepairOrderApprovalModal'
+ import OutBoundOrderHandle from '@views/flowable/workflow/outBoundOrder/OutBoundOrderHandle.vue'
export default {
name: 'NcDeviceCharactersList',
@@ -91,7 +94,8 @@
RepairOrderApprovalModal,
WeekMaintenanceApprovalModal,
InspectionOrderHandle,
- JDictSelectTag
+ JDictSelectTag,
+ OutBoundOrderHandle
},
data() {
return {
@@ -161,7 +165,8 @@
selectDispatchFileXqData:{},
selectWeekMaintenanceData: {},
selectInspectionOrderXqData: {},
- selectRepairOrderData: {}
+ selectRepairOrderData: {},
+ selectOutBoundOrderData: {}
}
},
created() {
@@ -193,6 +198,9 @@
break
case 'eam_repair':
this.handleRepairOrder(item)
+ break
+ case 'toolOutStorageApproval':
+ this.handleToolOutStorageApproval(item)
break
default:
alert('娌℃壘鍒拌娴佺▼')
@@ -264,6 +272,16 @@
processInstanceId: procInsId
})
this.$refs.repairOrderApprovalModal.getBasicInformation(record)
+ },
+
+ handleToolOutStorageApproval(item) {
+ this.selectOutBoundOrderData = Object.assign({}, item)
+ item.procInstId = item.procInsId
+ item.processInstanceId = item.procInsId
+ this.selectOutBoundOrderData.assignee_dictText = item.todoUsers_dictText
+ this.$refs.outBoundOrderHandle.auditVisible = false
+ this.$refs.outBoundOrderHandle.clearTableSource()
+ this.$refs.outBoundOrderHandle.getAllApproveData(item)
}
}
}
--
Gitblit v1.9.3