From eb1b614eb1a4753ca0a005cf64b5f9274959e3af Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=E7=96=AF=E7=8B=82=E7=9A=84=E7=8B=AE=E5=AD=90Li?=
 <15040126243@163.com>
Date: Mon, 20 May 2024 11:45:08 +0800
Subject: [PATCH 01/19] =?UTF-8?q?fix=20=E4=BF=AE=E5=A4=8D=20=E9=83=A8?=
 =?UTF-8?q?=E7=BD=B2=E8=B7=AF=E5=BE=84=E9=94=99=E8=AF=AF?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .env.production | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/.env.production b/.env.production
index 2700ee0..9188c63 100644
--- a/.env.production
+++ b/.env.production
@@ -11,7 +11,7 @@ VITE_APP_CONTEXT_PATH = '/'
 VITE_APP_MONITRO_ADMIN = '/admin/applications'
 
 # SnailJob 控制台地址
-VITE_APP_SNAILJOB_ADMIN = 'http://localhost:8800/snail-job'
+VITE_APP_SNAILJOB_ADMIN = '/snail-job'
 
 # 生产环境
 VITE_APP_BASE_API = '/prod-api'

From 83bbac303ed8403db95dee02346d4d6eda22ab45 Mon Sep 17 00:00:00 2001
From: dap <dap@qq.com>
Date: Tue, 21 May 2024 09:37:28 +0800
Subject: [PATCH 02/19] =?UTF-8?q?fix:=20bpmn=E7=9B=B8=E5=85=B3type?=
 =?UTF-8?q?=E7=AC=AC=E4=B8=80=E6=AC=A1=E5=AE=89=E8=A3=85=E4=BE=9D=E8=B5=96?=
 =?UTF-8?q?&=E8=BF=90=E8=A1=8C=E6=8A=A5=E9=94=99?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/bpmn/hooks/usePanel.ts                    | 2 +-
 src/bpmn/hooks/useParseElement.ts             | 2 +-
 src/bpmn/index.vue                            | 2 +-
 src/bpmn/panel/GatewayPanel.vue               | 4 ++--
 src/bpmn/panel/ParticipantPanel.vue           | 4 ++--
 src/bpmn/panel/ProcessPanel.vue               | 4 ++--
 src/bpmn/panel/SequenceFlowPanel.vue          | 4 ++--
 src/bpmn/panel/StartEndPanel.vue              | 4 ++--
 src/bpmn/panel/SubProcessPanel.vue            | 4 ++--
 src/bpmn/panel/TaskPanel.vue                  | 4 ++--
 src/bpmn/panel/index.vue                      | 2 +-
 src/bpmn/panel/property/ExecutionListener.vue | 4 ++--
 src/bpmn/panel/property/ListenerParam.vue     | 2 +-
 src/bpmn/panel/property/TaskListener.vue      | 4 ++--
 src/components/BpmnView/index.vue             | 2 +-
 src/store/modules/modeler.ts                  | 2 +-
 16 files changed, 25 insertions(+), 25 deletions(-)

diff --git a/src/bpmn/hooks/usePanel.ts b/src/bpmn/hooks/usePanel.ts
index d92b7d7..ace579b 100644
--- a/src/bpmn/hooks/usePanel.ts
+++ b/src/bpmn/hooks/usePanel.ts
@@ -1,5 +1,5 @@
 import showConfig from '../assets/showConfig';
