From 0c4e7ea6e347db2f2749bf9446ac0ed215bdecd5 Mon Sep 17 00:00:00 2001
From: lyh <925863403@qq.com>
Date: 星期一, 14 四月 2025 13:33:02 +0800
Subject: [PATCH] 修改审签工作流
---
src/views/flowable/workflow/FlowTodo.vue | 83 +++++++++++++++++++++++++++++++++++------
1 files changed, 70 insertions(+), 13 deletions(-)
diff --git a/src/views/flowable/workflow/FlowTodo.vue b/src/views/flowable/workflow/FlowTodo.vue
index 6ce720b..6404081 100644
--- a/src/views/flowable/workflow/FlowTodo.vue
+++ b/src/views/flowable/workflow/FlowTodo.vue
@@ -73,6 +73,11 @@
:rowSelection="{selectedRowKeys: selectedRowKeys, onChange: onSelectChange}"
@change="handleTableChange">
+ <!-- 瀛楃涓茶秴闀挎埅鍙栫渷鐣ュ彿鏄剧ず-->
+ <span slot="description" slot-scope="text">
+ <j-ellipsis :value="text" :length="25" />
+ </span>
+
<template slot="htmlSlot" slot-scope="text">
<div v-html="text"></div>
</template>
@@ -100,9 +105,13 @@
</a-table>
</div>
- <AssignFileStreamHandle ref="modalFormApproval" :selectShenpiData="selectShenpiData"></AssignFileStreamHandle>
+ <AssignFileStreamHandle ref="modalFormApproval" :selectShenpiData="selectShenpiData" @searchReset="searchReset"></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" ></week-maintenance-approval-modal>
+ <repair-order-approval-modal ref="repairOrderApprovalModal" :selectShenpiData="selectRepairOrderData" ></repair-order-approval-modal>
</a-card>
</template>
@@ -115,6 +124,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 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'
export default {
name: 'NcDeviceCharactersList',
@@ -123,7 +137,11 @@
AssignFileStreamHandle,
JDictSelectTag,
DispatchFileHandle,
- DispatchFileBachHandleStyle
+ DispatchFileBachHandleStyle,
+ WeekMaintenanceApprovalModal,
+ RepairOrderApprovalModal,
+ InspectionOrderHandle,
+ InspectionOrderHandleBzz,
},
data () {
return {
@@ -134,7 +152,7 @@
title: '搴忓彿',
dataIndex: '',
key:'rowIndex',
- width:200,
+ width:100,
align:"center",
customRender:function (t,r,index) {
return parseInt(index)+1;
@@ -153,16 +171,17 @@
width: 200,
},
{
- title: '娴佺▼涓氬姟绠�瑕佹弿杩�',
- align: "center",
- dataIndex: 'title',
- width:300
+ title:'娴佺▼涓氬姟绠�瑕佹弿杩�',
+ align:"center",
+ dataIndex: 'description',
+ width:300,
+ scopedSlots: {customRender: 'description'},
},
{
title: '涓婁竴姝ュ鐞嗕汉',
align: "center",
dataIndex: 'preNodeAssignee_dictText',
- width:200
+ width:100
},
{
title: '鍓嶉┍鑺傜偣',
@@ -198,7 +217,12 @@
dictOptions:{},
selectShenpiData: {},
selectDispatchFileXqData:{},
- selectBachData:{}
+ selectInspectionOrderData:{},
+ selectInspectionOrderDataBzz:{},
+ selectBachData:{},
+ selectRepairOrderData: {},
+ //涓氬姟淇℃伅ID
+ dataId: undefined,
}
},
created() {
@@ -213,17 +237,26 @@
console.log('鐐瑰嚮浜嗚鎯�')
console.log('item----->', item)
console.log('index----->', index)
- let approcesstype = this.splitAprocessType(item.category_dictText)
+ let approcesstype = this.splitAprocessType(item.category)
console.log('approcesstype--->', approcesstype)
switch (approcesstype) {
- case '鎸囨淳NC鏂囨。鍒拌澶囨祦绋�':
+ case 'drApproval':
this.handDrDetial(item)
break
- case 'NC绋嬪簭绛炬淳':
+ case 'ggApproval':
this.handDispatchFileDetial(item)
break
+ case 'sbdjApproval':
+ this.handInspectionOrder(item)
+ break
+ case 'WEEK_MAINTENANCE':
+ this.handleWeekMaintenance(item)
+ break
+ case 'eam_repair':
+ this.handleRepairOrder(item)
+ break
default:
- alert('娌℃壘鍒拌瀹℃壒')
+ alert('娌℃壘鍒拌娴佺▼')
}
},
splitAprocessType(title) {
@@ -245,6 +278,18 @@
this.selectDispatchFileXqData = item
this.$refs.modalFormDispatchFileXq.clearTableSource()
this.$refs.modalFormDispatchFileXq.getAllApproveData(item)
+ },
+ handInspectionOrder(item) {
+ console.log('item----->', item)
+ if (item.taskDefKey ==='Confirmed_completed'){
+ this.selectInspectionOrderDataBzz = item
+ this.$refs.modalFormInspectionOrderBzz .clearTableSource()
+ this.$refs.modalFormInspectionOrderBzz .getAllApproveData(item)
+ }else {
+ this.selectInspectionOrderData = item
+ this.$refs.modalFormInspectionOrder.clearTableSource()
+ this.$refs.modalFormInspectionOrder.getAllApproveData(item)
+ }
},
batchHandle() {
if (this.selectedRowKeys.length <= 0) {
@@ -274,6 +319,18 @@
}
})
}
+ },
+ handleWeekMaintenance(item) {
+ 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