From 20e84b072edc879352b29715959183f2b9293d4c Mon Sep 17 00:00:00 2001
From: lizhixian <18210040298@163.com>
Date: Mon, 17 Feb 2025 08:52:33 +0800
Subject: [PATCH 01/12] =?UTF-8?q?fix=EF=BC=9A=E8=A1=A5=E5=85=85=E6=B5=81?=
 =?UTF-8?q?=E7=A8=8B=E8=8A=82=E7=82=B9=E8=A7=84=E5=88=99=E7=B1=BB=E5=9E=8B?=
 =?UTF-8?q?=E2=80=9C=E5=8F=91=E8=B5=B7=E4=BA=BA=E8=87=AA=E9=80=89=E2=80=9D?=
 =?UTF-8?q?=E7=9A=84=E5=AD=97=E5=85=B8=E6=95=B0=E6=8D=AE?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/components/SimpleProcessDesignerV2/src/consts.ts | 1 +
 1 file changed, 1 insertion(+)

diff --git a/src/components/SimpleProcessDesignerV2/src/consts.ts b/src/components/SimpleProcessDesignerV2/src/consts.ts
index b51bb919..9f6e55cd 100644
--- a/src/components/SimpleProcessDesignerV2/src/consts.ts
+++ b/src/components/SimpleProcessDesignerV2/src/consts.ts
@@ -532,6 +532,7 @@ export const CANDIDATE_STRATEGY: DictDataVO[] = [
   { label: '部门负责人', value: CandidateStrategy.DEPT_LEADER },
   { label: '连续多级部门负责人', value: CandidateStrategy.MULTI_LEVEL_DEPT_LEADER },
   { label: '指定岗位', value: CandidateStrategy.MULTI_LEVEL_DEPT_LEADER },
+  { label: '发起人自选', value: CandidateStrategy.START_USER_SELECT },
   { label: '发起人本人', value: CandidateStrategy.START_USER },
   { label: '发起人部门负责人', value: CandidateStrategy.START_USER_DEPT_LEADER },
   { label: '发起人连续部门负责人', value: CandidateStrategy.START_USER_MULTI_LEVEL_DEPT_LEADER },

From 9991ef2ec55fdef683b988d8d63a6cbb833e633f Mon Sep 17 00:00:00 2001
From: lizhixian <18210040298@163.com>
Date: Mon, 17 Feb 2025 09:55:55 +0800
Subject: [PATCH 02/12] =?UTF-8?q?fix=EF=BC=9A=E4=BF=AE=E6=94=B9=E9=AD=94?=
 =?UTF-8?q?=E6=B3=95=E5=AD=97=E7=AC=A6=E8=BD=AC=E6=9E=9A=E4=B8=BE=E7=B1=BB?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../bpm/processInstance/create/ProcessDefinitionDetail.vue    | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/src/views/bpm/processInstance/create/ProcessDefinitionDetail.vue b/src/views/bpm/processInstance/create/ProcessDefinitionDetail.vue
index 64d072ce..e34b935d 100644
--- a/src/views/bpm/processInstance/create/ProcessDefinitionDetail.vue
+++ b/src/views/bpm/processInstance/create/ProcessDefinitionDetail.vue
@@ -74,7 +74,7 @@
 </template>
 <script lang="ts" setup>
 import { decodeFields, setConfAndFields2 } from '@/utils/formCreate'
-import { BpmModelType } from '@/utils/constants'
+import { BpmModelType, BpmModelFormType } from '@/utils/constants'
 import {
   CandidateStrategy,
   NodeId,
@@ -121,7 +121,7 @@ const initProcessInfo = async (row: any, formVariables?: any) => {
   startUserSelectAssignees.value = {}
 
   // 情况一：流程表单
-  if (row.formType == 10) {
+  if (row.formType == BpmModelFormType.NORMAL) {
     // 设置表单
     // 注意：需要从 formVariables 中，移除不在 row.formFields 的值。
     // 原因是：后端返回的 formVariables 里面，会有一些非表单的信息。例如说，某个流程节点的审批人。

From 54d67b37618cc625afff647dec2e629dbaf24229 Mon Sep 17 00:00:00 2001
From: lizhixian <18210040298@163.com>
Date: Mon, 17 Feb 2025 16:00:16 +0800
Subject: [PATCH 03/12] =?UTF-8?q?fix=EF=BC=9A=E8=B0=83=E6=95=B4=E8=8E=B7?=
 =?UTF-8?q?=E5=8F=96=E5=AE=A1=E6=89=B9=E8=AF=A6=E6=83=85=E6=8E=A5=E5=8F=A3?=
 =?UTF-8?q?=E7=9A=84=E8=AF=B7=E6=B1=82=E6=96=B9=E5=BC=8F?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/api/bpm/processInstance/index.ts | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/src/api/bpm/processInstance/index.ts b/src/api/bpm/processInstance/index.ts
index 9a99a91e..dfcf4f7f 100644
--- a/src/api/bpm/processInstance/index.ts
+++ b/src/api/bpm/processInstance/index.ts
@@ -89,8 +89,8 @@ export const getProcessInstanceCopyPage = async (params: any) => {
 }
 
 // 获取审批详情
-export const getApprovalDetail = async (params: any) => {
-  return await request.get({ url: 'bpm/process-instance/get-approval-detail', params })
+export const getApprovalDetail = async (data: any) => {
+  return await request.post({ url: '/bpm/process-instance/get-approval-detail', data: data })
 }
 
 // 获取表单字段权限

From 903428d063c9623e67c417ec2b75246bec1fab3d Mon Sep 17 00:00:00 2001
From: lizhixian <18210040298@163.com>
Date: Mon, 17 Feb 2025 16:01:51 +0800
Subject: [PATCH 04/12] =?UTF-8?q?fix:=20=E4=BF=AE=E5=A4=8D=E6=B5=81?=
 =?UTF-8?q?=E7=A8=8B=E5=AE=A1=E6=89=B9=E9=A2=84=E6=B5=8B=E5=8A=9F=E8=83=BD?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../create/ProcessDefinitionDetail.vue        | 19 +++++++++++++++++--
 1 file changed, 17 insertions(+), 2 deletions(-)

diff --git a/src/views/bpm/processInstance/create/ProcessDefinitionDetail.vue b/src/views/bpm/processInstance/create/ProcessDefinitionDetail.vue
index e34b935d..a6f10f08 100644
--- a/src/views/bpm/processInstance/create/ProcessDefinitionDetail.vue
+++ b/src/views/bpm/processInstance/create/ProcessDefinitionDetail.vue
@@ -161,7 +161,8 @@ const getApprovalDetail = async (row: any) => {
     // TODO 获取审批详情，设置 activityId 为发起人节点（为了获取字段权限。暂时只对 Simple 设计器有效）
     const data = await ProcessInstanceApi.getApprovalDetail({
       processDefinitionId: row.id,
-      activityId: NodeId.START_USER_NODE_ID
+      activityId: NodeId.START_USER_NODE_ID,
+      processVariables: row.processVariables
     })
 
     if (!data) {
@@ -218,6 +219,19 @@ const submitForm = async () => {
   }
   // 流程表单校验
   await fApi.value.validate()
+  // 临时保存已选择的审批人信息，避免重新预测后已选择的审批人丢失
+  const savedAssignees = { ...startUserSelectAssignees.value }
+  // 预测流程节点会因为输入的参数值而产生新的预测结果值，所以在提交时需重新预测一次
+  await getApprovalDetail({
+    id: props.selectProcessDefinition.id,
+    processVariables: detailForm.value?.value
+  })
+  // 恢复已选择的审批人信息
+  Object.keys(savedAssignees).forEach((id) => {
+    if (startUserSelectAssignees.value[id]) {
+      startUserSelectAssignees.value[id] = savedAssignees[id]
+    }
+  })
   // 如果有指定审批人，需要校验
   if (startUserSelectTasks.value?.length > 0) {
     for (const userTask of startUserSelectTasks.value) {
@@ -235,7 +249,8 @@ const submitForm = async () => {
     await ProcessInstanceApi.createProcessInstance({
       processDefinitionId: props.selectProcessDefinition.id,
       variables: detailForm.value.value,
-      startUserSelectAssignees: startUserSelectAssignees.value
+      startUserSelectAssignees: startUserSelectAssignees.value,
+      nodeIds: activityNodes.value?.map((item: any) => item.id)
     })
     // 提示
     message.success('发起流程成功')

From 78e658389b1ff889da384c9a301b373d6d196a75 Mon Sep 17 00:00:00 2001
From: lizhixian <18210040298@163.com>
Date: Mon, 17 Feb 2025 16:53:38 +0800
Subject: [PATCH 05/12] =?UTF-8?q?fix:=20=E8=A7=A3=E5=86=B3=E6=B5=81?=
 =?UTF-8?q?=E7=A8=8B=E5=9B=BE=E9=A2=84=E8=A7=88=EF=BC=8C=E6=8E=A7=E5=88=B6?=
 =?UTF-8?q?=E5=8F=B0v-highlight=E8=BF=87=E5=A4=9A=E5=91=8A=E8=AD=A6?=
 =?UTF-8?q?=E9=97=AE=E9=A2=98?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../package/designer/ProcessDesigner.vue      | 22 ++++++++++++++-----
 1 file changed, 16 insertions(+), 6 deletions(-)

diff --git a/src/components/bpmnProcessDesigner/package/designer/ProcessDesigner.vue b/src/components/bpmnProcessDesigner/package/designer/ProcessDesigner.vue
index 83d40fbf..00e887cb 100644
--- a/src/components/bpmnProcessDesigner/package/designer/ProcessDesigner.vue
+++ b/src/components/bpmnProcessDesigner/package/designer/ProcessDesigner.vue
@@ -188,12 +188,8 @@
       :scroll="true"
       max-height="600px"
     >
-      <!-- append-to-body -->
-      <div v-highlight>
-        <code class="hljs">
-          <!-- 高亮代码块 -->
-          {{ previewResult }}
-        </code>
+      <div>
+        <pre><code v-dompurify-html="highlightedCode(previewResult)" class="hljs"></code></pre>
       </div>
     </Dialog>
   </div>
@@ -237,6 +233,8 @@ import { XmlNode, XmlNodeType, parseXmlString } from 'steady-xml'
 // const eventName = reactive({
 //   name: ''
 // })
+import hljs from 'highlight.js' // 导入代码高亮文件
+import 'highlight.js/styles/github.css' // 导入代码高亮样式
 
 defineOptions({ name: 'MyProcessDesigner' })
 
@@ -308,6 +306,18 @@ const props = defineProps({
   }
 })
 
+/**
+ * 代码高亮
+ */
+const highlightedCode = (code: string) => {
+  // 高亮
+  if (previewType.value === 'json') {
+    code = JSON.stringify(code, null, 2)
+  }
+  const result = hljs.highlight(code, { language: previewType.value, ignoreIllegals: true })
+  return result.value || '&nbsp;'
+}
+
 provide('configGlobal', props)
 let bpmnModeler: any = null
 const defaultZoom = ref(1)

From be6c15f5dfd65e5ca3e3ceb10ee33ab48b1baba0 Mon Sep 17 00:00:00 2001
From: lizhixian <18210040298@163.com>
Date: Mon, 17 Feb 2025 17:07:47 +0800
Subject: [PATCH 06/12] =?UTF-8?q?fix=EF=BC=9A=E4=BF=AE=E6=94=B9=E9=AD=94?=
 =?UTF-8?q?=E6=B3=95=E5=AD=97=E7=AC=A6=E4=B8=BA=E6=9E=9A=E4=B8=BE=E7=B1=BB?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../penal/custom-config/components/UserTaskCustomConfig.vue     | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/src/components/bpmnProcessDesigner/package/penal/custom-config/components/UserTaskCustomConfig.vue b/src/components/bpmnProcessDesigner/package/penal/custom-config/components/UserTaskCustomConfig.vue
index 8b3b8af2..a735419d 100644
--- a/src/components/bpmnProcessDesigner/package/penal/custom-config/components/UserTaskCustomConfig.vue
+++ b/src/components/bpmnProcessDesigner/package/penal/custom-config/components/UserTaskCustomConfig.vue
@@ -123,7 +123,7 @@
     </div>
 
     <el-divider content-position="left">字段权限</el-divider>
-    <div class="field-setting-pane" v-if="formType === 10">
+    <div class="field-setting-pane" v-if="formType === BpmModelFormType.NORMAL">
       <div class="field-permit-title">
         <div class="setting-title-label first-title"> 字段名称 </div>
         <div class="other-titles">

From 67371e757942857713f434eec35a3299f9e6e5ad Mon Sep 17 00:00:00 2001
From: lizhixian <18210040298@163.com>
Date: Tue, 18 Feb 2025 10:28:20 +0800
Subject: [PATCH 07/12] =?UTF-8?q?fix=EF=BC=9A=E8=B0=83=E6=95=B4=E8=8E=B7?=
 =?UTF-8?q?=E5=8F=96=E9=A2=84=E6=B5=8B=E8=8A=82=E7=82=B9=E6=8E=A5=E5=8F=A3?=
 =?UTF-8?q?=E8=AF=B7=E6=B1=82=E6=96=B9=E5=BC=8F=E5=92=8C=E5=8F=82=E6=95=B0?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/api/bpm/processInstance/index.ts                          | 4 ++--
 .../bpm/processInstance/create/ProcessDefinitionDetail.vue    | 4 ++--
 2 files changed, 4 insertions(+), 4 deletions(-)

diff --git a/src/api/bpm/processInstance/index.ts b/src/api/bpm/processInstance/index.ts
index dfcf4f7f..5d6eefd7 100644
--- a/src/api/bpm/processInstance/index.ts
+++ b/src/api/bpm/processInstance/index.ts
@@ -89,8 +89,8 @@ export const getProcessInstanceCopyPage = async (params: any) => {
 }
 
 // 获取审批详情
-export const getApprovalDetail = async (data: any) => {
-  return await request.post({ url: '/bpm/process-instance/get-approval-detail', data: data })
+export const getApprovalDetail = async (params: any) => {
+  return await request.get({ url: '/bpm/process-instance/get-approval-detail', params })
 }
 
 // 获取表单字段权限
diff --git a/src/views/bpm/processInstance/create/ProcessDefinitionDetail.vue b/src/views/bpm/processInstance/create/ProcessDefinitionDetail.vue
index a6f10f08..d1c364b7 100644
--- a/src/views/bpm/processInstance/create/ProcessDefinitionDetail.vue
+++ b/src/views/bpm/processInstance/create/ProcessDefinitionDetail.vue
@@ -162,7 +162,7 @@ const getApprovalDetail = async (row: any) => {
     const data = await ProcessInstanceApi.getApprovalDetail({
       processDefinitionId: row.id,
       activityId: NodeId.START_USER_NODE_ID,
-      processVariables: row.processVariables
+      processVariablesStr: JSON.stringify(row.processVariables)
     })
 
     if (!data) {
@@ -224,7 +224,7 @@ const submitForm = async () => {
   // 预测流程节点会因为输入的参数值而产生新的预测结果值，所以在提交时需重新预测一次
   await getApprovalDetail({
     id: props.selectProcessDefinition.id,
-    processVariables: detailForm.value?.value
+    processVariablesStr: JSON.stringify(detailForm.value?.value)
   })
   // 恢复已选择的审批人信息
   Object.keys(savedAssignees).forEach((id) => {

From b3326db715a22a14aa08c9782908c4f9dbede2a3 Mon Sep 17 00:00:00 2001
From: lizhixian <18210040298@163.com>
Date: Tue, 18 Feb 2025 10:44:19 +0800
Subject: [PATCH 08/12] =?UTF-8?q?fix:=20=E8=B0=83=E6=95=B4=E8=8E=B7?=
 =?UTF-8?q?=E5=8F=96=E9=A2=84=E6=B5=8B=E6=8E=A5=E5=8F=A3=E7=9A=84=E8=AF=B7?=
 =?UTF-8?q?=E6=B1=82=E5=8F=82=E6=95=B0?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../bpm/processInstance/create/ProcessDefinitionDetail.vue    | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/src/views/bpm/processInstance/create/ProcessDefinitionDetail.vue b/src/views/bpm/processInstance/create/ProcessDefinitionDetail.vue
index d1c364b7..756b323f 100644
--- a/src/views/bpm/processInstance/create/ProcessDefinitionDetail.vue
+++ b/src/views/bpm/processInstance/create/ProcessDefinitionDetail.vue
@@ -162,7 +162,7 @@ const getApprovalDetail = async (row: any) => {
     const data = await ProcessInstanceApi.getApprovalDetail({
       processDefinitionId: row.id,
       activityId: NodeId.START_USER_NODE_ID,
-      processVariablesStr: JSON.stringify(row.processVariables)
+      processVariablesStr: JSON.stringify(row.processVariablesStr)
     })
 
     if (!data) {
@@ -224,7 +224,7 @@ const submitForm = async () => {
   // 预测流程节点会因为输入的参数值而产生新的预测结果值，所以在提交时需重新预测一次
   await getApprovalDetail({
     id: props.selectProcessDefinition.id,
-    processVariablesStr: JSON.stringify(detailForm.value?.value)
+    processVariablesStr: detailForm.value?.value
   })
   // 恢复已选择的审批人信息
   Object.keys(savedAssignees).forEach((id) => {

From b03711e0df7725b8847888b1a0adac8896925449 Mon Sep 17 00:00:00 2001
From: lizhixian <18210040298@163.com>
Date: Tue, 18 Feb 2025 14:15:53 +0800
Subject: [PATCH 09/12] =?UTF-8?q?fix=EF=BC=9A=E7=A7=BB=E9=99=A4=E5=88=9B?=
 =?UTF-8?q?=E5=BB=BA=E6=B5=81=E7=A8=8B=E6=8E=A5=E5=8F=A3=E5=8F=82=E6=95=B0?=
 =?UTF-8?q?nodeIds?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../create/ProcessDefinitionDetail.vue           | 16 ++++++++++++++--
 1 file changed, 14 insertions(+), 2 deletions(-)

diff --git a/src/views/bpm/processInstance/create/ProcessDefinitionDetail.vue b/src/views/bpm/processInstance/create/ProcessDefinitionDetail.vue
index 756b323f..bbe67a8a 100644
--- a/src/views/bpm/processInstance/create/ProcessDefinitionDetail.vue
+++ b/src/views/bpm/processInstance/create/ProcessDefinitionDetail.vue
@@ -155,6 +155,19 @@ const initProcessInfo = async (row: any, formVariables?: any) => {
   }
 }
 
+// 监听 formVariables 的变化
+watch(
+  detailForm.value,
+  (newValue, oldValue) => {
+    console.log('formVariables 发生了变化')
+    console.log('新值:', newValue)
+    console.log('旧值:', oldValue)
+  },
+  {
+    deep: true // 深度监听，当对象内部属性变化时也会触发回调
+  }
+)
+
 /** 获取审批详情 */
 const getApprovalDetail = async (row: any) => {
   try {
@@ -249,8 +262,7 @@ const submitForm = async () => {
     await ProcessInstanceApi.createProcessInstance({
       processDefinitionId: props.selectProcessDefinition.id,
       variables: detailForm.value.value,
-      startUserSelectAssignees: startUserSelectAssignees.value,
-      nodeIds: activityNodes.value?.map((item: any) => item.id)
+      startUserSelectAssignees: startUserSelectAssignees.value
     })
     // 提示
     message.success('发起流程成功')

From 7467b0b4e0a0538b00e9c0c92acfad75c17b3112 Mon Sep 17 00:00:00 2001
From: lizhixian <18210040298@163.com>
Date: Tue, 18 Feb 2025 17:15:17 +0800
Subject: [PATCH 10/12] =?UTF-8?q?fix=EF=BC=9A=E7=9B=91=E5=90=AC=E8=A1=A8?=
 =?UTF-8?q?=E5=8D=95=E5=AD=97=E6=AE=B5=EF=BC=8C=E8=B0=83=E7=94=A8=E6=B5=81?=
 =?UTF-8?q?=E7=A8=8B=E9=A2=84=E6=B5=8B=E8=8A=82=E7=82=B9?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../create/ProcessDefinitionDetail.vue        | 32 +++++++------------
 1 file changed, 12 insertions(+), 20 deletions(-)

diff --git a/src/views/bpm/processInstance/create/ProcessDefinitionDetail.vue b/src/views/bpm/processInstance/create/ProcessDefinitionDetail.vue
index bbe67a8a..dbecc508 100644
--- a/src/views/bpm/processInstance/create/ProcessDefinitionDetail.vue
+++ b/src/views/bpm/processInstance/create/ProcessDefinitionDetail.vue
@@ -154,17 +154,21 @@ const initProcessInfo = async (row: any, formVariables?: any) => {
     // 这里暂时无需加载流程图，因为跳出到另外个 Tab；
   }
 }
-
-// 监听 formVariables 的变化
+// 预测流程节点会因为输入的参数值而产生新的预测结果值，所以需重新预测一次
 watch(
   detailForm.value,
-  (newValue, oldValue) => {
-    console.log('formVariables 发生了变化')
-    console.log('新值:', newValue)
-    console.log('旧值:', oldValue)
+  (newValue) => {
+    if (newValue && Object.keys(newValue.value).length > 0) {
+      // startUserSelectTasks.value = []
+      // startUserSelectAssignees.value = []
+      getApprovalDetail({
+        id: props.selectProcessDefinition.id,
+        processVariablesStr: newValue.value
+      })
+    }
   },
   {
-    deep: true // 深度监听，当对象内部属性变化时也会触发回调
+    immediate: true
   }
 )
 
@@ -232,19 +236,7 @@ const submitForm = async () => {
   }
   // 流程表单校验
   await fApi.value.validate()
-  // 临时保存已选择的审批人信息，避免重新预测后已选择的审批人丢失
-  const savedAssignees = { ...startUserSelectAssignees.value }
-  // 预测流程节点会因为输入的参数值而产生新的预测结果值，所以在提交时需重新预测一次
-  await getApprovalDetail({
-    id: props.selectProcessDefinition.id,
-    processVariablesStr: detailForm.value?.value
-  })
-  // 恢复已选择的审批人信息
-  Object.keys(savedAssignees).forEach((id) => {
-    if (startUserSelectAssignees.value[id]) {
-      startUserSelectAssignees.value[id] = savedAssignees[id]
-    }
-  })
+  // debugger
   // 如果有指定审批人，需要校验
   if (startUserSelectTasks.value?.length > 0) {
     for (const userTask of startUserSelectTasks.value) {

From b53bfbd49e37dddab44d205956c33e31295d5228 Mon Sep 17 00:00:00 2001
From: smallNorthLee <18210040298@163.com>
Date: Tue, 18 Feb 2025 22:40:47 +0800
Subject: [PATCH 11/12] =?UTF-8?q?fix=EF=BC=9A=E7=9B=91=E5=90=AC=E8=BE=93?=
 =?UTF-8?q?=E5=85=A5=E5=8F=98=E9=87=8F=E5=80=BC=EF=BC=8C=E9=A2=84=E6=B5=8B?=
 =?UTF-8?q?=E8=8A=82=E7=82=B9=E8=BD=A8=E8=BF=B9=E3=80=82=E5=AF=BC=E8=87=B4?=
 =?UTF-8?q?=E8=8A=82=E7=82=B9=E9=85=8D=E7=BD=AE=E5=AE=A1=E6=89=B9=E4=BA=BA?=
 =?UTF-8?q?=E9=94=99=E8=AF=AF=E9=97=AE=E9=A2=98?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../create/ProcessDefinitionDetail.vue        | 21 ++++++++++++-------
 1 file changed, 14 insertions(+), 7 deletions(-)

diff --git a/src/views/bpm/processInstance/create/ProcessDefinitionDetail.vue b/src/views/bpm/processInstance/create/ProcessDefinitionDetail.vue
index dbecc508..87ee5e84 100644
--- a/src/views/bpm/processInstance/create/ProcessDefinitionDetail.vue
+++ b/src/views/bpm/processInstance/create/ProcessDefinitionDetail.vue
@@ -108,6 +108,7 @@ const fApi = ref<ApiAttrs>()
 // 指定审批人
 const startUserSelectTasks: any = ref([]) // 发起人需要选择审批人或抄送人的任务列表
 const startUserSelectAssignees = ref({}) // 发起人选择审批人的数据
+const hisStartUserSelectAssignees = ref({}) // 历史发起人选择审批人的数据
 const bpmnXML: any = ref(null) // BPMN 数据
 const simpleJson = ref<string | undefined>() // Simple 设计器数据 json 格式
 
@@ -154,13 +155,15 @@ const initProcessInfo = async (row: any, formVariables?: any) => {
     // 这里暂时无需加载流程图，因为跳出到另外个 Tab；
   }
 }
+
 // 预测流程节点会因为输入的参数值而产生新的预测结果值，所以需重新预测一次
 watch(
   detailForm.value,
   (newValue) => {
     if (newValue && Object.keys(newValue.value).length > 0) {
-      // startUserSelectTasks.value = []
-      // startUserSelectAssignees.value = []
+      //记录之前的节点审批人
+      hisStartUserSelectAssignees.value = startUserSelectAssignees.value
+      startUserSelectAssignees.value = {}
       getApprovalDetail({
         id: props.selectProcessDefinition.id,
         processVariablesStr: newValue.value
@@ -186,19 +189,24 @@ const getApprovalDetail = async (row: any) => {
       message.error('查询不到审批详情信息！')
       return
     }
+    // 获取审批节点，显示 Timeline 的数据
+    activityNodes.value = data.activityNodes
 
     // 获取发起人自选的任务
     startUserSelectTasks.value = data.activityNodes?.filter(
       (node: ApprovalNodeInfo) => CandidateStrategy.START_USER_SELECT === node.candidateStrategy
     )
+    
     if (startUserSelectTasks.value?.length > 0) {
       for (const node of startUserSelectTasks.value) {
-        startUserSelectAssignees.value[node.id] = []
+        if (hisStartUserSelectAssignees.value[node.id] && hisStartUserSelectAssignees.value[node.id].length > 0) {
+          startUserSelectAssignees.value[node.id] = hisStartUserSelectAssignees.value[node.id]
+        } else {
+          startUserSelectAssignees.value[node.id] = []
+        }
       }
     }
-
-    // 获取审批节点，显示 Timeline 的数据
-    activityNodes.value = data.activityNodes
+    
     // 获取表单字段权限
     const formFieldsPermission = data.formFieldsPermission
     // 设置表单字段权限
@@ -236,7 +244,6 @@ const submitForm = async () => {
   }
   // 流程表单校验
   await fApi.value.validate()
-  // debugger
   // 如果有指定审批人，需要校验
   if (startUserSelectTasks.value?.length > 0) {
     for (const userTask of startUserSelectTasks.value) {

From ee8de0810356ca8ec0c9151077ad8e560a093d3e Mon Sep 17 00:00:00 2001
From: lizhixian <18210040298@163.com>
Date: Wed, 19 Feb 2025 10:58:17 +0800
Subject: [PATCH 12/12] =?UTF-8?q?fix:=20=E4=BF=AE=E6=94=B9pr=E4=B8=AD698?=
 =?UTF-8?q?=E7=9A=84=E9=97=AE=E9=A2=98?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../detail/ProcessInstanceOperationButton.vue               | 6 ++++++
 1 file changed, 6 insertions(+)

diff --git a/src/views/bpm/processInstance/detail/ProcessInstanceOperationButton.vue b/src/views/bpm/processInstance/detail/ProcessInstanceOperationButton.vue
index f9f63fa9..11a3a32f 100644
--- a/src/views/bpm/processInstance/detail/ProcessInstanceOperationButton.vue
+++ b/src/views/bpm/processInstance/detail/ProcessInstanceOperationButton.vue
@@ -700,6 +700,12 @@ const handleAudit = async (pass: boolean, formRef: FormInstance | undefined) =>
     // 校验表单
     if (!formRef) return
     await formRef.validate()
+    //校验流程表单必填字段
+    const valid = await validateNormalForm()
+    if (!valid) {
+      message.warning('表单校验不通过，请先完善表单!!')
+      return
+    }
     if (pass) {
       // 获取修改的流程变量, 暂时只支持流程表单
       const variables = getUpdatedProcessInstanceVariables()