From cff70861348a3865239323dd764a89938d9ef74a Mon Sep 17 00:00:00 2001
From: ye1023 <12588209+ye1023@user.noreply.gitee.com>
Date: Thu, 30 Apr 2026 11:15:04 +0800
Subject: [PATCH] =?UTF-8?q?yxk-20260430-=E5=85=9A=E5=A7=94=E4=BC=9A?=
 =?UTF-8?q?=E6=B5=81=E7=A8=8B=E5=8A=9E=E7=90=86=E9=A1=B5=E9=9D=A2=E6=94=B9?=
 =?UTF-8?q?=E9=80=A0=EF=BC=8C=E5=B0=86=E6=B5=81=E7=A8=8B=E5=AE=A1=E6=89=B9?=
 =?UTF-8?q?=E7=9B=B8=E5=85=B3=E9=A1=B5=E9=9D=A2=E9=9B=86=E6=88=90=E5=88=B0?=
 =?UTF-8?q?=E8=A1=A8=E5=8D=95=E4=B8=8B=E6=96=B9=E4=B8=80=E8=B5=B7=E5=8A=9E?=
 =?UTF-8?q?=E7=90=86?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../bg/bgpartymatter/BgPartymatter.api.ts     |  5 ++++
 .../components/BgPartymatterBPMForm.vue       | 25 +++++++++++++++-
 .../bpm/process/components/BpmDynamicForm.vue | 29 +++++++++++++++++--
 .../myHandleTask/content/MyHandleContent.vue  | 10 +++----
 .../myHandleTask/modal/TaskHandleModal.vue    | 21 ++++++++++----
 5 files changed, 75 insertions(+), 15 deletions(-)

