From 3c1df9c880dfad8207fac9b4bff98bef51c23fb1 Mon Sep 17 00:00:00 2001
From: dap <15891557205@163.com>
Date: Tue, 17 Dec 2024 15:41:07 +0800
Subject: [PATCH] =?UTF-8?q?chore:=20=E6=B5=81=E7=A8=8B=E5=88=A0=E9=99=A4/?=
 =?UTF-8?q?=E6=92=A4=E9=94=80?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../src/api/workflow/instance/index.ts        |  7 +-
 .../workflow/components/approval-panel.vue    | 65 ++++++++++++++++---
 .../src/views/workflow/task/myDocument.vue    |  1 -
 3 files changed, 61 insertions(+), 12 deletions(-)

diff --git a/apps/web-antd/src/api/workflow/instance/index.ts b/apps/web-antd/src/api/workflow/instance/index.ts
index 7d0d8d55..1bba5911 100644
--- a/apps/web-antd/src/api/workflow/instance/index.ts
+++ b/apps/web-antd/src/api/workflow/instance/index.ts
@@ -39,7 +39,7 @@ export function deleteByBusinessIds(businessIds: IDS) {
  */
 export function deleteByInstanceIds(instanceIds: IDS) {
   return requestClient.deleteWithMsg<void>(
-    `/workflow/instance/deleteByInstanceIds${instanceIds}`,
+    `/workflow/instance/deleteByInstanceIds/${instanceIds}`,
   );
 }
 
@@ -47,7 +47,10 @@ export function deleteByInstanceIds(instanceIds: IDS) {
  * 撤销流程
  * @param data
  */
-export function cancelProcessApply(data: any) {
+export function cancelProcessApply(data: {
+  businessId: string;
+  message?: string;
+}) {
   return requestClient.putWithMsg<void>(
     '/workflow/instance/cancelProcessApply',
     data,
diff --git a/apps/web-antd/src/views/workflow/components/approval-panel.vue b/apps/web-antd/src/views/workflow/components/approval-panel.vue
index e830867f..d171a777 100644
--- a/apps/web-antd/src/views/workflow/components/approval-panel.vue
+++ b/apps/web-antd/src/views/workflow/components/approval-panel.vue
@@ -17,14 +17,17 @@ import {
   Menu,
   MenuItem,
   Modal,
-  Popconfirm,
   Skeleton,
   Space,
   TabPane,
   Tabs,
 } from 'ant-design-vue';
 
-import { flowInfo } from '#/api/workflow/instance';
+import {
+  cancelProcessApply,
+  deleteByInstanceIds,
+  flowInfo,
+} from '#/api/workflow/instance';
 import {
   getTaskByTaskId,
   taskOperation,
@@ -118,8 +121,42 @@ watch(() => props.task, handleLoadInfo);
 
 onUnmounted(() => (currentFlowInfo.value = undefined));
 
+// 进行中 可以撤销
+const revocable = computed(() => props.task?.flowStatus === 'waiting');
 async function handleCancel() {
-  // await cancelProcessApply()
+  Modal.confirm({
+    title: '提示',
+    content: '确定要撤销该申请吗？',
+    centered: true,
+    okButtonProps: { danger: true },
+    onOk: async () => {
+      await cancelProcessApply({
+        businessId: props.task!.businessId,
+        message: '申请人撤销流程！',
+      });
+      emit('reload');
+    },
+  });
+}
+
+const editableAndRemoveable = computed(() => {
+  if (!props.task) {
+    return false;
+  }
+  return ['back', 'cancel', 'draft'].includes(props.task.flowStatus);
+});
+
+function handleRemove() {
+  Modal.confirm({
+    title: '提示',
+    content: '确定删除该申请吗？',
+    centered: true,
+    okButtonProps: { danger: true },
+    onOk: async () => {
+      await deleteByInstanceIds([props.task!.id]);
+      emit('reload');
+    },
+  });
 }
 
 /**
@@ -321,13 +358,23 @@ function handleReductionSignature(userList: User[]) {
     >
       <div class="flex justify-end">
         <Space v-if="type === 'myself'">
-          <Popconfirm
-            placement="topRight"
-            title="确定要撤销该申请吗？"
-            @confirm="handleCancel"
+          <a-button
+            v-if="revocable"
+            danger
+            type="primary"
+            @click="handleCancel"
           >
-            <a-button danger type="primary">撤销申请</a-button>
-          </Popconfirm>
+            撤销申请
+          </a-button>
+
+          <a-button
+            v-if="editableAndRemoveable"
+            danger
+            type="primary"
+            @click="handleRemove"
+          >
+            删除
+          </a-button>
         </Space>
         <Space v-if="type === 'approve'">
           <a-button type="primary" @click="handleApproval">通过</a-button>
diff --git a/apps/web-antd/src/views/workflow/task/myDocument.vue b/apps/web-antd/src/views/workflow/task/myDocument.vue
index f648c011..037d8294 100644
--- a/apps/web-antd/src/views/workflow/task/myDocument.vue
+++ b/apps/web-antd/src/views/workflow/task/myDocument.vue
@@ -32,7 +32,6 @@ onMounted(async () => {
    * 获取待办任务列表
    */
   const resp = await pageByCurrent({ pageSize: 10, pageNum: page.value });
-  console.log(resp);
   taskList.value = resp.rows.map((item) => ({ ...item, active: false }));
   taskTotal.value = resp.total;
 });