From 7e5ed117b833b64c1bcd3533a03541483f27ed3d Mon Sep 17 00:00:00 2001
From: danshihao <danshihao@syxysoft.com>
Date: Thu, 18 Jan 2024 18:30:14 +0800
Subject: [PATCH] =?UTF-8?q?update=20=E6=B5=81=E7=A8=8B=E7=9B=91=E6=8E=A7?=
 =?UTF-8?q?=E5=B7=B2=E6=92=A4=E5=9B=9E=E7=8A=B6=E6=80=81=EF=BC=8C=E8=AF=A6?=
 =?UTF-8?q?=E6=83=85=E4=B8=8D=E6=9F=A5=E6=89=BE=E8=BF=9B=E8=A1=8C=E4=B8=AD?=
 =?UTF-8?q?=E7=9A=84=E4=BB=BB=E5=8A=A1?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/components/ProcessDetailList.vue                   | 10 ++++++----
 .../workCenter/processCenter/table/MonitorList.vue     |  5 ++++-
 2 files changed, 10 insertions(+), 5 deletions(-)

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
         }
       })
     },