diff --git a/src/views/bg/bgpartymatter/BgPartymatter.api.ts b/src/views/bg/bgpartymatter/BgPartymatter.api.ts
index ba5f6c8..0363b12 100644
--- a/src/views/bg/bgpartymatter/BgPartymatter.api.ts
+++ b/src/views/bg/bgpartymatter/BgPartymatter.api.ts
@@ -13,6 +13,7 @@ enum Api {
   importExcel = '/bgpartymatter/bgPartymatter/importExcel',
   exportXls = '/bgpartymatter/bgPartymatter/exportXls',
   saveBpmForm = '/bgpartymatter/bgPartymatter/saveBpmForm',
+  setProcessVariable = '/act/process/setProcessVariable',
   bgPartymatterFeedbackList = '/bgpartymatter/bgPartymatter/listBgPartymatterFeedbackByMainId',
   bgPartymatterFeedbackSave= '/bgpartymatter/bgPartymatter/addBgPartymatterFeedback',
   bgPartymatterFeedbackEdit= '/bgpartymatter/bgPartymatter/editBgPartymatterFeedback',
@@ -78,6 +79,10 @@ export const saveBpmForm = (params) => {
   return defHttp.post({ url: Api.saveBpmForm, params }, { isTransformResponse: false });
 }
 
+export const setProcessVariable = (params) => {
+  return defHttp.post({ url: Api.setProcessVariable, params }, { isTransformResponse: false });
+}
+
 /**
  * 列表接口
  * @param params
diff --git a/src/views/bg/bgpartymatter/components/BgPartymatterBPMForm.vue b/src/views/bg/bgpartymatter/components/BgPartymatterBPMForm.vue
index 30321ef..5ec5a76 100644
--- a/src/views/bg/bgpartymatter/components/BgPartymatterBPMForm.vue
+++ b/src/views/bg/bgpartymatter/components/BgPartymatterBPMForm.vue
@@ -144,6 +144,17 @@
           <a-button type="primary" :loading="savingFeedback" @click="saveFeedback">保存反馈</a-button>
         </div>
       </a-form>
+
+      <template v-if="showProcessHandle">
+        <a-divider />
+        <div class="section-title">流程办理</div>
+        <TaskHandleInnerContent
+          :form-data="formData"
+          :claim="claim"
+          @success="handleProcessSuccess"
+          @claimSuccess="handleClaimSuccess"
+        />
+      </template>
     </div>
   </a-spin>
 </template>
@@ -155,18 +166,20 @@
   import JSelectDept from '/@/components/Form/src/jeecg/components/JSelectDept.vue';
   import { bgPartymatterFeedbackList, bgPartymatterFeedbackSaveOrUpdate, saveBpmForm } from '../BgPartymatter.api';
   import { usePermission } from '/@/hooks/web/usePermission';
+  import TaskHandleInnerContent from '/@/views/super/bpm/process/personalOffice/myHandleTask/content/TaskHandleInnerContent.vue';
   const { isDisabledAuth, hasPermission, initBpmFormData} = usePermission();
 
   const props = defineProps({
     formDisabled: { type: Boolean, default: false },
     formData: { type: Object, default: () => ({}) },
     formBpm: { type: Boolean, default: true },
+    claim: { type: Boolean, default: false },
   });
 
   initBpmFormData(props.formData);
 
 
-  const emit = defineEmits(['ok']);
+  const emit = defineEmits(['ok', 'success', 'claimSuccess']);
   const { createMessage } = useMessage();
   const queryByIdUrl = '/bgpartymatter/bgPartymatter/queryById';
 
@@ -238,6 +251,8 @@
     return props.formDisabled;
   });
 
+  const showProcessHandle = computed(() => props.formBpm && !!props.formData?.taskId);
+
   const processInfo = computed(() => ({
     taskId: props.formData?.taskId,
     taskDefKey: props.formData?.taskDefKey,
@@ -341,6 +356,14 @@
     }
   }
 
+  function handleProcessSuccess() {
+    emit('success');
+  }
+
+  function handleClaimSuccess() {
+    emit('claimSuccess');
+  }
+
   defineExpose({
     submitForm,
     initFormData,
diff --git a/src/views/super/bpm/process/components/BpmDynamicForm.vue b/src/views/super/bpm/process/components/BpmDynamicForm.vue
index 838bc79..5653948 100644
--- a/src/views/super/bpm/process/components/BpmDynamicForm.vue
+++ b/src/views/super/bpm/process/components/BpmDynamicForm.vue
@@ -15,7 +15,15 @@
   <div v-else class="component_div">
     <Suspense v-if="path">
       <template #default>
-        <component v-if="path" :is="currentComponent" :formData="formData" form-bpm></component>
+        <component
+          v-if="path"
+          :is="currentComponent"
+          :formData="formData"
+          :claim="claim"
+          form-bpm
+          @success="handleSuccess"
+          @claimSuccess="handleClaimSuccess"
+        ></component>
       </template>
       <template #fallback>
         <div style="width: 100%; text-align: center; padding-top: 60px">
@@ -51,8 +59,13 @@
       },
       // 父级html
       parentNode: { type: Object as PropType<HTMLElement> },
+      claim: {
+        type: Boolean,
+        default: false,
+      },
     },
-    setup(props) {
+    emits: ['success', 'claimSuccess'],
+    setup(props, { emit }) {
       const height = window.innerHeight - 120 + 'px';
 
       /**
@@ -136,11 +149,21 @@
         return /^http[s]?:\/\/.*/.test(s);
       }
 
+      function handleSuccess() {
+        emit('success');
+      }
+
+      function handleClaimSuccess() {
+        emit('claimSuccess');
+      }
+
       return {
         height,
         iframeUrl,
         currentComponent,
-        designFormInfo
+        designFormInfo,
+        handleSuccess,
+        handleClaimSuccess
       };
     },
   };
diff --git a/src/views/super/bpm/process/personalOffice/myHandleTask/content/MyHandleContent.vue b/src/views/super/bpm/process/personalOffice/myHandleTask/content/MyHandleContent.vue
index 5ad25e2..1109d4e 100644
--- a/src/views/super/bpm/process/personalOffice/myHandleTask/content/MyHandleContent.vue
+++ b/src/views/super/bpm/process/personalOffice/myHandleTask/content/MyHandleContent.vue
@@ -1,6 +1,6 @@
 <template>
   <a-card style="margin-top: 10px">
