From 7fd4ed216954b4939eaae0a47a7330908916ca83 Mon Sep 17 00:00:00 2001
From: ye1023 <12588209+ye1023@user.noreply.gitee.com>
Date: Mon, 11 May 2026 16:28:02 +0800
Subject: [PATCH] =?UTF-8?q?yxk-20260509-=E5=85=9A=E5=A7=94=E4=BC=9A?=
 =?UTF-8?q?=E5=8F=8D=E9=A6=88=E4=BF=A1=E6=81=AF=E8=A1=A8=E5=8D=95=201?=
 =?UTF-8?q?=E3=80=81=E6=96=B0=E5=A2=9E=E5=8F=8D=E9=A6=88=E7=9A=84=E6=97=B6?=
 =?UTF-8?q?=E5=80=99=EF=BC=8C=E5=86=99=E5=85=A5=E5=BD=93=E5=89=8D=E6=B5=81?=
 =?UTF-8?q?=E7=A8=8B=E5=AE=9E=E4=BE=8Bid=EF=BC=8C=E9=81=BF=E5=85=8D?=
 =?UTF-8?q?=E6=9F=A5=E8=AF=A2=E5=85=B6=E4=BB=96=E7=9D=A3=E5=8A=9E=E6=B5=81?=
 =?UTF-8?q?=E7=A8=8B=E7=9A=84=E5=8F=8D=E9=A6=88=E4=BF=A1=E6=81=AF=202?=
 =?UTF-8?q?=E3=80=81=E6=9F=A5=E8=AF=A2=E5=8F=8D=E9=A6=88=E4=BF=A1=E6=81=AF?=
 =?UTF-8?q?=E6=97=B6=EF=BC=8C=E9=9C=80=E8=A6=81=E6=A0=B9=E6=8D=AE=E5=BD=93?=
 =?UTF-8?q?=E5=89=8D=E6=B5=81=E7=A8=8B=E5=AE=9E=E4=BE=8Bid=E6=9F=A5?=
 =?UTF-8?q?=E8=AF=A2?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../semri/process/FlowScheduleStartModal.vue  |  4 ++--
 .../BgPartymatterBPMFeedbackModal.vue         |  8 ++++---
 .../components/BgPartymatterBPMForm.vue       | 23 +++++++++++++++----
 3 files changed, 25 insertions(+), 10 deletions(-)

diff --git a/src/components/semri/process/FlowScheduleStartModal.vue b/src/components/semri/process/FlowScheduleStartModal.vue
index 1c76b2d..967832e 100644
--- a/src/components/semri/process/FlowScheduleStartModal.vue
+++ b/src/components/semri/process/FlowScheduleStartModal.vue
@@ -28,11 +28,11 @@
       </a-form-item>
 
       <template v-if="showSuoleaderFields">
-        <a-form-item label="是否抄送所办领导">
+        <a-form-item label="是否所办领导审批">
           <j-switch v-model:value="formData.isNeedAppro" />
         </a-form-item>
 
-        <a-form-item label="抄送所办领导">
+        <a-form-item label="所办领导">
           <j-select-user
             v-model:value="formData.supDeptleaderid"
             :disabled="String(formData.isNeedAppro) !== '1'"
diff --git a/src/views/bg/bgpartymatter/components/BgPartymatterBPMFeedbackModal.vue b/src/views/bg/bgpartymatter/components/BgPartymatterBPMFeedbackModal.vue
index 71a6af7..74e892d 100644
--- a/src/views/bg/bgpartymatter/components/BgPartymatterBPMFeedbackModal.vue
+++ b/src/views/bg/bgpartymatter/components/BgPartymatterBPMFeedbackModal.vue
@@ -103,6 +103,7 @@
     actualExect: '',
     actualTime: '',
     bpmStatus: '',
+    bpmProcessId: '',
     mainId: '',
   });
 
@@ -110,17 +111,18 @@
     actualExect: [{ required: true, message: '请输入实际执行情况' }],
   };
 
-  function resetForm(mainId = '') {
+  function resetForm(mainId = '', bpmProcessId = '') {
     Object.keys(formData).forEach((key) => {
       formData[key] = '';
     });
     formData.mainId = mainId;
+    formData.bpmProcessId = bpmProcessId;
     uploadKey.value += 1;
     nextTick(() => formRef.value?.clearValidate?.());
   }
 
-  function open(mainId: string, secretLevel?: string | number) {
-    resetForm(mainId);
+  function open(mainId: string, secretLevel?: string | number, bpmProcessId = '') {
+    resetForm(mainId, bpmProcessId);
     uploadSecretLevel.value = normalizeSecretLevel(secretLevel);
     void applyCurrentUserFeedbackInfo();
     visible.value = true;
diff --git a/src/views/bg/bgpartymatter/components/BgPartymatterBPMForm.vue b/src/views/bg/bgpartymatter/components/BgPartymatterBPMForm.vue
index e83f427..4d4032e 100644
--- a/src/views/bg/bgpartymatter/components/BgPartymatterBPMForm.vue
+++ b/src/views/bg/bgpartymatter/components/BgPartymatterBPMForm.vue
@@ -236,7 +236,14 @@
   const processInfo = computed(() => ({
     taskId: props.formData?.taskId,
     taskDefKey: props.formData?.taskDefKey,
-    processInstanceId: props.formData?.procInsId || props.formData?.processInstanceId || props.formData?.vars?.BPM_INST_ID,
+    processInstanceId:
+      props.formData?.procInsId ||
+      props.formData?.procInstId ||
+      props.formData?.processInstanceId ||
+      props.formData?.vars?.BPM_INST_ID ||
+      props.formData?.vars?.JG_LOCAL_PROCESS_ID ||
+      props.formData?.vars?.process_inst_id ||
+      props.formData?.vars?.processInstanceId,
     processDataId: props.formData?.processDataId,
     processTableName: props.formData?.processTableName,
   }));
@@ -246,7 +253,7 @@
   });
 
   watch(
-    () => props.formData?.dataId,
+    [() => props.formData?.dataId, () => processInfo.value.processInstanceId],
     () => initFormData()
   );
 
@@ -273,11 +280,12 @@
   }
 
   async function loadFeedbackList() {
-    if (!mainForm.id) {
+    const bpmProcessId = processInfo.value.processInstanceId;
+    if (!mainForm.id || !bpmProcessId) {
       feedbackList.value = [];
       return;
     }
-    const res = await bgPartymatterFeedbackList({ mainId: mainForm.id, pageNo: 1, pageSize: 999 });
+    const res = await bgPartymatterFeedbackList({ mainId: mainForm.id, bpmProcessId, pageNo: 1, pageSize: 999 });
     feedbackList.value = res?.records || res?.result?.records || [];
   }
 
@@ -307,7 +315,12 @@
       createMessage.warning('主表数据不存在，无法新增反馈');
       return;
     }
-    feedbackModalRef.value?.open(mainForm.id, mainForm.secretLevel);
+    const processInstanceId = processInfo.value.processInstanceId;
+    if (!processInstanceId) {
+      createMessage.warning('流程实例ID不能为空，无法新增反馈');
+      return;
+    }
+    feedbackModalRef.value?.open(mainForm.id, mainForm.secretLevel, processInstanceId);
   }
 
   async function saveSubApproveUserVariable() {