From b80702cd9d2ff50517d6ee3ab9caf92dfaff96fb Mon Sep 17 00:00:00 2001
From: shizhong <124974919@qq.com>
Date: Tue, 26 Sep 2023 19:43:55 +0800
Subject: [PATCH 1/3] refactor: vue3.3 defineOptions

---
 src/router/modules/remaining.ts | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/src/router/modules/remaining.ts b/src/router/modules/remaining.ts
index 70d8ec6a..5866e159 100644
--- a/src/router/modules/remaining.ts
+++ b/src/router/modules/remaining.ts
@@ -60,7 +60,7 @@ const remainingRouter: AppRouteRecordRaw[] = [
       {
         path: 'index',
         component: () => import('@/views/Home/Index.vue'),
-        name: 'Index',
+        name: 'Home',
         meta: {
           title: t('router.home'),
           icon: 'ep:home-filled',

From 2c7488871281a942fb7274d5f67b555887dde9af Mon Sep 17 00:00:00 2001
From: shizhong <124974919@qq.com>
Date: Tue, 26 Sep 2023 19:56:57 +0800
Subject: [PATCH 2/3] =?UTF-8?q?feat:=20=E3=80=90=E5=B7=A5=E4=BD=9C?=
 =?UTF-8?q?=E6=B5=81=E3=80=91--=E5=A7=94=E6=B4=BE?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/api/bpm/task/index.ts                     | 11 ++-
 src/views/bpm/processInstance/detail.vue      | 12 ++-
 .../detail/TaskDelegateForm.vue               | 86 +++++++++++++++++++
 3 files changed, 104 insertions(+), 5 deletions(-)
 create mode 100644 src/views/bpm/processInstance/detail/TaskDelegateForm.vue

diff --git a/src/api/bpm/task/index.ts b/src/api/bpm/task/index.ts
index e6478d31..d8be8025 100644
--- a/src/api/bpm/task/index.ts
+++ b/src/api/bpm/task/index.ts
@@ -48,6 +48,13 @@ export const getReturnList = async (params) => {
 }
 
 // 回退
-export const returnTask = async (data) => {
-  return await request.put({ url: '/bpm/task/return', data })
+export const okRollback = async (data) => {
+  return await request.put({ url: '/bpm/task/rollback', data })
+}
+
+/**
+ * 委派
+ */
+export const delegateTask = async (data) => {
+  return await request.put({ url: '/bpm/task/delegate', data })
 }
diff --git a/src/views/bpm/processInstance/detail.vue b/src/views/bpm/processInstance/detail.vue
index f524017b..32b36026 100644
--- a/src/views/bpm/processInstance/detail.vue
+++ b/src/views/bpm/processInstance/detail.vue
@@ -192,6 +192,8 @@
 
     <!-- 弹窗，回退节点 -->
     <TaskReturnDialog ref="taskReturnDialogRef" @success="getDetail" />
+    <!-- 委派，将任务委派给别人处理，处理完成后，会重新回到原审批人手中-->
+    <TaskDelegateForm ref="taskDelegateForm" @success="getDetail" />
   </ContentWrap>
 </template>
 <script lang="ts" setup>
@@ -208,6 +210,7 @@ import type { ApiAttrs } from '@form-create/element-ui/types/config'
 import { useUserStore } from '@/store/modules/user'
 import { MyProcessViewer } from '@/components/bpmnProcessDesigner/package'
 import TaskReturnDialog from './detail/TaskReturnDialogForm.vue'
+import TaskDelegateForm from './detail/taskDelegateForm.vue'
 
 defineOptions({ name: 'BpmProcessInstanceDetail' })
 
@@ -303,6 +306,9 @@ const getTimelineItemType = (item) => {
   if (item.result === 5) {
     return 'warning'
   }
+  if (item.result === 6) {
+    return 'default'
+  }
   return ''
 }
 
@@ -358,10 +364,10 @@ const resetUpdateAssigneeForm = () => {
   updateAssigneeFormRef.value?.resetFields()
 }
 
+const taskDelegateForm = ref()
 /** 处理审批退回的操作 */
 const handleDelegate = async (task) => {
-  message.error('暂不支持【委派】功能，可以使用【转派】替代！')
-  console.log(task)
+  taskDelegateForm.value.open(task.id)
 }
 
 //回退弹框组件
@@ -463,7 +469,7 @@ const getDetail = () => {
       // 需要审核的记录
       tasks.value.forEach((task) => {
         // 1.1 只有待处理才需要
-        if (task.result !== 1) {
+        if (task.result !== 1 && task.result !== 6) {
           return
         }
         // 1.2 自己不是处理人
diff --git a/src/views/bpm/processInstance/detail/TaskDelegateForm.vue b/src/views/bpm/processInstance/detail/TaskDelegateForm.vue
new file mode 100644
index 00000000..99c6cc7e
--- /dev/null
+++ b/src/views/bpm/processInstance/detail/TaskDelegateForm.vue
@@ -0,0 +1,86 @@
+<template>
+  <Dialog v-model="dialogVisible" title="委派任务" width="500">
+    <el-form
+      ref="formRef"
+      v-loading="formLoading"
+      :model="formData"
+      :rules="formRules"
+      label-width="110px"
+    >
+      <el-form-item label="接收人" prop="receiveId">
+        <el-select v-model="formData.receiveId" clearable style="width: 100%">
+          <el-option
+            v-for="item in userList"
+            :key="item.id"
+            :label="item.nickname"
+            :value="item.id"
+          />
+        </el-select>
+      </el-form-item>
+      <el-form-item label="委派理由" prop="reason">
+        <el-input v-model="formData.reason" clearable placeholder="请输入委派理由" />
+      </el-form-item>
+    </el-form>
+    <template #footer>
+      <el-button :disabled="formLoading" type="primary" @click="submitForm">确 定</el-button>
+      <el-button @click="dialogVisible = false">取 消</el-button>
+    </template>
+  </Dialog>
+</template>
+<script lang="ts" setup>
+import * as TaskApi from '@/api/bpm/task'
+import * as UserApi from '@/api/system/user'
+
+defineOptions({ name: 'BpmTaskDelegateForm' })
+
+const dialogVisible = ref(false) // 弹窗的是否展示
+const formLoading = ref(false) // 表单的加载中
+const formData = ref({
+  id: '',
+  receiveId: undefined
+})
+const formRules = ref({
+  receiveId: [{ required: true, message: '接收人不能为空', trigger: 'change' }]
+})
+
+const formRef = ref() // 表单 Ref
+const userList = ref<any[]>([]) // 用户列表
+
+/** 打开弹窗 */
+const open = async (id: string) => {
+  dialogVisible.value = true
+  resetForm()
+  formData.value.id = id
+  // 获得用户列表
+  userList.value = await UserApi.getSimpleUserList()
+}
+defineExpose({ open }) // 提供 openModal 方法，用于打开弹窗
+
+/** 提交表单 */
+const emit = defineEmits(['success']) // 定义 success 事件，用于操作成功后的回调
+const submitForm = async () => {
+  // 校验表单
+  if (!formRef) return
+  const valid = await formRef.value.validate()
+  if (!valid) return
+  // 提交请求
+  formLoading.value = true
+  try {
+    await TaskApi.delegateTask(formData.value)
+    dialogVisible.value = false
+    // 发送操作成功的事件
+    emit('success')
+  } finally {
+    formLoading.value = false
+  }
+}
+
+/** 重置表单 */
+const resetForm = () => {
+  formData.value = {
+    id: '',
+    receiveId: undefined
+  }
+  formRef.value?.resetFields()
+}
+</script>

From 1b30ca07ed539d58b73444c0fc3f63bacb78040a Mon Sep 17 00:00:00 2001
From: youkehai <youkehai@darryring.com>
Date: Mon, 25 Sep 2023 11:31:13 +0800
Subject: [PATCH 3/3] =?UTF-8?q?feat:=20=E5=AF=B9=E9=BD=90=E5=90=8E?=
 =?UTF-8?q?=E7=AB=AF-=E5=B7=A5=E4=BD=9C=E6=B5=81=E5=A7=94=E6=B4=BE?=
 =?UTF-8?q?=E7=9A=84=E5=8F=82=E6=95=B0?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

(cherry picked from commit 0fba0d9a6a81b2e4555128a77985eb89e2cf7125)
---
 .../bpm/processInstance/detail/TaskDelegateForm.vue    | 10 +++++-----
 1 file changed, 5 insertions(+), 5 deletions(-)

diff --git a/src/views/bpm/processInstance/detail/TaskDelegateForm.vue b/src/views/bpm/processInstance/detail/TaskDelegateForm.vue
index 99c6cc7e..dc757a0c 100644
--- a/src/views/bpm/processInstance/detail/TaskDelegateForm.vue
+++ b/src/views/bpm/processInstance/detail/TaskDelegateForm.vue
@@ -7,8 +7,8 @@
       :rules="formRules"
       label-width="110px"
     >
-      <el-form-item label="接收人" prop="receiveId">
-        <el-select v-model="formData.receiveId" clearable style="width: 100%">
+      <el-form-item label="接收人" prop="delegateUserId">
+        <el-select v-model="formData.delegateUserId" clearable style="width: 100%">
           <el-option
             v-for="item in userList"
             :key="item.id"
@@ -37,10 +37,10 @@ const dialogVisible = ref(false) // 弹窗的是否展示
 const formLoading = ref(false) // 表单的加载中
 const formData = ref({
   id: '',
-  receiveId: undefined
+  delegateUserId: undefined
 })
 const formRules = ref({
-  receiveId: [{ required: true, message: '接收人不能为空', trigger: 'change' }]
+  delegateUserId: [{ required: true, message: '接收人不能为空', trigger: 'change' }]
 })
 
 const formRef = ref() // 表单 Ref
@@ -79,7 +79,7 @@ const submitForm = async () => {
 const resetForm = () => {
   formData.value = {
     id: '',
-    receiveId: undefined
+    delegateUserId: undefined
   }
   formRef.value?.resetFields()
 }