-    <template #title> <audit-outlined /><span style="margin-left: 10px">我的审批</span> </template>
+<!--    <template #title> <audit-outlined /><span style="margin-left: 10px">我的审批</span> </template>-->
     <a-spin :spinning="loading">
       <a-list itemLayout="vertical">
         <a-list-item>
@@ -20,9 +20,9 @@
           </div>
         </a-list-item>
 
-        <a-list-item>
-          <j-upload text="添加文件" bizPath="bpm" :returnUrl="false" v-model:value="model.fileList"></j-upload>
-        </a-list-item>
+<!--        <a-list-item>-->
+<!--          <j-upload text="添加文件" bizPath="bpm" :returnUrl="false" v-model:value="model.fileList"></j-upload>-->
+<!--        </a-list-item>-->
 
         <!-- 选择分支 -->
         <a-list-item>
@@ -41,7 +41,7 @@
             </span>
 
             <span v-show="model.processModel == 3" v-if="historyCount > 0">
-              <a-select v-model:value="model.rejectModelNode" :getPopupContainer="(target) => target?.parentNode" style="width: 150px">
+              <a-select v-model:value="model.rejectModelNode" :getPopupContainer="(target) => target?.parentNode" style="width: 250px">
                 <template v-for="(item, index) in historyList">
                   <a-select-option v-if="item.NAME_ != currentTaskName" :value="item.TASK_DEF_KEY_">{{ item.NAME_ }}</a-select-option>
                 </template>
diff --git a/src/views/super/bpm/process/personalOffice/myHandleTask/modal/TaskHandleModal.vue b/src/views/super/bpm/process/personalOffice/myHandleTask/modal/TaskHandleModal.vue
index 023ecc3..53ef832 100644
--- a/src/views/super/bpm/process/personalOffice/myHandleTask/modal/TaskHandleModal.vue
+++ b/src/views/super/bpm/process/personalOffice/myHandleTask/modal/TaskHandleModal.vue
@@ -14,13 +14,20 @@
     <a-tabs v-model="activeKey" tabPosition="left">
       <a-tab-pane key="1">
         <template #tab> <file-text-outlined /><span>附加单据</span> </template>
-        <BpmDynamicForm :path="taskFormUrl" :form-data="taskFormData" :parentNode="parentNode"/>
+        <BpmDynamicForm
+          :path="taskFormUrl"
+          :form-data="taskFormData"
+          :claim="claimStatus"
+          :parentNode="parentNode"
+          @success="handleSuccess"
+          @claimSuccess="claimSuccess"
+        />
       </a-tab-pane>
 
-      <a-tab-pane key="2">
-        <template #tab> <user-outlined /><span>任务处理</span> </template>
-        <task-handle-inner-content @success="handleSuccess" :form-data="taskFormData" :claim="claimStatus" @claimSuccess="claimSuccess"></task-handle-inner-content>
-      </a-tab-pane>
+<!--      <a-tab-pane v-if="!isEmbeddedHandleForm" key="2">-->
+<!--        <template #tab> <user-outlined /><span>任务处理</span> </template>-->
+<!--        <task-handle-inner-content @success="handleSuccess" :form-data="taskFormData" :claim="claimStatus" @claimSuccess="claimSuccess"></task-handle-inner-content>-->
+<!--      </a-tab-pane>-->
 
       <a-tab-pane key="3">
         <template #tab> <partition-outlined /><span>流程图</span> </template>
@@ -73,6 +80,7 @@
       });
 
       const activeKey = ref('1');
+      const isEmbeddedHandleForm = computed(() => taskFormUrl.value?.includes('BgPartymatterBPMForm'));
 
       // desformView 父级滚动条，只有传了此参数才会突破内部弹窗
       const modalRef = ref();
@@ -100,7 +108,8 @@
         claimStatus,
         claimSuccess,
         modalRef,
-        parentNode
+        parentNode,
+        isEmbeddedHandleForm
       };
     },
   };