From 4322a76f25999cedfb0149ae5abd07cd01b52b74 Mon Sep 17 00:00:00 2001
From: zhujiyan <17812234322@163.com>
Date: Mon, 3 Jun 2024 19:10:52 +0800
Subject: [PATCH] =?UTF-8?q?=E6=B5=81=E7=A8=8B=E8=AF=A6=E6=83=85=E7=BB=84?=
 =?UTF-8?q?=E4=BB=B6=E9=87=8D=E6=96=B0=E5=8F=91=E8=B5=B7=E6=98=BE=E7=A4=BA?=
 =?UTF-8?q?=E9=80=BB=E8=BE=91=E4=BF=AE=E6=94=B9?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../detail/ProcessInstanceTaskList.vue        | 40 +++++++++----------
 .../bpm/processInstance/detail/index.vue      |  4 +-
 2 files changed, 22 insertions(+), 22 deletions(-)

diff --git a/src/views/system/bpm/processInstance/detail/ProcessInstanceTaskList.vue b/src/views/system/bpm/processInstance/detail/ProcessInstanceTaskList.vue
index 775cac18..379f422a 100644
--- a/src/views/system/bpm/processInstance/detail/ProcessInstanceTaskList.vue
+++ b/src/views/system/bpm/processInstance/detail/ProcessInstanceTaskList.vue
@@ -16,7 +16,7 @@
                     </el-timeline-item>
                     <div class="return_send" v-for="(item, index) in tasksList" :key="index">
                         <!-- 最后一条不显示重新发起 -->
-                        <el-timeline-item type="success" v-if="index != 0">
+                        <el-timeline-item type="success" v-if="index != 0 && item.name != '审核'">
                             <p style="font-weight: 700">
                                 重新发起：【{{ item.processInstance.startUser?.name }}】在
                                 {{ formatDate(item?.createTime) }} 重新发起【 {{ item.processInstance.name }} 】流程
@@ -108,31 +108,31 @@ const props = defineProps({
     processInstance: propTypes.object, // 流程实例
     tasks: propTypes.arrayOf(propTypes.object) // 流程任务的数组
 })
-const tasksList:any=ref([])
+const tasksList: any = ref([])
 watch(
     () => props.tasks,
     (val, oldVal) => {
-        if (val&&val.length!=0) {
-            tasksList.value =JSON.parse(JSON.stringify( val)).sort((a, b) => {
-                // 有已完成的情况，按照完成时间倒序
-                if (a.endTime && b.endTime) {
-                    return sortYMDHMS(a.endTime) - sortYMDHMS(b.endTime)
-                }
-                 else if (a.endTime) {
-                    return 1
-                } else if (b.endTime) {
-                    return -1
-                    // 都是未完成，按照创建时间倒序
-                } 
-                else {
-                    return sortYMDHMS(a.createTime) - sortYMDHMS(b.createTime)
-                }
-            }).reverse()
+        if (val && val.length != 0) {
+            tasksList.value = JSON.parse(JSON.stringify(val))
+                .sort((a, b) => {
+                    // 有已完成的情况，按照完成时间倒序
+                    if (a.endTime && b.endTime) {
+                        return sortYMDHMS(a.endTime) - sortYMDHMS(b.endTime)
+                    } else if (a.endTime) {
+                        return 1
+                    } else if (b.endTime) {
+                        return -1
+                        // 都是未完成，按照创建时间倒序
+                    } else {
+                        return sortYMDHMS(a.createTime) - sortYMDHMS(b.createTime)
+                    }
+                })
+                .reverse()
         }
     },
     {
-        immediate:true,
-        deep:true
+        immediate: true,
+        deep: true
     }
 )
 const sortYMDHMS = val => {
diff --git a/src/views/system/bpm/processInstance/detail/index.vue b/src/views/system/bpm/processInstance/detail/index.vue
index 083b4faf..fee55f14 100644
--- a/src/views/system/bpm/processInstance/detail/index.vue
+++ b/src/views/system/bpm/processInstance/detail/index.vue
@@ -343,9 +343,9 @@ const getTaskList = async () => {
         //根据历史实例id查询历史任务日志数据把最新的id加进去
         historyInstanceIdList.value.push(id)
         //轮询
-        await historyInstanceIdList.value?.map((item: any, index: any) => {
+        await historyInstanceIdList.value?.map((item: any) => {
             getTaskListByProcessInstanceId(item).then(res => {
-                res.data.map(vv => {
+                res.data?.map(vv => {
                     stepList.value.push(vv)
                 })
             })