From dbcefcca9bc6aa447e2a17d1e2883a7fee97a401 Mon Sep 17 00:00:00 2001
From: youkehai <youkehai@darryring.com>
Date: Tue, 10 Oct 2023 10:40:30 +0800
Subject: [PATCH] =?UTF-8?q?fix:=20=E5=87=8F=E7=AD=BE=E6=8C=89=E9=92=AE?=
 =?UTF-8?q?=E6=98=BE=E7=A4=BA=E5=92=8Capi=E5=9C=B0=E5=9D=80=E4=BF=AE?=
 =?UTF-8?q?=E6=94=B9?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

(cherry picked from commit 62a953815d2c10f885e12cd9260b99422b089521)
---
 src/api/bpm/task/index.ts                       |  4 ++--
 .../detail/ProcessInstanceChildrenTaskList.vue  | 17 +++++++++++++++--
 .../detail/TaskSubSignDialogForm.vue            |  2 +-
 3 files changed, 18 insertions(+), 5 deletions(-)

diff --git a/src/api/bpm/task/index.ts b/src/api/bpm/task/index.ts
index 8ba46d6a..1ec8b807 100644
--- a/src/api/bpm/task/index.ts
+++ b/src/api/bpm/task/index.ts
@@ -69,8 +69,8 @@ export const taskAddSign = async (data) => {
 /**
  * 获取减签任务列表
  */
-export const getSubSignTaskList = async (id: string) => {
-  return await request.get({ url: '/bpm/task/get-sub-sign?taskId=' + id })
+export const getChildrenTaskList = async (id: string) => {
+  return await request.get({ url: '/bpm/task/get-children-task-list?taskId=' + id })
 }
 
 /**
diff --git a/src/views/bpm/processInstance/detail/ProcessInstanceChildrenTaskList.vue b/src/views/bpm/processInstance/detail/ProcessInstanceChildrenTaskList.vue
index 962d0a00..f162d1fb 100644
--- a/src/views/bpm/processInstance/detail/ProcessInstanceChildrenTaskList.vue
+++ b/src/views/bpm/processInstance/detail/ProcessInstanceChildrenTaskList.vue
@@ -2,7 +2,7 @@
   <el-drawer v-model="drawerVisible" title="子任务" size="70%">
     <template #header>
       <h4>【{{ baseTask.name }} 】审批人：{{ baseTask.assigneeUser?.nickname }}</h4>
-      <el-button style="margin-left: 5px" type="danger" plain @click="handleSubSign(baseTask)">
+      <el-button style="margin-left: 5px" v-if="showSubSignButton(baseTask)" type="danger" plain @click="handleSubSign(baseTask)">
         <Icon icon="ep:remove" />
         减签
       </el-button>
@@ -32,7 +32,7 @@
       <el-table-column label="操作" prop="operation">
         <template #default="scope">
           <el-button
-            v-if="!isEmpty(scope.row.children)"
+            v-if="showSubSignButton(scope.row)"
             type="danger"
             plain
             @click="handleSubSign(scope.row)"
@@ -83,4 +83,17 @@ const taskSubSignDialogForm = ref()
 const handleSubSign = (item) => {
   taskSubSignDialogForm.value.open(item.id)
 }
+
+/**
+ * 显示减签按钮
+ * @param task
+ */
+const showSubSignButton = (task:any) => {
+  if(!isEmpty(task.children)){
+    //有子任务，且子任务有任意一个是 待处理 和 待前置任务完成 则显示减签按钮
+    const subTask = task.children.find((item) => item.result === 1 || item.result === 9)
+    return !isEmpty(subTask)
+  }
+  return false
+}
 </script>
diff --git a/src/views/bpm/processInstance/detail/TaskSubSignDialogForm.vue b/src/views/bpm/processInstance/detail/TaskSubSignDialogForm.vue
index f776ef86..61f7d68c 100644
--- a/src/views/bpm/processInstance/detail/TaskSubSignDialogForm.vue
+++ b/src/views/bpm/processInstance/detail/TaskSubSignDialogForm.vue
@@ -44,7 +44,7 @@ const formRef = ref() // 表单 Ref
 const subTaskList = ref([])
 /** 打开弹窗 */
 const open = async (id: string) => {
-  subTaskList.value = await TaskApi.getSubSignTaskList(id)
+  subTaskList.value = await TaskApi.getChildrenTaskList(id)
   if (isEmpty(subTaskList.value)) {
     message.warning('当前没有可减签的任务')
     return false