From 251a931a9e001be7c80d63de784ab14d04777200 Mon Sep 17 00:00:00 2001
From: zhaowei <zhaowei>
Date: 星期五, 18 四月 2025 09:36:15 +0800
Subject: [PATCH] 1、我的待办页面 设备点检 分类审批弹窗功能逻辑开发并复用至我的已办、流程管理和点检工单页面 2、我的待办页面 设备周保流程 分类审批弹窗功能逻辑调整并复用至周保工单页面 3、周保工单页面以及详情列表功能bug修改 4、点检工单页面及新增弹窗功能bug修改 5、工作流我的待办页面 设备点检 分类详情弹窗样式调整为设备周保流程一致 6、工作流我的待办页面 设备周保流程 分类详情弹窗保养明细列表功能逻辑调整
---
src/views/flowable/workflow/FlowTodo.vue | 66 +++++++--------------------------
1 files changed, 14 insertions(+), 52 deletions(-)
diff --git a/src/views/flowable/workflow/FlowTodo.vue b/src/views/flowable/workflow/FlowTodo.vue
index ce37b8f..24f25ba 100644
--- a/src/views/flowable/workflow/FlowTodo.vue
+++ b/src/views/flowable/workflow/FlowTodo.vue
@@ -82,22 +82,16 @@
@change="handleTableChange">
<span slot="action" slot-scope="text, record">
- <a @click="handelDetail(record,text)">鏌ョ湅璇︽儏</a>
+ <a @click="handelDetail(record,text)">鎵ц/瀹℃壒</a>
</span>
</a-table>
</div>
- <AssignFileStreamHandle ref="modalFormApproval" :selectShenpiData="selectShenpiData"></AssignFileStreamHandle>
- <DispatchFileHandle ref="modalFormDispatchFileXq" :selectShenpiData="selectDispatchFileXqData"
- @searchReset="searchReset"></DispatchFileHandle>
- <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" @searchReset="searchReset"></week-maintenance-approval-modal>
+ <week-maintenance-approval-modal ref="weekMaintenanceApprovalModal" :selectShenpiData="selectWeekMaintenanceData"
+ @searchReset="searchReset"></week-maintenance-approval-modal>
<repair-order-approval-modal ref="repairOrderApprovalModal" @searchReset="searchReset"
:selectShenpiData="selectRepairOrderData"></repair-order-approval-modal>
</a-card>
@@ -109,13 +103,9 @@
import { mixinDevice } from '@/utils/mixin'
import { JeecgListMixin } from '@/mixins/JeecgListMixin'
import JDictSelectTag from '@/components/dict/JDictSelectTag.vue'
- 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 { getAction } from '@api/manage'
@@ -123,14 +113,10 @@
name: 'NcDeviceCharactersList',
mixins: [JeecgListMixin, mixinDevice],
components: {
- AssignFileStreamHandle,
JDictSelectTag,
- DispatchFileHandle,
- DispatchFileBachHandleStyle,
WeekMaintenanceApprovalModal,
RepairOrderApprovalModal,
- InspectionOrderHandle,
- InspectionOrderHandleBzz
+ InspectionOrderHandle
},
data() {
return {
@@ -205,10 +191,8 @@
isSameNode: '/assign/flow/isSameNode'
},
dictOptions: {},
- selectShenpiData: {},
- selectDispatchFileXqData: {},
selectInspectionOrderData: {},
- selectInspectionOrderDataBzz: {},
+ selectWeekMaintenanceData: {},
selectBachData: {},
selectRepairOrderData: {},
//涓氬姟淇℃伅ID
@@ -233,12 +217,6 @@
let processType = this.splitAprocessType(item.category)
console.log('processType--->', processType)
switch (processType) {
- case 'drApproval':
- this.handDrDetail(item)
- break
- case 'ggApproval':
- this.handDispatchFileDetail(item)
- break
case 'sbdjApproval':
this.handInspectionOrder(item)
break
@@ -257,34 +235,16 @@
let result = parts[0]
return result
},
- handDrDetail(record) {
- this.selectShenpiData = Object.assign({}, record)
- this.$refs.modalFormApproval.visible = true
- this.$refs.modalFormApproval.getAllApproveData(record)
- },
- searchReset() {
- this.queryParam = {}
- this.loadData(1)
- },
- handDispatchFileDetail(item) {
- console.log('item----->', item)
- this.selectDispatchFileXqData = item
- this.$refs.modalFormDispatchFileXq.clearTableSource()
- this.$refs.modalFormDispatchFileXq.getAllApproveData(item)
- },
+
handInspectionOrder(record) {
console.log('record----->', record)
- const tableRecord = Object.assign({}, record)
- if (record.taskDefKey === 'Confirmed_completed') {
- this.selectInspectionOrderDataBzz = tableRecord
- this.$refs.modalFormInspectionOrderBzz.getAllApproveData(record)
- } else {
- this.selectInspectionOrderData = tableRecord
- this.$refs.modalFormInspectionOrder.visible = true
- this.$refs.modalFormInspectionOrder.getAllApproveData(record)
- this.$refs.modalFormInspectionOrder.getBasicInformation(record)
- }
+ this.selectInspectionOrderData = Object.assign({}, record)
+ this.$refs.modalFormInspectionOrder.visible = true
+ this.$refs.modalFormInspectionOrder.title = record.name
+ this.$refs.modalFormInspectionOrder.getAllApproveData(record)
+ this.$refs.modalFormInspectionOrder.getBasicInformation(record)
},
+
batchHandle() {
if (this.selectedRowKeys.length <= 0) {
this.$notification.warning({
@@ -314,8 +274,10 @@
})
}
},
+
handleWeekMaintenance(item) {
if (item && item.dataId) {
+ this.selectWeekMaintenanceData = Object.assign({}, item)
this.$refs.weekMaintenanceApprovalModal.handleDetail(item)
this.$refs.weekMaintenanceApprovalModal.title = item.name
this.$refs.weekMaintenanceApprovalModal.disableSubmit = false
--
Gitblit v1.9.3