diff --git a/src/components/ProcessDetailList.vue b/src/components/ProcessDetailList.vue index 3bc4d8ea..4f750465 100644 --- a/src/components/ProcessDetailList.vue +++ b/src/components/ProcessDetailList.vue @@ -211,10 +211,8 @@ export default { image: false, imageUrl: null, /* 排序参数 */ - isorter: { - column: 'createTime', - order: 'desc' - } + // 后端需要去掉 + isorter: null } }, methods: { @@ -224,6 +222,10 @@ export default { return } const params = this.getQueryParams()// 查询条件 + // 流程监控进详情,并且是已撤回的流程不查状态为进行中的任务 + if (this.$route.query.source === 'monitorList' && this.$route.query.prcStatus === '3') { + params.finishFlagSearch = '2,3,4' + } if (this.$route.query.processInstanceId) { params.processInstanceId = this.$route.query.processInstanceId } else { diff --git a/src/views/workCenter/processCenter/table/MonitorList.vue b/src/views/workCenter/processCenter/table/MonitorList.vue index d11e0102..ff451ad6 100644 --- a/src/views/workCenter/processCenter/table/MonitorList.vue +++ b/src/views/workCenter/processCenter/table/MonitorList.vue @@ -259,7 +259,10 @@ export default { query: { processKey: processKey, processDefinitionId: record.processDefinitionId, - processInstanceId: record.processInstanceId + processInstanceId: record.processInstanceId, + // 流程监控并且是已撤回,详情不查进行中的 + source: 'monitorList', + prcStatus: record.prcStatus } }) },