-import { ModdleElement } from 'bpmn';
+import type { ModdleElement } from 'bpmn';
 import useModelerStore from '@/store/modules/modeler';
 import { MultiInstanceTypeEnum } from '@/enums/bpmn/IndexEnums';
 interface Options {
diff --git a/src/bpmn/hooks/useParseElement.ts b/src/bpmn/hooks/useParseElement.ts
index a5a255d..e1a6054 100644
--- a/src/bpmn/hooks/useParseElement.ts
+++ b/src/bpmn/hooks/useParseElement.ts
@@ -1,4 +1,4 @@
-import { ModdleElement } from 'bpmn';
+import type { ModdleElement } from 'bpmn';
 
 interface Options {
   element: ModdleElement;
diff --git a/src/bpmn/index.vue b/src/bpmn/index.vue
index 924a838..15437c8 100644
--- a/src/bpmn/index.vue
+++ b/src/bpmn/index.vue
@@ -90,7 +90,7 @@ import 'bpmn-js/dist/assets/bpmn-font/css/bpmn.css';
 import 'bpmn-js/dist/assets/bpmn-font/css/bpmn-codes.css';
 import 'bpmn-js/dist/assets/bpmn-font/css/bpmn-embedded.css';
 import './assets/style/index.scss';
-import { Canvas, Modeler } from 'bpmn';
+import type { Canvas, Modeler } from 'bpmn';
 import PropertyPanel from './panel/index.vue';
 import BpmnModeler from 'bpmn-js/lib/Modeler.js';
 import defaultXML from './assets/defaultXML';
diff --git a/src/bpmn/panel/GatewayPanel.vue b/src/bpmn/panel/GatewayPanel.vue
index 5931539..20cc134 100644
--- a/src/bpmn/panel/GatewayPanel.vue
+++ b/src/bpmn/panel/GatewayPanel.vue
@@ -41,8 +41,8 @@
 <script setup lang="ts">
 import useParseElement from '../hooks/useParseElement';
 import usePanel from '../hooks/usePanel';
-import { Modeler, ModdleElement } from 'bpmn';
-import { GatewayPanel } from 'bpmnDesign';
+import type { Modeler, ModdleElement } from 'bpmn';
+import type { GatewayPanel } from 'bpmnDesign';
 import ExecutionListener from './property/ExecutionListener.vue';
 
 interface PropType {
diff --git a/src/bpmn/panel/ParticipantPanel.vue b/src/bpmn/panel/ParticipantPanel.vue
index cca28bd..b1d42e6 100644
--- a/src/bpmn/panel/ParticipantPanel.vue
+++ b/src/bpmn/panel/ParticipantPanel.vue
@@ -42,8 +42,8 @@
 import useParseElement from '../hooks/useParseElement';
 import usePanel from '../hooks/usePanel';
 import ExecutionListener from './property/ExecutionListener.vue';
-import { ModdleElement } from 'bpmn';
-import { ParticipantPanel } from 'bpmnDesign';
+import type { ModdleElement } from 'bpmn';
+import type { ParticipantPanel } from 'bpmnDesign';
 
 interface PropType {
   element: ModdleElement;
diff --git a/src/bpmn/panel/ProcessPanel.vue b/src/bpmn/panel/ProcessPanel.vue
index 7d9a359..9e118e2 100644
--- a/src/bpmn/panel/ProcessPanel.vue
+++ b/src/bpmn/panel/ProcessPanel.vue
@@ -43,8 +43,8 @@
 import ExecutionListener from './property/ExecutionListener.vue';
 import useParseElement from '../hooks/useParseElement';
 import usePanel from '../hooks/usePanel';
-import { Modeler, ModdleElement } from 'bpmn';
-import { ProcessPanel } from 'bpmnDesign';
+import type { Modeler, ModdleElement } from 'bpmn';
+import type { ProcessPanel } from 'bpmnDesign';
 
 const { proxy } = getCurrentInstance() as ComponentInternalInstance;
 
diff --git a/src/bpmn/panel/SequenceFlowPanel.vue b/src/bpmn/panel/SequenceFlowPanel.vue
index fd8ad3c..eac8227 100644
--- a/src/bpmn/panel/SequenceFlowPanel.vue
+++ b/src/bpmn/panel/SequenceFlowPanel.vue
@@ -49,8 +49,8 @@ import useParseElement from '../hooks/useParseElement';
 import useModelerStore from '@/store/modules/modeler';
 import usePanel from '../hooks/usePanel';
 import ExecutionListener from './property/ExecutionListener.vue';
-import { Modeler, ModdleElement } from 'bpmn';
-import { SequenceFlowPanel } from 'bpmnDesign';
+import type { Modeler, ModdleElement } from 'bpmn';
+import type { SequenceFlowPanel } from 'bpmnDesign';
 
 interface PropType {
   element: ModdleElement;
diff --git a/src/bpmn/panel/StartEndPanel.vue b/src/bpmn/panel/StartEndPanel.vue
index d43ed80..bde1212 100644
--- a/src/bpmn/panel/StartEndPanel.vue
+++ b/src/bpmn/panel/StartEndPanel.vue
@@ -42,8 +42,8 @@
 import ExecutionListener from './property/ExecutionListener.vue';
 import useParseElement from '../hooks/useParseElement';
 import usePanel from '../hooks/usePanel';
-import { Modeler, ModdleElement } from 'bpmn';
-import { StartEndPanel } from 'bpmnDesign';
+import type { Modeler, ModdleElement } from 'bpmn';
+import type { StartEndPanel } from 'bpmnDesign';
 
 interface PropType {
   element: ModdleElement;
diff --git a/src/bpmn/panel/SubProcessPanel.vue b/src/bpmn/panel/SubProcessPanel.vue
index e0cedcb..3490fff 100644
--- a/src/bpmn/panel/SubProcessPanel.vue
+++ b/src/bpmn/panel/SubProcessPanel.vue
@@ -111,8 +111,8 @@
 import ExecutionListener from './property/ExecutionListener.vue';
 import useParseElement from '../hooks/useParseElement';
 import usePanel from '../hooks/usePanel';
-import { ModdleElement } from 'bpmn';
-import { SubProcessPanel } from 'bpmnDesign';
+import type { ModdleElement } from 'bpmn';
+import type { SubProcessPanel } from 'bpmnDesign';
 import { MultiInstanceTypeEnum } from '@/enums/bpmn/IndexEnums';
 
 interface PropType {
diff --git a/src/bpmn/panel/TaskPanel.vue b/src/bpmn/panel/TaskPanel.vue
index bc037ee..358fba9 100644
--- a/src/bpmn/panel/TaskPanel.vue
+++ b/src/bpmn/panel/TaskPanel.vue
@@ -243,8 +243,8 @@ import RoleSelect from '@/components/RoleSelect';
 import ExecutionListener from './property/ExecutionListener.vue';
 import TaskListener from './property/TaskListener.vue';
 import DueDate from './property/DueDate.vue';
-import { ModdleElement } from 'bpmn';
-import { TaskPanel } from 'bpmnDesign';
+import type { ModdleElement } from 'bpmn';
+import type { TaskPanel } from 'bpmnDesign';
 import { AllocationTypeEnum, MultiInstanceTypeEnum, SpecifyDescEnum } from '@/enums/bpmn/IndexEnums';
 import { UserVO } from '@/api/system/user/types';
 import { RoleVO } from '@/api/system/role/types';
diff --git a/src/bpmn/panel/index.vue b/src/bpmn/panel/index.vue
index eecb0cb..445571a 100644
--- a/src/bpmn/panel/index.vue
+++ b/src/bpmn/panel/index.vue
@@ -13,7 +13,7 @@ import GatewayPanel from './GatewayPanel.vue';
 import SequenceFlowPanel from './SequenceFlowPanel.vue';
 import ParticipantPanel from './ParticipantPanel.vue';
 import SubProcessPanel from './SubProcessPanel.vue';
-import { Modeler, ModdleElement } from 'bpmn';
+import type { Modeler, ModdleElement } from 'bpmn';
 const { proxy } = getCurrentInstance() as ComponentInternalInstance;
 interface propsType {
   modeler: Modeler;
diff --git a/src/bpmn/panel/property/ExecutionListener.vue b/src/bpmn/panel/property/ExecutionListener.vue
index 7620cf3..3c584cb 100644
--- a/src/bpmn/panel/property/ExecutionListener.vue
+++ b/src/bpmn/panel/property/ExecutionListener.vue
@@ -90,8 +90,8 @@
 <script setup lang="ts">
 import ListenerParam from './ListenerParam.vue';
 import { VxeTableEvents, VxeTableInstance, VxeTablePropTypes } from 'vxe-table';
-import { ExecutionListenerVO } from 'bpmnDesign';
-import { Moddle, Modeler, ModdleElement } from 'bpmn';
+import type { ExecutionListenerVO } from 'bpmnDesign';
+import type { Moddle, Modeler, ModdleElement } from 'bpmn';
 
 import usePanel from '../../hooks/usePanel';
 import useDialog from '@/hooks/useDialog';
diff --git a/src/bpmn/panel/property/ListenerParam.vue b/src/bpmn/panel/property/ListenerParam.vue
index 334249b..21c6de1 100644
--- a/src/bpmn/panel/property/ListenerParam.vue
+++ b/src/bpmn/panel/property/ListenerParam.vue
@@ -47,7 +47,7 @@
 
 <script setup lang="ts">
 import { VXETable, VxeTableInstance, VxeTablePropTypes } from 'vxe-table';
-import { ParamVO } from 'bpmnDesign';
+import type { ParamVO } from 'bpmnDesign';
 import useDialog from '@/hooks/useDialog';
 
 interface PropType {
diff --git a/src/bpmn/panel/property/TaskListener.vue b/src/bpmn/panel/property/TaskListener.vue
index db774e4..9a32c47 100644
--- a/src/bpmn/panel/property/TaskListener.vue
+++ b/src/bpmn/panel/property/TaskListener.vue
@@ -91,8 +91,8 @@
 <script setup lang="ts">
 import ListenerParam from './ListenerParam.vue';
 import { VxeTableEvents, VxeTableInstance, VxeTablePropTypes } from 'vxe-table';
-import { TaskListenerVO } from 'bpmnDesign';
-import { ModdleElement } from 'bpmn';
+import type { TaskListenerVO } from 'bpmnDesign';
+import type { ModdleElement } from 'bpmn';
 
 import usePanel from '../../hooks/usePanel';
 import useDialog from '@/hooks/useDialog';
diff --git a/src/components/BpmnView/index.vue b/src/components/BpmnView/index.vue
index a79f084..f07bc21 100644
--- a/src/components/BpmnView/index.vue
+++ b/src/components/BpmnView/index.vue
@@ -37,7 +37,7 @@ import BpmnViewer from 'bpmn-js/lib/Viewer';
 import MoveCanvasModule from 'diagram-js/lib/navigation/movecanvas';
 import ZoomScrollModule from 'diagram-js/lib/navigation/zoomscroll';
 import { ModuleDeclaration } from 'didi';
-import { Canvas, ModdleElement } from 'bpmn';
+import type { Canvas, ModdleElement } from 'bpmn';
 import EventBus from 'diagram-js/lib/core/EventBus';
 import Overlays from 'diagram-js/lib/features/overlays/Overlays';
 import processApi from '@/api/workflow/processInstance/index';
diff --git a/src/store/modules/modeler.ts b/src/store/modules/modeler.ts
index 7b19c1a..204f450 100644
--- a/src/store/modules/modeler.ts
+++ b/src/store/modules/modeler.ts
@@ -1,4 +1,4 @@
-import { Modeler, Modeling, Canvas, ElementRegistry, Moddle, BpmnFactory } from 'bpmn';
+import type { Modeler, Modeling, Canvas, ElementRegistry, Moddle, BpmnFactory } from 'bpmn';
 
 type ModelerStore = {
   modeler: Modeler | undefined;

From 7a335b3438b9bf1bdbe953793bd02468fd231c1b Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=E7=96=AF=E7=8B=82=E7=9A=84=E7=8B=AE=E5=AD=90Li?=
 <15040126243@163.com>
Date: Tue, 21 May 2024 10:01:25 +0800
Subject: [PATCH 03/19] =?UTF-8?q?update=20=E4=BC=98=E5=8C=96=20=E5=88=A0?=
 =?UTF-8?q?=E9=99=A4=E6=9C=AA=E4=BD=BF=E7=94=A8=E4=BE=9D=E8=B5=96?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 package.json   | 12 +-----------
 vite.config.ts |  1 -
 2 files changed, 1 insertion(+), 12 deletions(-)

diff --git a/package.json b/package.json
index 5154ed0..3557360 100644
--- a/package.json
+++ b/package.json
@@ -20,15 +20,12 @@
   "dependencies": {
     "@element-plus/icons-vue": "2.3.1",
     "@highlightjs/vue-plugin": "2.1.0",
-    "@lezer/common": "1.2.1",
     "@vueup/vue-quill": "1.2.0",
     "@vueuse/core": "10.9.0",
     "animate.css": "4.1.1",
     "await-to-js": "3.0.0",
     "axios": "1.6.8",
     "bpmn-js": "16.4.0",
-    "camunda-bpmn-js-behaviors": "1.2.2",
-    "camunda-bpmn-moddle": "7.0.1",
     "crypto-js": "4.2.0",
     "diagram-js": "12.3.0",
     "didi": "9.0.2",
@@ -40,21 +37,15 @@
     "image-conversion": "^2.1.1",
     "js-cookie": "3.0.5",
     "jsencrypt": "3.3.2",
-    "moddle": "6.2.3",
     "nprogress": "0.2.0",
-    "path-browserify": "1.0.1",
-    "path-to-regexp": "6.2.1",
     "pinia": "2.1.7",
-    "preact": "10.19.7",
     "screenfull": "6.0.2",
-    "vform3-builds": "3.0.10",
     "vue": "3.4.25",
     "vue-cropper": "1.1.1",
     "vue-i18n": "9.10.2",
     "vue-router": "4.3.2",
     "vue-types": "5.1.1",
-    "vxe-table": "4.5.22",
-    "zeebe-bpmn-moddle": "1.0.0"
+    "vxe-table": "4.5.22"
   },
   "devDependencies": {
     "@iconify/json": "2.2.201",
@@ -64,7 +55,6 @@
     "@types/js-cookie": "3.0.6",
     "@types/node": "18.18.2",
     "@types/nprogress": "0.2.3",
-    "@types/path-browserify": "1.0.2",
     "@typescript-eslint/eslint-plugin": "7.3.1",
     "@typescript-eslint/parser": "7.3.1",
     "@unocss/preset-attributify": "0.58.6",
diff --git a/vite.config.ts b/vite.config.ts
index eea111e..f8b1200 100644
--- a/vite.config.ts
+++ b/vite.config.ts
@@ -61,7 +61,6 @@ export default defineConfig(({ mode, command }: ConfigEnv): UserConfig => {
         'pinia',
         'axios',
         '@vueuse/core',
-        'path-to-regexp',
         'echarts',
         'vue-i18n',
         '@vueup/vue-quill',

From 57fd3099078bc0d6ebeb49c727107eab1acce6bd Mon Sep 17 00:00:00 2001
From: dap <dap@qq.com>
Date: Wed, 29 May 2024 09:32:49 +0800
Subject: [PATCH 04/19] =?UTF-8?q?fix:=20=E7=B1=BB=E5=9E=8B=E6=8A=A5?=
 =?UTF-8?q?=E9=94=99?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/types/global.d.ts | 2 --
 1 file changed, 2 deletions(-)

diff --git a/src/types/global.d.ts b/src/types/global.d.ts
index 17476a3..229e181 100644
--- a/src/types/global.d.ts
+++ b/src/types/global.d.ts
@@ -4,8 +4,6 @@ import { LanguageEnum } from '@/enums/LanguageEnum';
 declare global {
   /** vue Instance */
   declare type ComponentInternalInstance = ComponentInstance;
-  /**vue */
-  declare type PropType<T> = VuePropType<T>;
 
   /**
    * 界面字段隐藏属性

From c2fdbc66b2ff9b5987049c7b55488e44e7d5f485 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=E7=96=AF=E7=8B=82=E7=9A=84=E7=8B=AE=E5=AD=90Li?=
 <15040126243@163.com>
Date: Wed, 29 May 2024 18:36:35 +0800
Subject: [PATCH 05/19] =?UTF-8?q?update=20=E7=A7=BB=E9=99=A4=20=E8=A1=A8?=
 =?UTF-8?q?=E5=8D=95=E6=9E=84=E5=BB=BA=E8=8F=9C=E5=8D=95(=E6=B2=A1?=
 =?UTF-8?q?=E6=9C=89=E5=8F=AF=E7=94=A8=E7=BB=84=E4=BB=B6=20=E7=94=A8?=
 =?UTF-8?q?=E5=A4=84=E4=B8=8D=E5=A4=A7=E4=BB=A5=E5=90=8E=E5=86=8D=E8=80=83?=
 =?UTF-8?q?=E8=99=91)?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/views/tool/build/index.vue | 3 ---
 1 file changed, 3 deletions(-)
 delete mode 100644 src/views/tool/build/index.vue

diff --git a/src/views/tool/build/index.vue b/src/views/tool/build/index.vue
deleted file mode 100644
index ef0c079..0000000
--- a/src/views/tool/build/index.vue
+++ /dev/null
@@ -1,3 +0,0 @@
-<template>
-  <div>表单构建(由于此功能的开源组件不支持 VUE3+TS 故暂时无法使用) <svg-icon icon-class="build" /></div>
-</template>

From 2c9daae15362e9c759324e10abffe4f5c111523f Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=E7=96=AF=E7=8B=82=E7=9A=84=E7=8B=AE=E5=AD=90Li?=
 <15040126243@163.com>
Date: Fri, 31 May 2024 11:25:03 +0800
Subject: [PATCH 06/19] =?UTF-8?q?update=20=E6=9B=B4=E6=94=B9=20=E5=B7=A5?=
 =?UTF-8?q?=E4=BD=9C=E6=B5=81=20=E6=B5=8B=E8=AF=95=E7=94=A8=E4=BE=8B?=
 =?UTF-8?q?=E6=8E=A5=E5=8F=A3=E8=B7=AF=E5=BE=84?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/api/workflow/leave/index.ts | 10 +++++-----
 1 file changed, 5 insertions(+), 5 deletions(-)

diff --git a/src/api/workflow/leave/index.ts b/src/api/workflow/leave/index.ts
index 36c6fdf..4e6f363 100644
--- a/src/api/workflow/leave/index.ts
+++ b/src/api/workflow/leave/index.ts
@@ -10,7 +10,7 @@ import { LeaveVO, LeaveQuery, LeaveForm } from '@/api/workflow/leave/types';
 
 export const listLeave = (query?: LeaveQuery): AxiosPromise<LeaveVO[]> => {
   return request({
-    url: '/demo/leave/list',
+    url: '/workflow/leave/list',
     method: 'get',
     params: query
   });
@@ -22,7 +22,7 @@ export const listLeave = (query?: LeaveQuery): AxiosPromise<LeaveVO[]> => {
  */
 export const getLeave = (id: string | number): AxiosPromise<LeaveVO> => {
   return request({
-    url: '/demo/leave/' + id,
+    url: '/workflow/leave/' + id,
     method: 'get'
   });
 };
@@ -33,7 +33,7 @@ export const getLeave = (id: string | number): AxiosPromise<LeaveVO> => {
  */
 export const addLeave = (data: LeaveForm): AxiosPromise<LeaveVO> => {
   return request({
-    url: '/demo/leave',
+    url: '/workflow/leave',
     method: 'post',
     data: data
   });
@@ -45,7 +45,7 @@ export const addLeave = (data: LeaveForm): AxiosPromise<LeaveVO> => {
  */
 export const updateLeave = (data: LeaveForm): AxiosPromise<LeaveVO> => {
   return request({
-    url: '/demo/leave',
+    url: '/workflow/leave',
     method: 'put',
     data: data
   });
@@ -57,7 +57,7 @@ export const updateLeave = (data: LeaveForm): AxiosPromise<LeaveVO> => {
  */
 export const delLeave = (id: string | number | Array<string | number>) => {
   return request({
-    url: '/demo/leave/' + id,
+    url: '/workflow/leave/' + id,
     method: 'delete'
   });
 };

From 58e6fdef78e4e8a8cb3bd7090ef900e9032cf714 Mon Sep 17 00:00:00 2001
From: gssong <1742057357@qq.com>
Date: Fri, 31 May 2024 22:11:25 +0800
Subject: [PATCH 07/19] =?UTF-8?q?update=20=E4=BC=98=E5=8C=96=E6=B5=81?=
 =?UTF-8?q?=E7=A8=8B=E5=AE=9E=E4=BE=8B=E6=8E=A5=E5=8F=A3=E5=85=A8=E9=83=A8?=
 =?UTF-8?q?=E6=8C=89=E7=85=A7=E4=B8=9A=E5=8A=A1id=E6=93=8D=E4=BD=9C?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/api/workflow/processInstance/index.ts    | 36 ++++++++++----------
 src/components/BpmnView/index.vue            |  4 +--
 src/components/Process/approvalRecord.vue    |  6 ++--
 src/views/workflow/leave/index.vue           |  2 +-
 src/views/workflow/leave/leaveEdit.vue       |  2 +-
 src/views/workflow/processInstance/index.vue | 13 ++++---
 6 files changed, 33 insertions(+), 30 deletions(-)

diff --git a/src/api/workflow/processInstance/index.ts b/src/api/workflow/processInstance/index.ts
index 80f122f..b949b51 100644
--- a/src/api/workflow/processInstance/index.ts
+++ b/src/api/workflow/processInstance/index.ts
@@ -29,33 +29,33 @@ export const getPageByFinish = (query: ProcessInstanceQuery): AxiosPromise<Proce
 };
 
 /**
- * 通过流程实例id获取历史流程图
+ * 通过业务id获取历史流程图
  */
-export const getHistoryImage = (processInstanceId: string) => {
+export const getHistoryImage = (businessKey: string) => {
   return request({
-    url: `/workflow/processInstance/getHistoryImage/${processInstanceId}` + '?t' + Math.random(),
+    url: `/workflow/processInstance/getHistoryImage/${businessKey}` + '?t' + Math.random(),
     method: 'get'
   });
 };
 
 /**
- * 通过流程实例id获取历史流程图运行中，历史等节点
+ * 通过业务id获取历史流程图运行中，历史等节点
  */
-export const getHistoryList = (instanceId: string): AxiosPromise<Record<string, any>> => {
+export const getHistoryList = (businessKey: string): AxiosPromise<Record<string, any>> => {
   return request({
-    url: `/workflow/processInstance/getHistoryList/${instanceId}` + '?t' + Math.random(),
+    url: `/workflow/processInstance/getHistoryList/${businessKey}` + '?t' + Math.random(),
     method: 'get'
   });
 };
 
 /**
  * 获取审批记录
- * @param processInstanceId 流程实例id
+ * @param businessKey 业务id
  * @returns
  */
-export const getHistoryRecord = (processInstanceId: string) => {
+export const getHistoryRecord = (businessKey: string) => {
   return request({
-    url: `/workflow/processInstance/getHistoryRecord/${processInstanceId}`,
+    url: `/workflow/processInstance/getHistoryRecord/${businessKey}`,
     method: 'get'
   });
 };
@@ -75,24 +75,24 @@ export const deleteRunInstance = (data: object) => {
 
 /**
  * 运行中的实例 删除程实例，删除历史记录，删除业务与流程关联信息
- * @param processInstanceId 流程实例id
+ * @param businessKey 业务id
  * @returns
  */
-export const deleteRunAndHisInstance = (processInstanceId: string | string[]) => {
+export const deleteRunAndHisInstance = (businessKey: string | string[]) => {
   return request({
-    url: `/workflow/processInstance/deleteRunAndHisInstance/${processInstanceId}`,
+    url: `/workflow/processInstance/deleteRunAndHisInstance/${businessKey}`,
     method: 'delete'
   });
 };
 
 /**
  * 已完成的实例 删除程实例，删除历史记录，删除业务与流程关联信息
- * @param processInstanceId 流程实例id
+ * @param businessKey 业务id
  * @returns
  */
-export const deleteFinishAndHisInstance = (processInstanceId: string | string[]) => {
+export const deleteFinishAndHisInstance = (businessKey: string | string[]) => {
   return request({
-    url: `/workflow/processInstance/deleteFinishAndHisInstance/${processInstanceId}`,
+    url: `/workflow/processInstance/deleteFinishAndHisInstance/${businessKey}`,
     method: 'delete'
   });
 };
@@ -112,12 +112,12 @@ export const getPageByCurrent = (query: ProcessInstanceQuery): AxiosPromise<Proc
 
 /**
  * 撤销流程
- * @param processInstanceId 流程实例id
+ * @param businessKey 业务id
  * @returns
  */
-export const cancelProcessApply = (processInstanceId: string) => {
+export const cancelProcessApply = (businessKey: string) => {
   return request({
-    url: `/workflow/processInstance/cancelProcessApply/${processInstanceId}`,
+    url: `/workflow/processInstance/cancelProcessApply/${businessKey}`,
     method: 'post'
   });
 };
diff --git a/src/components/BpmnView/index.vue b/src/components/BpmnView/index.vue
index f07bc21..3d04246 100644
--- a/src/components/BpmnView/index.vue
+++ b/src/components/BpmnView/index.vue
@@ -51,7 +51,7 @@ const loading = ref(false);
 const bpmnVisible = ref(true);
 const historyList = ref([]);
 
-const init = (instanceId) => {
+const init = (businessKey) => {
   loading.value = true;
   bpmnVisible.value = true;
   nextTick(async () => {
@@ -67,7 +67,7 @@ const init = (instanceId) => {
         MoveCanvasModule
       ] as ModuleDeclaration[]
     });
-    const resp = await processApi.getHistoryList(instanceId);
+    const resp = await processApi.getHistoryList(businessKey);
     xml.value = resp.data.xml;
     taskList.value = resp.data.taskList;
     historyList.value = resp.data.historyList;
diff --git a/src/components/Process/approvalRecord.vue b/src/components/Process/approvalRecord.vue
index cbce87a..37667ca 100644
--- a/src/components/Process/approvalRecord.vue
+++ b/src/components/Process/approvalRecord.vue
@@ -67,17 +67,17 @@ const tabActiveName = ref('bpmn');
 const bpmnViewRef = ref<BpmnView>();
 
 //初始化查询审批记录
-const init = async (instanceId: string) => {
+const init = async (businessKey: string) => {
   visible.value = true;
   loading.value = true;
   tabActiveName.value = 'bpmn';
   historyList.value = [];
-  processApi.getHistoryRecord(instanceId).then((resp) => {
+  processApi.getHistoryRecord(businessKey).then((resp) => {
     historyList.value = resp.data;
     loading.value = false;
   });
   await nextTick(() => {
-    bpmnViewRef.value.init(instanceId);
+    bpmnViewRef.value.init(businessKey);
   });
 };
 
diff --git a/src/views/workflow/leave/index.vue b/src/views/workflow/leave/index.vue
index 23d5442..e47768d 100644
--- a/src/views/workflow/leave/index.vue
+++ b/src/views/workflow/leave/index.vue
@@ -93,7 +93,7 @@
               size="small"
               type="primary"
               icon="Notification"
-              @click="handleCancelProcessApply(scope.row.processInstanceVo.id)"
+              @click="handleCancelProcessApply(scope.row.id)"
               >撤销</el-button
             >
           </template>
diff --git a/src/views/workflow/leave/leaveEdit.vue b/src/views/workflow/leave/leaveEdit.vue
index e978ad8..b8742f7 100644
--- a/src/views/workflow/leave/leaveEdit.vue
+++ b/src/views/workflow/leave/leaveEdit.vue
@@ -243,7 +243,7 @@ const handleStartWorkFlow = async (data: LeaveVO) => {
 };
 //审批记录
 const handleApprovalRecord = () => {
-  approvalRecordRef.value.init(processInstanceId.value);
+  approvalRecordRef.value.init(form.value.id);
 };
 //提交回调
 const submitCallback = async () => {
diff --git a/src/views/workflow/processInstance/index.vue b/src/views/workflow/processInstance/index.vue
index 4f994af..7c60880 100644
--- a/src/views/workflow/processInstance/index.vue
+++ b/src/views/workflow/processInstance/index.vue
@@ -167,6 +167,8 @@ const categoryTreeRef = ref<ElTreeInstance>();
 const loading = ref(true);
 // 选中数组
 const ids = ref<Array<any>>([]);
+// 选中业务id数组
+const businessKeys = ref<Array<any>>([]);
 // 非单个禁用
 const single = ref(true);
 // 非多个禁用
@@ -257,6 +259,7 @@ const resetQuery = () => {
 // 多选框选中数据
 const handleSelectionChange = (selection: ProcessInstanceVO[]) => {
   ids.value = selection.map((item: any) => item.id);
+  businessKeys.value = selection.map((item: any) => item.businessKey);
   single.value = selection.length !== 1;
   multiple.value = !selection.length;
 };
@@ -281,14 +284,14 @@ const getProcessInstanceFinishList = () => {
 
 /** 删除按钮操作 */
 const handleDelete = async (row: any) => {
-  const id = row.id || ids.value;
-  await proxy?.$modal.confirm('是否确认删除id为【' + id + '】的数据项？');
+  const businessKey = row.businessKey || businessKeys.value;
+  await proxy?.$modal.confirm('是否确认删除业务id为【' + businessKey + '】的数据项？');
   loading.value = true;
   if ('running' === tab.value) {
-    await deleteRunAndHisInstance(id).finally(() => (loading.value = false));
+    await deleteRunAndHisInstance(businessKey).finally(() => (loading.value = false));
     getProcessInstanceRunningList();
   } else {
-    await deleteFinishAndHisInstance(id).finally(() => (loading.value = false));
+    await deleteFinishAndHisInstance(businessKey).finally(() => (loading.value = false));
     getProcessInstanceFinishList();
   }
   proxy?.$modal.msgSuccess('删除成功');
@@ -308,7 +311,7 @@ const handleInvalid = async (row: ProcessInstanceVO) => {
   loading.value = true;
   if ('running' === tab.value) {
     let param = {
-      processInstanceId: row.id,
+      businessKey: row.businessKey,
       deleteReason: deleteReason.value
     };
     await deleteRunInstance(param).finally(() => (loading.value = false));

From d98c2822d50efe0e6952e402f0dfb16b354ee049 Mon Sep 17 00:00:00 2001
From: gssong <1742057357@qq.com>
Date: Sat, 1 Jun 2024 22:00:22 +0800
Subject: [PATCH 08/19] =?UTF-8?q?update=20=E8=B0=83=E6=95=B4=E8=B7=AF?=
 =?UTF-8?q?=E7=94=B1?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/api/workflow/workflowCommon/index.ts | 48 ++++++++++++------------
 src/router/index.ts                      |  4 +-
 src/views/workflow/leave/index.vue       | 10 ++---
 3 files changed, 31 insertions(+), 31 deletions(-)

diff --git a/src/api/workflow/workflowCommon/index.ts b/src/api/workflow/workflowCommon/index.ts
index a90216a..63ce318 100644
--- a/src/api/workflow/workflowCommon/index.ts
+++ b/src/api/workflow/workflowCommon/index.ts
@@ -1,29 +1,29 @@
 import { RouterJumpVo } from '@/api/workflow/workflowCommon/types';
 
 export default {
-    routerJump(routerJumpVo: RouterJumpVo,proxy){
-        if (routerJumpVo.wfNodeConfigVo && routerJumpVo.wfNodeConfigVo.formType === 'static' && routerJumpVo.wfNodeConfigVo.wfFormManageVo) {
-            proxy.$tab.closePage(proxy.$route);
-            proxy.$router.push({
-                path: `${routerJumpVo.wfNodeConfigVo.wfFormManageVo.router}`,
-                query: {
-                    id: routerJumpVo.businessKey,
-                    type: routerJumpVo.type,
-                    taskId: routerJumpVo.taskId
-                }
-            });
-        } else if (routerJumpVo.wfNodeConfigVo && routerJumpVo.wfNodeConfigVo.formType === 'dynamic' && routerJumpVo.wfNodeConfigVo.wfFormManageVo) {
-            proxy.$tab.closePage(proxy.$route);
-            proxy.$router.push({
-                path: `${routerJumpVo.wfNodeConfigVo.wfFormManageVo.router}`,
-                query: {
-                    id: routerJumpVo.businessKey,
-                    type: routerJumpVo.type,
-                    taskId: routerJumpVo.taskId
-                }
-            });
-        }else {
-            proxy?.$modal.msgError('请到模型配置菜单！');
+  routerJump(routerJumpVo: RouterJumpVo, proxy) {
+    if (routerJumpVo.wfNodeConfigVo && routerJumpVo.wfNodeConfigVo.formType === 'static' && routerJumpVo.wfNodeConfigVo.wfFormManageVo) {
+      proxy.$tab.closePage(proxy.$route);
+      proxy.$router.push({
+        path: `${routerJumpVo.wfNodeConfigVo.wfFormManageVo.router}`,
+        query: {
+          id: routerJumpVo.businessKey,
+          type: routerJumpVo.type,
+          taskId: routerJumpVo.taskId
         }
+      });
+    } else if (routerJumpVo.wfNodeConfigVo && routerJumpVo.wfNodeConfigVo.formType === 'dynamic' && routerJumpVo.wfNodeConfigVo.wfFormManageVo) {
+      proxy.$tab.closePage(proxy.$route);
+      proxy.$router.push({
+        path: `${routerJumpVo.wfNodeConfigVo.wfFormManageVo.router}`,
+        query: {
+          id: routerJumpVo.businessKey,
+          type: routerJumpVo.type,
+          taskId: routerJumpVo.taskId
+        }
+      });
+    } else {
+      proxy?.$modal.msgError('请到模型配置菜单！');
     }
-}
\ No newline at end of file
+  }
+};
diff --git a/src/router/index.ts b/src/router/index.ts
index 2343685..b020b4c 100644
--- a/src/router/index.ts
+++ b/src/router/index.ts
@@ -164,7 +164,7 @@ export const dynamicRoutes: RouteRecordRaw[] = [
     ]
   },
   {
-    path: '/demo/leaveEdit',
+    path: '/workflow/leaveEdit',
     component: Layout,
     hidden: true,
     permissions: ['demo:leave:edit'],
@@ -173,7 +173,7 @@ export const dynamicRoutes: RouteRecordRaw[] = [
         path: 'index',
         component: () => import('@/views/workflow/leave/leaveEdit.vue'),
         name: 'leaveEdit',
-        meta: { title: '请假申请', activeMenu: '/demo/leave', noCache: true }
+        meta: { title: '请假申请', activeMenu: '/workflow/leave', noCache: true }
       }
     ]
   }
diff --git a/src/views/workflow/leave/index.vue b/src/views/workflow/leave/index.vue
index e47768d..56ccb2c 100644
--- a/src/views/workflow/leave/index.vue
+++ b/src/views/workflow/leave/index.vue
@@ -184,9 +184,9 @@ const handleSelectionChange = (selection: LeaveVO[]) => {
 /** 新增按钮操作 */
 const handleAdd = () => {
   proxy.$tab.closePage(proxy.$route);
-  proxy.$router.push(`/demo/leaveEdit/index/add/add`);
+  proxy.$router.push(`/workflow/leaveEdit/index/add/add`);
   proxy.$router.push({
-    path: `/demo/leaveEdit/index`,
+    path: `/workflow/leaveEdit/index`,
     query: {
       type: 'add'
     }
@@ -197,7 +197,7 @@ const handleAdd = () => {
 const handleUpdate = (row?: LeaveVO) => {
   proxy.$tab.closePage(proxy.$route);
   proxy.$router.push({
-    path: `/demo/leaveEdit/index`,
+    path: `/workflow/leaveEdit/index`,
     query: {
       id: row.id,
       type: 'update'
@@ -209,7 +209,7 @@ const handleUpdate = (row?: LeaveVO) => {
 const handleView = (row?: LeaveVO) => {
   proxy.$tab.closePage(proxy.$route);
   proxy.$router.push({
-    path: `/demo/leaveEdit/index`,
+    path: `/workflow/leaveEdit/index`,
     query: {
       id: row.id,
       type: 'view'
@@ -229,7 +229,7 @@ const handleDelete = async (row?: LeaveVO) => {
 /** 导出按钮操作 */
 const handleExport = () => {
   proxy?.download(
-    'demo/leave/export',
+    'workflow/leave/export',
     {
       ...queryParams.value
     },

From 9de3f25f6a714175ffed224f3f5c7e9b70735ba0 Mon Sep 17 00:00:00 2001
From: gssong <1742057357@qq.com>
Date: Sat, 1 Jun 2024 22:05:45 +0800
Subject: [PATCH 09/19] =?UTF-8?q?update=20=E8=B0=83=E6=95=B4=E5=AE=A1?=
 =?UTF-8?q?=E6=89=B9=E6=8C=89=E9=92=AE=E5=8A=A0=E8=BD=BD?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/components/Process/submitVerify.vue | 180 +++++++++++++-----------
 1 file changed, 94 insertions(+), 86 deletions(-)

diff --git a/src/components/Process/submitVerify.vue b/src/components/Process/submitVerify.vue
index d71b855..b253276 100644
--- a/src/components/Process/submitVerify.vue
+++ b/src/components/Process/submitVerify.vue
@@ -8,29 +8,43 @@
           <el-checkbox label="3" name="type">短信</el-checkbox>
         </el-checkbox-group>
       </el-form-item>
-      <el-form-item label="附件" v-if="task.businessStatus === 'waiting'">
-        <fileUpload v-model="form.fileId" :fileType="['doc', 'xls', 'ppt', 'txt', 'pdf', 'xlsx', 'docx', 'zip']" :fileSize="'20'"/>
+      <el-form-item v-if="task.businessStatus === 'waiting'" label="附件">
+        <fileUpload v-model="form.fileId" :file-type="['doc', 'xls', 'ppt', 'txt', 'pdf', 'xlsx', 'docx', 'zip']" :file-size="'20'" />
       </el-form-item>
       <el-form-item label="抄送">
-        <el-button type="primary" @click="openUserSelectCopy" icon="Plus" circle />
-          <el-tag v-for="user in selectCopyUserList" :key="user.userId" closable style="margin: 2px" @close="handleCopyCloseTag(user)">
-            {{ user.userName }}
-          </el-tag>
+        <el-button type="primary" icon="Plus" circle @click="openUserSelectCopy" />
+        <el-tag v-for="user in selectCopyUserList" :key="user.userId" closable style="margin: 2px" @close="handleCopyCloseTag(user)">
+          {{ user.userName }}
+        </el-tag>
       </el-form-item>
-      <el-form-item label="审批意见" v-if="task.businessStatus === 'waiting'">
+      <el-form-item v-if="task.businessStatus === 'waiting'" label="审批意见">
         <el-input v-model="form.message" type="textarea" resize="none" />
       </el-form-item>
     </el-form>
     <template #footer>
       <span class="dialog-footer">
-        <el-button v-loading="buttonLoading" type="primary" @click="handleCompleteTask"> 提交 </el-button>
-        <el-button v-if="task.businessStatus === 'waiting'" v-loading="buttonLoading" type="primary" @click="openDelegateTask"> 委托 </el-button>
-        <el-button v-if="task.businessStatus === 'waiting'" v-loading="buttonLoading" type="primary" @click="openTransferTask"> 转办 </el-button>
-        <el-button v-if="task.businessStatus === 'waiting' && task.multiInstance" v-loading="buttonLoading" type="primary" @click="addMultiInstanceUser"> 加签 </el-button>
-        <el-button v-if="task.businessStatus === 'waiting' && task.multiInstance" v-loading="buttonLoading" type="primary" @click="deleteMultiInstanceUser"> 减签 </el-button>
-        <el-button v-if="task.businessStatus === 'waiting'" v-loading="buttonLoading" type="danger" @click="handleTerminationTask"> 终止 </el-button>
-        <el-button v-if="task.businessStatus === 'waiting'" v-loading="buttonLoading" type="danger" @click="handleBackProcessOpen"> 退回 </el-button>
-        <el-button v-loading="buttonLoading" @click="cancel">取消</el-button>
+        <el-button :disabled="buttonDisabled" type="primary" @click="handleCompleteTask"> 提交 </el-button>
+        <el-button v-if="task.businessStatus === 'waiting'" :disabled="buttonDisabled" type="primary" @click="openDelegateTask"> 委托 </el-button>
+        <el-button v-if="task.businessStatus === 'waiting'" :disabled="buttonDisabled" type="primary" @click="openTransferTask"> 转办 </el-button>
+        <el-button
+          v-if="task.businessStatus === 'waiting' && task.multiInstance"
+          :disabled="buttonDisabled"
+          type="primary"
+          @click="addMultiInstanceUser"
+        >
+          加签
+        </el-button>
+        <el-button
+          v-if="task.businessStatus === 'waiting' && task.multiInstance"
+          :disabled="buttonDisabled"
+          type="primary"
+          @click="deleteMultiInstanceUser"
+        >
+          减签
+        </el-button>
+        <el-button v-if="task.businessStatus === 'waiting'" :disabled="buttonDisabled" type="danger" @click="handleTerminationTask"> 终止 </el-button>
+        <el-button v-if="task.businessStatus === 'waiting'" :disabled="buttonDisabled" type="danger" @click="handleBackProcessOpen"> 退回 </el-button>
+        <el-button :disabled="buttonDisabled" @click="cancel">取消</el-button>
       </span>
     </template>
     <!-- 抄送 -->
@@ -40,19 +54,14 @@
     <!-- 委托 -->
     <UserSelect ref="delegateTaskRef" :multiple="false" @confirm-call-back="handleDelegateTask"></UserSelect>
     <!-- 加签组件 -->
-    <multiInstanceUser ref="multiInstanceUserRef" :title="title" @submit-callback='closeDialog' />
+    <multiInstanceUser ref="multiInstanceUserRef" :title="title" @submit-callback="closeDialog" />
 
     <!-- 驳回开始 -->
     <el-dialog v-model="backVisible" draggable title="驳回" width="40%" :close-on-click-modal="false">
-      <el-form v-loading="backLoading" :model="backForm" label-width="120px" v-if="task.businessStatus === 'waiting'">
+      <el-form v-if="task.businessStatus === 'waiting'" v-loading="backLoading" :model="backForm" label-width="120px">
         <el-form-item label="驳回节点">
-          <el-select clearable placeholder="请选择" v-model="backForm.targetActivityId" style="width: 300px">
-            <el-option
-              v-for="item in taskNodeList"
-              :key="item.nodeId"
-              :label="item.nodeName"
-              :value="item.nodeId"
-            />
+          <el-select v-model="backForm.targetActivityId" clearable placeholder="请选择" style="width: 300px">
+            <el-option v-for="item in taskNodeList" :key="item.nodeId" :label="item.nodeName" :value="item.nodeId" />
           </el-select>
         </el-form-item>
         <el-form-item label="消息提醒">
@@ -67,8 +76,8 @@
         </el-form-item>
       </el-form>
       <template #footer>
-        <div class="dialog-footer" style="float: right;padding-bottom: 20px;">
-          <el-button type="primary" v-loading="backLoading" @click="handleBackProcess">确认</el-button>
+        <div class="dialog-footer" style="float: right; padding-bottom: 20px">
+          <el-button v-loading="backLoading" type="primary" @click="handleBackProcess">确认</el-button>
           <el-button v-loading="backLoading" @click="backVisible = false">取消</el-button>
         </div>
       </template>
@@ -81,7 +90,7 @@
 import { ref } from 'vue';
 import { ComponentInternalInstance } from 'vue';
 import { ElForm } from 'element-plus';
-import { completeTask, backProcess, getTaskById,transferTask,terminationTask,getTaskNodeList,delegateTask } from '@/api/workflow/task';
+import { completeTask, backProcess, getTaskById, transferTask, terminationTask, getTaskNodeList, delegateTask } from '@/api/workflow/task';
 import UserSelect from '@/components/UserSelect';
 import MultiInstanceUser from '@/components/Process/multiInstanceUser.vue';
 const { proxy } = getCurrentInstance() as ComponentInternalInstance;
@@ -91,7 +100,7 @@ const userSelectCopyRef = ref<InstanceType<typeof UserSelect>>();
 const transferTaskRef = ref<InstanceType<typeof UserSelect>>();
 const delegateTaskRef = ref<InstanceType<typeof UserSelect>>();
 
-  //加签组件
+//加签组件
 const multiInstanceUserRef = ref<InstanceType<typeof MultiInstanceUser>>();
 
 const props = defineProps({
@@ -103,7 +112,7 @@ const props = defineProps({
 //遮罩层
 const loading = ref(true);
 //按钮
-const buttonLoading = ref(true);
+const buttonDisabled = ref(true);
 //任务id
 const taskId = ref<string>('');
 //抄送人
@@ -166,23 +175,23 @@ const backForm = ref<Record<string, any>>({
   messageType: ['1']
 });
 const closeDialog = () => {
-  dialog.visible = false
-}
+  dialog.visible = false;
+};
 //打开弹窗
 const openDialog = (id?: string) => {
-  selectCopyUserIds.value = undefined
-  selectCopyUserList.value = []
-  form.value.fileId = undefined
+  selectCopyUserIds.value = undefined;
+  selectCopyUserList.value = [];
+  form.value.fileId = undefined;
   taskId.value = id;
   form.value.message = undefined;
   dialog.visible = true;
   loading.value = true;
-  buttonLoading.value = true;
+  buttonDisabled.value = true;
   nextTick(() => {
     getTaskById(taskId.value).then((response) => {
       task.value = response.data;
       loading.value = false;
-      buttonLoading.value = false;
+      buttonDisabled.value = false;
     });
   });
 };
@@ -194,42 +203,42 @@ const emits = defineEmits(['submitCallback', 'cancelCallback']);
 const handleCompleteTask = async () => {
   form.value.taskId = taskId.value;
   form.value.taskVariables = props.taskVariables;
-  if(selectCopyUserList && selectCopyUserList.value.length > 0){
-    let wfCopyList = []
-    selectCopyUserList.value.forEach( e=> {
+  if (selectCopyUserList.value && selectCopyUserList.value.length > 0) {
+    let wfCopyList = [];
+    selectCopyUserList.value.forEach((e) => {
       let copyUser = {
         userId: e.userId,
         userName: e.nickName
-      }
-      wfCopyList.push(copyUser)
-    })
-    form.value.wfCopyList = wfCopyList
+      };
+      wfCopyList.push(copyUser);
+    });
+    form.value.wfCopyList = wfCopyList;
   }
   await proxy?.$modal.confirm('是否确认提交？');
   loading.value = true;
-  buttonLoading.value = true;
+  buttonDisabled.value = true;
   try {
     await completeTask(form.value);
     dialog.visible = false;
     emits('submitCallback');
     proxy?.$modal.msgSuccess('操作成功');
   } finally {
-    loading.value = false
-    buttonLoading.value = false
+    loading.value = false;
+    buttonDisabled.value = false;
   }
 };
 
 /** 驳回弹窗打开 */
 const handleBackProcessOpen = async () => {
-  backForm.value = {}
-  backForm.value.messageType = ['1']
-  backVisible.value = true
-  backLoading.value = true
-  let data = await getTaskNodeList(task.value.processInstanceId)
-  taskNodeList.value = data.data
-  backLoading.value = false
-  backForm.value.targetActivityId = taskNodeList.value[0].nodeId
-}
+  backForm.value = {};
+  backForm.value.messageType = ['1'];
+  backVisible.value = true;
+  backLoading.value = true;
+  let data = await getTaskNodeList(task.value.processInstanceId);
+  taskNodeList.value = data.data;
+  backLoading.value = false;
+  backForm.value.targetActivityId = taskNodeList.value[0].nodeId;
+};
 /** 驳回流程 */
 const handleBackProcess = async () => {
   backForm.value.taskId = taskId.value;
@@ -238,14 +247,14 @@ const handleBackProcess = async () => {
   backLoading.value = true;
   await backProcess(backForm.value).finally(() => (loading.value = false));
   dialog.visible = false;
-  backLoading.value = false
+  backLoading.value = false;
   emits('submitCallback');
   proxy?.$modal.msgSuccess('操作成功');
 };
 //取消
 const cancel = async () => {
   dialog.visible = false;
-  buttonLoading.value = false;
+  buttonDisabled.value = false;
   emits('cancelCallback');
 };
 //打开抄送人员
@@ -254,11 +263,11 @@ const openUserSelectCopy = () => {
 };
 //确认抄送人员
 const userSelectCopyCallBack = (data: UserVO[]) => {
-  if(data && data.length > 0){
-    selectCopyUserList.value = data
+  if (data && data.length > 0) {
+    selectCopyUserList.value = data;
     selectCopyUserIds.value = selectCopyUserList.value.map((item) => item.userId).join(',');
   }
-}
+};
 //删除抄送人员
 const handleCopyCloseTag = (user: UserVO) => {
   const userId = user.userId;
@@ -286,63 +295,62 @@ const openTransferTask = () => {
   transferTaskRef.value.open();
 };
 //转办
-const handleTransferTask  = async (data) => {
-  if(data && data.length > 0){
+const handleTransferTask = async (data) => {
+  if (data && data.length > 0) {
     let params = {
       taskId: taskId.value,
       userId: data[0].userId,
       comment: form.value.message
-    }
+    };
     await proxy?.$modal.confirm('是否确认提交？');
     loading.value = true;
-    buttonLoading.value = true;
+    buttonDisabled.value = true;
     await transferTask(params).finally(() => (loading.value = false));
     dialog.visible = false;
     emits('submitCallback');
     proxy?.$modal.msgSuccess('操作成功');
-  }else{
+  } else {
     proxy?.$modal.msgWarning('请选择用户！');
   }
-}
+};
 
 //打开委托
 const openDelegateTask = () => {
   delegateTaskRef.value.open();
 };
 //委托
-const handleDelegateTask  = async (data) => {
-  if(data && data.length > 0){
+const handleDelegateTask = async (data) => {
+  if (data && data.length > 0) {
     let params = {
       taskId: taskId.value,
       userId: data[0].userId,
       nickName: data[0].nickName
-    }
+    };
     await proxy?.$modal.confirm('是否确认提交？');
     loading.value = true;
-    buttonLoading.value = true;
+    buttonDisabled.value = true;
     await delegateTask(params).finally(() => (loading.value = false));
     dialog.visible = false;
     emits('submitCallback');
     proxy?.$modal.msgSuccess('操作成功');
-  }else{
+  } else {
     proxy?.$modal.msgWarning('请选择用户！');
   }
-}
+};
 //终止任务
-const handleTerminationTask  = async (data) => {
-    let params = {
-      taskId: taskId.value,
-      comment: form.value.message
-    }
-    await proxy?.$modal.confirm('是否确认终止？');
-    loading.value = true;
-    buttonLoading.value = true;
-    await terminationTask(params).finally(() => (loading.value = false));
-    dialog.visible = false;
-    emits('submitCallback');
-    proxy?.$modal.msgSuccess('操作成功');
-  
-}
+const handleTerminationTask = async (data) => {
+  let params = {
+    taskId: taskId.value,
+    comment: form.value.message
+  };
+  await proxy?.$modal.confirm('是否确认终止？');
+  loading.value = true;
+  buttonDisabled.value = true;
+  await terminationTask(params).finally(() => (loading.value = false));
+  dialog.visible = false;
+  emits('submitCallback');
+  proxy?.$modal.msgSuccess('操作成功');
+};
 
 /**
  * 对外暴露子组件方法

From 57d87df58900417be2742f2dc1a9cb75a05c3b77 Mon Sep 17 00:00:00 2001
From: gssong <1742057357@qq.com>
Date: Sun, 2 Jun 2024 00:21:47 +0800
Subject: [PATCH 10/19] =?UTF-8?q?update=20=E8=B0=83=E6=95=B4=E9=A9=B3?=
 =?UTF-8?q?=E5=9B=9E=E6=8C=89=E9=92=AE=E5=8A=A0=E8=BD=BD?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/components/Process/submitVerify.vue | 9 +++++++--
 1 file changed, 7 insertions(+), 2 deletions(-)

diff --git a/src/components/Process/submitVerify.vue b/src/components/Process/submitVerify.vue
index b253276..bcbc657 100644
--- a/src/components/Process/submitVerify.vue
+++ b/src/components/Process/submitVerify.vue
@@ -77,8 +77,8 @@
       </el-form>
       <template #footer>
         <div class="dialog-footer" style="float: right; padding-bottom: 20px">
-          <el-button v-loading="backLoading" type="primary" @click="handleBackProcess">确认</el-button>
-          <el-button v-loading="backLoading" @click="backVisible = false">取消</el-button>
+          <el-button :disabled="backButtonDisabled" type="primary" @click="handleBackProcess">确认</el-button>
+          <el-button :disabled="backButtonDisabled" @click="backVisible = false">取消</el-button>
         </div>
       </template>
     </el-dialog>
@@ -122,6 +122,7 @@ const selectCopyUserIds = ref<string>(undefined);
 // 驳回是否显示
 const backVisible = ref(false);
 const backLoading = ref(true);
+const backButtonDisabled = ref(true);
 // 可驳回得任务节点
 const taskNodeList = ref([]);
 //任务
@@ -234,9 +235,11 @@ const handleBackProcessOpen = async () => {
   backForm.value.messageType = ['1'];
   backVisible.value = true;
   backLoading.value = true;
+  backButtonDisabled.value = true;
   let data = await getTaskNodeList(task.value.processInstanceId);
   taskNodeList.value = data.data;
   backLoading.value = false;
+  backButtonDisabled.value = false;
   backForm.value.targetActivityId = taskNodeList.value[0].nodeId;
 };
 /** 驳回流程 */
@@ -245,9 +248,11 @@ const handleBackProcess = async () => {
   await proxy?.$modal.confirm('是否确认驳回到申请人？');
   loading.value = true;
   backLoading.value = true;
+  backButtonDisabled.value = true;
   await backProcess(backForm.value).finally(() => (loading.value = false));
   dialog.visible = false;
   backLoading.value = false;
+  backButtonDisabled.value = false;
   emits('submitCallback');
   proxy?.$modal.msgSuccess('操作成功');
 };

From 64c56e9dd958c03b5bcb99066813039a6a8156fa Mon Sep 17 00:00:00 2001
From: can <lumingsyc@163.com>
Date: Sun, 2 Jun 2024 19:44:38 +0800
Subject: [PATCH 11/19] =?UTF-8?q?update=20=E8=B0=83=E6=95=B4=E6=B3=A8?=
 =?UTF-8?q?=E9=87=8A=E9=94=99=E8=AF=AF?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/views/system/oss/index.vue | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/src/views/system/oss/index.vue b/src/views/system/oss/index.vue
index a2f1f1b..2e50582 100644
--- a/src/views/system/oss/index.vue
+++ b/src/views/system/oss/index.vue
@@ -304,7 +304,7 @@ const submitForm = () => {
 const handleDownload = (row: OssVO) => {
   proxy?.$download.oss(row.ossId);
 };
-/** 用户状态修改  */
+/** 预览开关按钮  */
 const handlePreviewListResource = async (preview: boolean) => {
   let text = preview ? '启用' : '停用';
   try {

From f237ee145a06def3b413d113e419d62cca181ec4 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=E7=96=AF=E7=8B=82=E7=9A=84=E7=8B=AE=E5=AD=90Li?=
 <15040126243@163.com>
Date: Mon, 3 Jun 2024 15:47:51 +0800
Subject: [PATCH 12/19] =?UTF-8?q?update=20=E4=BC=98=E5=8C=96=20=E5=8E=BB?=
 =?UTF-8?q?=E9=99=A4=E8=AF=B7=E5=81=87=E6=A1=88=E4=BE=8B=E7=8A=B6=E6=80=81?=
 =?UTF-8?q?=E5=AD=97=E6=AE=B5?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/views/workflow/leave/leaveEdit.vue | 25 +++++++------------------
 1 file changed, 7 insertions(+), 18 deletions(-)

diff --git a/src/views/workflow/leave/leaveEdit.vue b/src/views/workflow/leave/leaveEdit.vue
index b8742f7..af25fad 100644
--- a/src/views/workflow/leave/leaveEdit.vue
+++ b/src/views/workflow/leave/leaveEdit.vue
@@ -4,36 +4,25 @@
       <div style="display: flex; justify-content: space-between">
         <div>
           <el-button
-            v-if="
-              routeParams.type === 'add' ||
-              (routeParams.type === 'update' &&
-                form.processInstanceVo &&
-                form.processInstanceVo.businessStatus &&
-                (form.processInstanceVo.businessStatus === 'draft' ||
-                  form.processInstanceVo.businessStatus === 'cancel' ||
-                  form.processInstanceVo.businessStatus === 'back'))
-            "
+            v-if="routeParams.type === 'add' ||
+                (routeParams.type === 'update' &&form.status &&
+                (form.status === 'draft' || form.status === 'cancel' || form.status === 'back'))"
             :loading="buttonLoading"
             type="info"
             @click="submitForm('draft')"
             >暂存</el-button
           >
           <el-button
-            v-if="
-              routeParams.type === 'add' ||
-              (routeParams.type === 'update' &&
-                form.processInstanceVo &&
-                (form.processInstanceVo.businessStatus === 'draft' ||
-                  form.processInstanceVo.businessStatus === 'cancel' ||
-                  form.processInstanceVo.businessStatus === 'back'))
-            "
+            v-if="routeParams.type === 'add' ||
+                (routeParams.type === 'update' && form.status &&
+                (form.status === 'draft' || form.status === 'cancel' || form.status === 'back'))"
             :loading="buttonLoading"
             type="primary"
             @click="submitForm('submit')"
             >提 交</el-button
           >
           <el-button
-            v-if="routeParams.type === 'approval' && form.processInstanceVo && form.processInstanceVo.businessStatus === 'waiting'"
+            v-if="routeParams.type === 'approval' && form.status && form.status === 'waiting'"
             :loading="buttonLoading"
             type="primary"
             @click="approvalVerifyOpen"

From 212361dc9430a592d1511ba0a27ddc3c35cf0493 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=E7=96=AF=E7=8B=82=E7=9A=84=E7=8B=AE=E5=AD=90Li?=
 <15040126243@163.com>
Date: Mon, 3 Jun 2024 17:53:49 +0800
Subject: [PATCH 13/19] =?UTF-8?q?update=20=E4=BC=98=E5=8C=96=20=E5=8E=BB?=
 =?UTF-8?q?=E9=99=A4=E8=AF=B7=E5=81=87=E6=A1=88=E4=BE=8B=E7=8A=B6=E6=80=81?=
 =?UTF-8?q?=E5=AD=97=E6=AE=B5?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/views/workflow/leave/index.vue | 16 ++++------------
 1 file changed, 4 insertions(+), 12 deletions(-)

diff --git a/src/views/workflow/leave/index.vue b/src/views/workflow/leave/index.vue
index 56ccb2c..4157be3 100644
--- a/src/views/workflow/leave/index.vue
+++ b/src/views/workflow/leave/index.vue
@@ -53,17 +53,13 @@
         <el-table-column label="请假原因" align="center" prop="remark" />
         <el-table-column align="center" label="流程状态" min-width="70">
           <template #default="scope">
-            <dict-tag :options="wf_business_status" :value="scope.row.processInstanceVo.businessStatus"></dict-tag>
+            <dict-tag :options="wf_business_status" :value="scope.row.status"></dict-tag>
           </template>
         </el-table-column>
         <el-table-column label="操作" align="center" class-name="small-padding fixed-width">
           <template #default="scope">
             <el-button
-              v-if="
-                scope.row.processInstanceVo.businessStatus === 'draft' ||
-                scope.row.processInstanceVo.businessStatus === 'cancel' ||
-                scope.row.processInstanceVo.businessStatus === 'back'
-              "
+              v-if="scope.row.status === 'draft' || scope.row.status === 'cancel' || scope.row.status === 'back'"
               v-hasPermi="['demo:leave:edit']"
               size="small"
               link
@@ -73,11 +69,7 @@
               >修改</el-button
             >
             <el-button
-              v-if="
-                scope.row.processInstanceVo.businessStatus === 'draft' ||
-                scope.row.processInstanceVo.businessStatus === 'cancel' ||
-                scope.row.processInstanceVo.businessStatus === 'back'
-              "
+              v-if="scope.row.status === 'draft' || scope.row.status === 'cancel' || scope.row.status === 'back'"
               v-hasPermi="['demo:leave:remove']"
               size="small"
               link
@@ -88,7 +80,7 @@
             >
             <el-button link type="primary" size="small" icon="View" @click="handleView(scope.row)">查看</el-button>
             <el-button
-              v-if="scope.row.processInstanceVo.businessStatus === 'waiting'"
+              v-if="scope.row.status === 'waiting'"
               link
               size="small"
               type="primary"

From 38df345078756e12d405922136837d07ec6e2de4 Mon Sep 17 00:00:00 2001
From: gssong <1742057357@qq.com>
Date: Mon, 3 Jun 2024 21:04:42 +0800
Subject: [PATCH 14/19] =?UTF-8?q?update=20=E8=B0=83=E6=95=B4=E6=B5=81?=
 =?UTF-8?q?=E7=A8=8B=E5=9B=BE=E9=A2=84=E8=A7=88=E6=A0=A1=E9=AA=8C?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/api/workflow/leave/types.ts        |  6 ++++--
 src/views/workflow/leave/leaveEdit.vue | 22 +++++++++++-----------
 2 files changed, 15 insertions(+), 13 deletions(-)

diff --git a/src/api/workflow/leave/types.ts b/src/api/workflow/leave/types.ts
index b093546..b86c480 100644
--- a/src/api/workflow/leave/types.ts
+++ b/src/api/workflow/leave/types.ts
@@ -5,7 +5,8 @@ export interface LeaveVO {
   endDate: string;
   leaveDays: number;
   remark: string;
-  processInstanceVo: any;
+  status?: string;
+  processInstanceId?: string;
 }
 
 export interface LeaveForm extends BaseEntity {
@@ -15,7 +16,8 @@ export interface LeaveForm extends BaseEntity {
   endDate?: string;
   leaveDays?: number;
   remark?: string;
-  processInstanceVo?: any;
+  status?: string;
+  processInstanceId?: string;
 }
 
 export interface LeaveQuery extends PageQuery {
diff --git a/src/views/workflow/leave/leaveEdit.vue b/src/views/workflow/leave/leaveEdit.vue
index af25fad..3dca4fc 100644
--- a/src/views/workflow/leave/leaveEdit.vue
+++ b/src/views/workflow/leave/leaveEdit.vue
@@ -4,18 +4,20 @@
       <div style="display: flex; justify-content: space-between">
         <div>
           <el-button
-            v-if="routeParams.type === 'add' ||
-                (routeParams.type === 'update' &&form.status &&
-                (form.status === 'draft' || form.status === 'cancel' || form.status === 'back'))"
+            v-if="
+              routeParams.type === 'add' ||
+              (routeParams.type === 'update' && form.status && (form.status === 'draft' || form.status === 'cancel' || form.status === 'back'))
+            "
             :loading="buttonLoading"
             type="info"
             @click="submitForm('draft')"
             >暂存</el-button
           >
           <el-button
-            v-if="routeParams.type === 'add' ||
-                (routeParams.type === 'update' && form.status &&
-                (form.status === 'draft' || form.status === 'cancel' || form.status === 'back'))"
+            v-if="
+              routeParams.type === 'add' ||
+              (routeParams.type === 'update' && form.status && (form.status === 'draft' || form.status === 'cancel' || form.status === 'back'))
+            "
             :loading="buttonLoading"
             type="primary"
             @click="submitForm('submit')"
@@ -28,7 +30,7 @@
             @click="approvalVerifyOpen"
             >审批</el-button
           >
-          <el-button v-if="processInstanceId" type="primary" @click="handleApprovalRecord">流程进度</el-button>
+          <el-button v-if="form.processInstanceId" type="primary" @click="handleApprovalRecord">流程进度</el-button>
         </div>
         <div>
           <el-button style="float: right" @click="goBack()">返回</el-button>
@@ -123,7 +125,8 @@ const initFormData: LeaveForm = {
   endDate: undefined,
   leaveDays: undefined,
   remark: undefined,
-  processInstanceVo: {}
+  status: undefined,
+  processInstanceId: undefined
 };
 const data = reactive<PageData<LeaveForm, LeaveQuery>>({
   form: { ...initFormData },
@@ -166,9 +169,6 @@ const getInfo = () => {
     leaveTime.value = [];
     leaveTime.value.push(form.value.startDate);
     leaveTime.value.push(form.value.endDate);
-    if (form.value.processInstanceVo) {
-      processInstanceId.value = form.value.processInstanceVo.id;
-    }
     loading.value = false;
     buttonLoading.value = false;
   });

From c8626b68932295e386e2866928eacd8eba5d78d0 Mon Sep 17 00:00:00 2001
From: gssong <1742057357@qq.com>
Date: Mon, 3 Jun 2024 21:23:32 +0800
Subject: [PATCH 15/19] =?UTF-8?q?remove=20=E5=88=A0=E9=99=A4=E6=97=A0?=
 =?UTF-8?q?=E7=94=A8=E5=8F=82=E6=95=B0?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/api/workflow/leave/types.ts        | 2 --
 src/views/workflow/leave/leaveEdit.vue | 7 ++-----
 2 files changed, 2 insertions(+), 7 deletions(-)

diff --git a/src/api/workflow/leave/types.ts b/src/api/workflow/leave/types.ts
index b86c480..a44d35d 100644
--- a/src/api/workflow/leave/types.ts
+++ b/src/api/workflow/leave/types.ts
@@ -6,7 +6,6 @@ export interface LeaveVO {
   leaveDays: number;
   remark: string;
   status?: string;
-  processInstanceId?: string;
 }
 
 export interface LeaveForm extends BaseEntity {
@@ -17,7 +16,6 @@ export interface LeaveForm extends BaseEntity {
   leaveDays?: number;
   remark?: string;
   status?: string;
-  processInstanceId?: string;
 }
 
 export interface LeaveQuery extends PageQuery {
diff --git a/src/views/workflow/leave/leaveEdit.vue b/src/views/workflow/leave/leaveEdit.vue
index 3dca4fc..d6210f0 100644
--- a/src/views/workflow/leave/leaveEdit.vue
+++ b/src/views/workflow/leave/leaveEdit.vue
@@ -30,7 +30,7 @@
             @click="approvalVerifyOpen"
             >审批</el-button
           >
-          <el-button v-if="form.processInstanceId" type="primary" @click="handleApprovalRecord">流程进度</el-button>
+          <el-button v-if="form.status !== 'draft'" type="primary" @click="handleApprovalRecord">流程进度</el-button>
         </div>
         <div>
           <el-button style="float: right" @click="goBack()">返回</el-button>
@@ -82,8 +82,6 @@ const { proxy } = getCurrentInstance() as ComponentInternalInstance;
 const buttonLoading = ref(false);
 const loading = ref(true);
 const leaveTime = ref<Array<string>>([]);
-//流程实例id
-const processInstanceId = ref('');
 //路由参数
 const routeParams = ref<Record<string, any>>({});
 const options = [
@@ -125,8 +123,7 @@ const initFormData: LeaveForm = {
   endDate: undefined,
   leaveDays: undefined,
   remark: undefined,
-  status: undefined,
-  processInstanceId: undefined
+  status: undefined
 };
 const data = reactive<PageData<LeaveForm, LeaveQuery>>({
   form: { ...initFormData },

From 3fead379241b73c5c1a9ba86eafdbb70a0c44c66 Mon Sep 17 00:00:00 2001
From: gssong <1742057357@qq.com>
Date: Mon, 3 Jun 2024 21:33:12 +0800
Subject: [PATCH 16/19] =?UTF-8?q?add=20=E6=B7=BB=E5=8A=A0=E6=B5=81?=
 =?UTF-8?q?=E7=A8=8B=E8=AE=B0=E5=BD=95=E7=89=88=E6=9C=AC=E4=BF=A1=E6=81=AF?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/components/BpmnView/index.vue | 1 +
 1 file changed, 1 insertion(+)

diff --git a/src/components/BpmnView/index.vue b/src/components/BpmnView/index.vue
index 3d04246..c5e0c7b 100644
--- a/src/components/BpmnView/index.vue
+++ b/src/components/BpmnView/index.vue
@@ -133,6 +133,7 @@ const genNodeDetailBox = (e, overlays, data) => {
                     <p>开始时间：${data.startTime || ''}</p>
                     <p>结束时间：${data.endTime || ''}</p>
                     <p>审批耗时：${data.runDuration || ''}</p>
+                    <p>流程版本：v${data.version || ''}</p>
                    </div>`
   });
 };

From c467d95703be720f303cb92ca7eca394469f23fd Mon Sep 17 00:00:00 2001
From: songgaoshuai <1742057357@qq.com>
Date: Tue, 4 Jun 2024 11:26:38 +0800
Subject: [PATCH 17/19] =?UTF-8?q?https://gitee.com/dromara/RuoYi-Cloud-Plu?=
 =?UTF-8?q?s/issues/I9US1Q=20fix=E4=BF=AE=E5=A4=8D=E6=88=91=E7=9A=84?=
 =?UTF-8?q?=E5=8D=95=E6=8D=AE=E6=92=A4=E9=94=80=EF=BC=8C=E5=88=A0=E9=99=A4?=
 =?UTF-8?q?=E5=8F=82=E6=95=B0=E9=94=99=E8=AF=AF?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/views/workflow/task/myDocument.vue | 22 ++++++++--------------
 1 file changed, 8 insertions(+), 14 deletions(-)

diff --git a/src/views/workflow/task/myDocument.vue b/src/views/workflow/task/myDocument.vue
index e8592f8..2dec097 100644
--- a/src/views/workflow/task/myDocument.vue
+++ b/src/views/workflow/task/myDocument.vue
@@ -88,7 +88,7 @@
                   <el-button link type="primary" icon="View" @click="handleOpen(scope.row, 'view')"></el-button>
                 </el-tooltip>
                 <el-tooltip v-if="scope.row.businessStatus === 'waiting'" content="撤销" placement="top">
-                  <el-button link type="primary" icon="Notification" @click="handleCancelProcessApply(scope.row.id)"></el-button>
+                  <el-button link type="primary" icon="Notification" @click="handleCancelProcessApply(scope.row.businessKey)"></el-button>
                 </el-tooltip>
               </template>
             </el-table-column>
@@ -123,7 +123,7 @@ const categoryTreeRef = ref<ElTreeInstance>();
 // 遮罩层
 const loading = ref(true);
 // 选中数组
-const ids = ref<Array<any>>([]);
+const businessKeys = ref<Array<any>>([]);
 // 非单个禁用
 const single = ref(true);
 // 非多个禁用
@@ -190,12 +190,6 @@ const getTreeselect = async () => {
   categoryOptions.value.push(data);
 };
 
-//审批记录
-const handleApprovalRecord = (processInstanceId: string) => {
-  if (approvalRecordRef.value) {
-    approvalRecordRef.value.init(processInstanceId);
-  }
-};
 /** 搜索按钮操作 */
 const handleQuery = () => {
   getList();
@@ -210,7 +204,7 @@ const resetQuery = () => {
 };
 // 多选框选中数据
 const handleSelectionChange = (selection: ProcessInstanceVO[]) => {
-  ids.value = selection.map((item: any) => item.id);
+  businessKeys.value = selection.map((item: any) => item.businessKey);
   single.value = selection.length !== 1;
   multiple.value = !selection.length;
 };
@@ -226,22 +220,22 @@ const getList = () => {
 
 /** 删除按钮操作 */
 const handleDelete = async (row: ProcessInstanceVO) => {
-  const id = row.id || ids.value;
-  await proxy?.$modal.confirm('是否确认删除id为【' + id + '】的数据项？');
+  const businessKey = row.businessKey || businessKeys.value;
+  await proxy?.$modal.confirm('是否确认删除业务id为【' + businessKey + '】的数据项？');
   loading.value = true;
   if ('running' === tab.value) {
-    await deleteRunAndHisInstance(id).finally(() => (loading.value = false));
+    await deleteRunAndHisInstance(businessKey).finally(() => (loading.value = false));
     getList();
   }
   proxy?.$modal.msgSuccess('删除成功');
 };
 
 /** 撤销按钮操作 */
-const handleCancelProcessApply = async (processInstanceId: string) => {
+const handleCancelProcessApply = async (businessKey: string) => {
   await proxy?.$modal.confirm('是否确认撤销当前单据？');
   loading.value = true;
   if ('running' === tab.value) {
-    await cancelProcessApply(processInstanceId).finally(() => (loading.value = false));
+    await cancelProcessApply(businessKey).finally(() => (loading.value = false));
     getList();
   }
   proxy?.$modal.msgSuccess('撤销成功');

From 75ecc4dd68a55ff785ce6c2e33ced771741fdab7 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=E7=96=AF=E7=8B=82=E7=9A=84=E7=8B=AE=E5=AD=90Li?=
 <15040126243@163.com>
Date: Tue, 4 Jun 2024 15:00:32 +0800
Subject: [PATCH 18/19] =?UTF-8?q?update=20=E6=9B=B4=E6=94=B9=20=E5=85=B3?=
 =?UTF-8?q?=E4=BA=8Emq=E8=AF=B4=E6=98=8E?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/views/index.vue | 1 -
 1 file changed, 1 deletion(-)

diff --git a/src/views/index.vue b/src/views/index.vue
index 249a41b..e02c9fe 100644
--- a/src/views/index.vue
+++ b/src/views/index.vue
@@ -68,7 +68,6 @@
           * RPC远程调用 Apache Dubbo 原生态使用体验、高性能<br />
           * 分布式限流熔断 Alibaba Sentinel 无侵入、高扩展<br />
           * 分布式事务 Alibaba Seata 无侵入、高扩展 支持 四种模式<br />
-          * 分布式消息队列 Spring Cloud Stream 门面框架兼容各种MQ集成<br />
           * 分布式消息队列 Apache Kafka 高性能高速度<br />
           * 分布式消息队列 Apache RocketMQ 高可用功能多样<br />
           * 分布式消息队列 RabbitMQ 支持各种扩展插件功能多样性<br />

From 61df97c4b9e40a8c5cc12fe7ed484d4354cca49a Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=E7=96=AF=E7=8B=82=E7=9A=84=E7=8B=AE=E5=AD=90Li?=
 <15040126243@163.com>
Date: Thu, 6 Jun 2024 10:59:20 +0800
Subject: [PATCH 19/19] =?UTF-8?q?update=20=E4=BC=98=E5=8C=96=20=E6=A0=87?=
 =?UTF-8?q?=E8=AF=86=E7=AC=A6=E9=94=99=E8=AF=AF?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/router/index.ts                    | 2 +-
 src/views/workflow/leave/index.vue     | 8 ++++----
 src/views/workflow/task/myDocument.vue | 4 ++--
 3 files changed, 7 insertions(+), 7 deletions(-)

diff --git a/src/router/index.ts b/src/router/index.ts
index b020b4c..438708f 100644
--- a/src/router/index.ts
+++ b/src/router/index.ts
@@ -167,7 +167,7 @@ export const dynamicRoutes: RouteRecordRaw[] = [
     path: '/workflow/leaveEdit',
     component: Layout,
     hidden: true,
-    permissions: ['demo:leave:edit'],
+    permissions: ['workflow:leave:edit'],
     children: [
       {
         path: 'index',
diff --git a/src/views/workflow/leave/index.vue b/src/views/workflow/leave/index.vue
index 4157be3..d9c50c4 100644
--- a/src/views/workflow/leave/index.vue
+++ b/src/views/workflow/leave/index.vue
@@ -22,10 +22,10 @@
       <template #header>
         <el-row :gutter="10" class="mb8">
           <el-col :span="1.5">
-            <el-button v-hasPermi="['demo:leave:add']" type="primary" plain icon="Plus" @click="handleAdd">新增</el-button>
+            <el-button v-hasPermi="['workflow:leave:add']" type="primary" plain icon="Plus" @click="handleAdd">新增</el-button>
           </el-col>
           <el-col :span="1.5">
-            <el-button v-hasPermi="['demo:leave:export']" type="warning" plain icon="Download" @click="handleExport">导出</el-button>
+            <el-button v-hasPermi="['workflow:leave:export']" type="warning" plain icon="Download" @click="handleExport">导出</el-button>
           </el-col>
           <right-toolbar v-model:showSearch="showSearch" @query-table="getList"></right-toolbar>
         </el-row>
@@ -60,7 +60,7 @@
           <template #default="scope">
             <el-button
               v-if="scope.row.status === 'draft' || scope.row.status === 'cancel' || scope.row.status === 'back'"
-              v-hasPermi="['demo:leave:edit']"
+              v-hasPermi="['workflow:leave:edit']"
               size="small"
               link
               type="primary"
@@ -70,7 +70,7 @@
             >
             <el-button
               v-if="scope.row.status === 'draft' || scope.row.status === 'cancel' || scope.row.status === 'back'"
-              v-hasPermi="['demo:leave:remove']"
+              v-hasPermi="['workflow:leave:remove']"
               size="small"
               link
               type="primary"
diff --git a/src/views/workflow/task/myDocument.vue b/src/views/workflow/task/myDocument.vue
index 2dec097..1bf5bbf 100644
--- a/src/views/workflow/task/myDocument.vue
+++ b/src/views/workflow/task/myDocument.vue
@@ -75,14 +75,14 @@
                   content="修改"
                   placement="top"
                 >
-                  <el-button v-hasPermi="['demo:leave:edit']" link type="primary" icon="Edit" @click="handleOpen(scope.row, 'update')"></el-button>
+                  <el-button link type="primary" icon="Edit" @click="handleOpen(scope.row, 'update')"></el-button>
                 </el-tooltip>
                 <el-tooltip
                   v-if="scope.row.businessStatus === 'draft' || scope.row.businessStatus === 'cancel' || scope.row.businessStatus === 'back'"
                   content="删除"
                   placement="top"
                 >
-                  <el-button v-hasPermi="['demo:leave:remove']" link type="primary" icon="Delete" @click="handleDelete(scope.row)"></el-button>
+                  <el-button link type="primary" icon="Delete" @click="handleDelete(scope.row)"></el-button>
                 </el-tooltip>
                 <el-tooltip placement="top" content="查看">
                   <el-button link type="primary" icon="View" @click="handleOpen(scope.row, 'view')"></el-button>