From 53c269711fcb59f48fd2acd7e825bebfd31d09e5 Mon Sep 17 00:00:00 2001
From: lyh <925863403@qq.com>
Date: 星期三, 09 四月 2025 16:33:10 +0800
Subject: [PATCH] 点检工单修改，修改指派设备问题
---
src/views/flowable/workflow/FlowCompleted.vue | 52 ++++++++++++++++++++++++++++++++++++++++++++--------
1 files changed, 44 insertions(+), 8 deletions(-)
diff --git a/src/views/flowable/workflow/FlowCompleted.vue b/src/views/flowable/workflow/FlowCompleted.vue
index e83eee4..ba2a883 100644
--- a/src/views/flowable/workflow/FlowCompleted.vue
+++ b/src/views/flowable/workflow/FlowCompleted.vue
@@ -75,7 +75,11 @@
</a-table>
</div>
- <FlowXq ref="modalFormApproval" :selectShenpiData="selectShenpiData"></FlowXq>
+ <AssignFileStreamXq ref="modalFormApproval" :selectShenpiData="selectShenpiData"></AssignFileStreamXq>
+
+ <DispatchFileXq ref="modalFormDispatchFileXq" :selectShenpiData="selectDispatchFileXqData"></DispatchFileXq>
+
+ <InspectionOrderXq ref="modalFormInspectionOrderXq" :selectShenpiData="selectInspectionOrderXqData"></InspectionOrderXq>
</a-card>
</template>
@@ -86,13 +90,17 @@
import { mixinDevice } from '@/utils/mixin'
import { JeecgListMixin } from '@/mixins/JeecgListMixin'
import JDictSelectTag from '@/components/dict/JDictSelectTag.vue'
-import FlowXq from '@views/flowable/workflow/FlowXq.vue'
+import AssignFileStreamXq from '@views/flowable/workflow/assignFileStream/AssignFileStreamXq.vue'
+import DispatchFileXq from '@views/flowable/workflow/dispatchFile/DispatchFileXq.vue'
+import InspectionOrderXq from '@views/flowable/workflow/InspectionOrder/InspectionOrderXq.vue'
export default {
name: 'NcDeviceCharactersList',
mixins:[JeecgListMixin, mixinDevice],
components: {
- FlowXq,
+ InspectionOrderXq,
+ DispatchFileXq,
+ AssignFileStreamXq: AssignFileStreamXq,
JDictSelectTag,
},
data () {
@@ -143,7 +151,7 @@
{
title: '鎿嶄綔鏃堕棿',
align: "center",
- dataIndex: 'createTime',
+ dataIndex: 'finishTime',
width:300
},
{
@@ -156,10 +164,12 @@
}
],
url: {
- list: "/nc/assign/flow/finishedList",
+ list: "/assign/flow/finishedList",
},
dictOptions:{},
selectShenpiData: {},
+ selectDispatchFileXqData:{},
+ selectInspectionOrderXqData:{}
}
},
created() {
@@ -174,14 +184,20 @@
console.log('鐐瑰嚮浜嗚鎯�')
console.log('item----->', item)
console.log('index----->', index)
- let approcesstype = this.splitAprocessType(item.description)
+ let approcesstype = this.splitAprocessType(item.category)
console.log('approcesstype--->', approcesstype)
switch (approcesstype) {
- case '鎸囨淳NC鏂囨。鍒拌澶囨祦绋�':
+ case 'drApproval':
this.handDrDetial(item)
break
+ case 'ggApproval':
+ this.handDispatchFileDetial(item)
+ break
+ case 'sbdjApproval':
+ this.handInspectionOrder(item)
+ break
default:
- alert('娌℃壘鍒拌瀹℃壒')
+ alert('娌℃壘鍒拌娴佺▼')
}
},
splitAprocessType(title) {
@@ -194,6 +210,26 @@
this.$refs.modalFormApproval.clearTableSource()
this.$refs.modalFormApproval.getAllApproveData(item)
},
+ handDispatchFileDetial(item){
+ console.log('item----->', item)
+ this.selectDispatchFileXqData = item
+ this.selectDispatchFileXqData.assignee_dictText=item.todoUsers_dictText
+ this.selectDispatchFileXqData.procInstId=item.procInsId
+ this.selectDispatchFileXqData.processInstanceId=item.procInsId
+ this.selectDispatchFileXqData.title=item.description
+ this.$refs.modalFormDispatchFileXq.clearTableSource()
+ this.$refs.modalFormDispatchFileXq.getAllApproveData(item)
+ },
+ handInspectionOrder(item) {
+ console.log('item----->', item)
+ this.selectInspectionOrderXqData = item
+ this.selectInspectionOrderXqData.assignee_dictText=item.todoUsers_dictText
+ this.selectInspectionOrderXqData.procInstId=item.procInsId
+ this.selectInspectionOrderXqData.processInstanceId=item.procInsId
+ this.selectInspectionOrderXqData.title=item.description
+ this.$refs.modalFormInspectionOrderXq.clearTableSource()
+ this.$refs.modalFormInspectionOrderXq.getAllApproveData(item)
+ }
}
}
</script>
--
Gitblit v1.9.3