From 36294575d11b5bcc943a27bac0a7a91d933e18b1 Mon Sep 17 00:00:00 2001
From: jason <2667446@qq.com>
Date: Thu, 11 Jun 2026 22:58:03 +0800
Subject: [PATCH] =?UTF-8?q?feat:=20[bpm][ele]=20=E5=AE=A1=E6=89=B9?=
 =?UTF-8?q?=EF=BC=8C=E6=8B=92=E7=BB=9D=E5=8F=AF=E4=BB=A5=E6=B7=BB=E5=8A=A0?=
 =?UTF-8?q?=E9=99=84=E4=BB=B6?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../src/api/bpm/processInstance/index.ts      |  1 +
 .../src/components/upload/file-upload.vue     |  5 +-
 .../detail/modules/operation-button.vue       | 75 ++++++++++++++++++-
 .../detail/modules/time-line.vue              | 68 +++++++++++++++--
 4 files changed, 138 insertions(+), 11 deletions(-)

diff --git a/apps/web-ele/src/api/bpm/processInstance/index.ts b/apps/web-ele/src/api/bpm/processInstance/index.ts
index 7ee5421f8..f8442c35c 100644
--- a/apps/web-ele/src/api/bpm/processInstance/index.ts
+++ b/apps/web-ele/src/api/bpm/processInstance/index.ts
@@ -83,6 +83,7 @@ export namespace BpmProcessInstanceApi {
     reason: string;
     signPicUrl: string;
     status: number;
+    attachments?: string[];
   }
 
   /** 抄送流程实例 */
diff --git a/apps/web-ele/src/components/upload/file-upload.vue b/apps/web-ele/src/components/upload/file-upload.vue
index 476027582..8789154e0 100644
--- a/apps/web-ele/src/components/upload/file-upload.vue
+++ b/apps/web-ele/src/components/upload/file-upload.vue
@@ -139,9 +139,6 @@ function handleRemove(file: UploadFile) {
 /** 处理文件预览 */
 function handlePreview(file: UploadFile) {
   emit('preview', file);
-  if (file.url) {
-    window.open(file.url);
-  }
 }
 
 /** 处理文件数量超限 */
@@ -307,7 +304,7 @@ function getValue() {
 </script>
 
 <template>
-  <div>
+  <div class="w-full">
     <ElUpload
       v-bind="$attrs"
       v-model:file-list="fileList"
diff --git a/apps/web-ele/src/views/bpm/processInstance/detail/modules/operation-button.vue b/apps/web-ele/src/views/bpm/processInstance/detail/modules/operation-button.vue
index 20d6dc7c2..3d5c04d5f 100644
--- a/apps/web-ele/src/views/bpm/processInstance/detail/modules/operation-button.vue
+++ b/apps/web-ele/src/views/bpm/processInstance/detail/modules/operation-button.vue
@@ -31,6 +31,7 @@ import {
   ElForm,
   ElFormItem,
   ElImage,
+  ElImageViewer,
   ElInput,
   ElMessage,
   ElOption,
@@ -55,6 +56,7 @@ import {
   transferTask,
 } from '#/api/bpm/task';
 import { setConfAndFields2 } from '#/components/form-create';
+import { FileUpload } from '#/components/upload';
 import { $t } from '#/locales';
 
 import Signature from './signature.vue';
@@ -119,6 +121,7 @@ const approveReasonForm: any = reactive({
   reason: '',
   signPicUrl: '',
   nextAssignees: {},
+  attachments: [],
 });
 const approveReasonRule: Record<string, any> = computed(() => {
   return {
@@ -141,6 +144,7 @@ const approveReasonRule: Record<string, any> = computed(() => {
 const rejectFormRef = ref<FormInstance>();
 const rejectReasonForm = reactive({
   reason: '',
+  attachments: [],
 }); // 拒绝表单
 const rejectReasonRule: any = computed(() => {
   return {
@@ -299,6 +303,14 @@ function closePopover(type: string, formRef: any | FormInstance) {
   if (formRef) {
     formRef.resetFields();
   }
+  if (type === 'approve') {
+    approveReasonForm.reason = '';
+    approveReasonForm.attachments = [];
+    approveReasonForm.signPicUrl = '';
+  } else if (type === 'reject') {
+    rejectReasonForm.reason = '';
+    rejectReasonForm.attachments = [];
+  }
   if (popOverVisible.value[type]) popOverVisible.value[type] = false;
   nextAssigneesActivityNode.value = [];
   // 清理 Timeline 组件中的自定义审批人数据
@@ -410,6 +422,7 @@ async function handleAudit(pass: boolean, formRef: FormInstance | undefined) {
       const data = {
         id: runningTask.value.id,
         reason: approveReasonForm.reason,
+        attachments: approveReasonForm.attachments,
         variables, // 审批通过, 把修改的字段值赋于流程实例变量
         nextAssignees: approveReasonForm.nextAssignees, // 下个自选节点选择的审批人信息
       } as any;
@@ -423,6 +436,9 @@ async function handleAudit(pass: boolean, formRef: FormInstance | undefined) {
         await formCreateApi.validate();
       }
       await approveTask(data);
+      approveReasonForm.reason = '';
+      approveReasonForm.attachments = [];
+      approveReasonForm.signPicUrl = '';
       popOverVisible.value.approve = false;
       nextAssigneesActivityNode.value = [];
       // 清理 Timeline 组件中的自定义审批人数据
@@ -435,8 +451,11 @@ async function handleAudit(pass: boolean, formRef: FormInstance | undefined) {
       const data = {
         id: runningTask.value.id,
         reason: rejectReasonForm.reason,
+        attachments: rejectReasonForm.attachments,
       };
       await rejectTask(data);
+      rejectReasonForm.reason = '';
+      rejectReasonForm.attachments = [];
       popOverVisible.value.reject = false;
       ElMessage.success('审批不通过成功');
     }
@@ -757,6 +776,34 @@ function handleSignFinish(url: string) {
   approveFormRef.value?.validateField('signPicUrl');
 }
 
+/** 判断文件是否为图片类型 */
+function isImageUrl(url: string) {
+  return /\.(jpg|jpeg|png|gif|bmp|webp|svg)$/i.test(url);
+}
+
+/** 附件图片预览 */
+const imagePreviewVisible = ref(false);
+const imagePreviewUrl = ref('');
+
+/** 处理文件预览 */
+function handleFilePreview(file: any) {
+  if (!file?.url && !file?.response) {
+    ElMessage.warning('文件地址不存在，无法预览');
+    return;
+  }
+  const url = file.url || file?.response?.url || file?.response;
+  if (!url) {
+    ElMessage.warning('文件地址不存在，无法预览');
+    return;
+  }
+  if (isImageUrl(url)) {
+    imagePreviewUrl.value = url;
+    imagePreviewVisible.value = true;
+  } else {
+    window.open(url, '_blank');
+  }
+}
+
 // TODO @jason：handlePopoverVisible 需要要有么？
 
 defineExpose({ loadTodoTask });
@@ -849,6 +896,15 @@ defineExpose({ loadTodoTask });
                 :rows="4"
               />
             </ElFormItem>
+            <ElFormItem label="上传附件/图片" prop="attachments">
+              <FileUpload
+                v-model:value="approveReasonForm.attachments"
+                :max-number="10"
+                :multiple="true"
+                help-text="支持多文件/图片上传"
+                @preview="handleFilePreview"
+              />
+            </ElFormItem>
             <ElFormItem>
               <ElSpace>
                 <ElButton
@@ -873,7 +929,7 @@ defineExpose({ loadTodoTask });
       <ElPopover
         :visible="popOverVisible.reject"
         placement="top"
-        :popper-style="{ minWidth: '400px' }"
+        :popper-style="{ minWidth: '500px' }"
         trigger="click"
         v-if="
           runningTask &&
@@ -907,6 +963,15 @@ defineExpose({ loadTodoTask });
                 :rows="4"
               />
             </ElFormItem>
+            <ElFormItem label="上传附件/图片" prop="attachments">
+              <FileUpload
+                v-model:value="rejectReasonForm.attachments"
+                :max-number="10"
+                :multiple="true"
+                help-text="支持多文件/图片上传"
+                @preview="handleFilePreview"
+              />
+            </ElFormItem>
             <ElFormItem>
               <ElButton
                 :disabled="formLoading"
@@ -1472,4 +1537,12 @@ defineExpose({ loadTodoTask });
 
   <!-- 签名弹窗 -->
   <SignatureModal @success="handleSignFinish" />
+
+  <!-- 图片预览弹窗 -->
+  <ElImageViewer
+    v-if="imagePreviewVisible"
+    :url-list="[imagePreviewUrl]"
+    @close="imagePreviewVisible = false"
+    :z-index="9999"
+  />
 </template>
diff --git a/apps/web-ele/src/views/bpm/processInstance/detail/modules/time-line.vue b/apps/web-ele/src/views/bpm/processInstance/detail/modules/time-line.vue
index 02e4c6382..a7c19037f 100644
--- a/apps/web-ele/src/views/bpm/processInstance/detail/modules/time-line.vue
+++ b/apps/web-ele/src/views/bpm/processInstance/detail/modules/time-line.vue
@@ -201,16 +201,25 @@ function shouldShowCustomUserSelect(
   );
 }
 
-/** 判断是否需要显示审批意见 */
-function shouldShowApprovalReason(task: any, nodeType: BpmNodeTypeEnum) {
+/** 判断是否需要显示审批意见和附件 */
+function shouldShowReasonAndAttachment(task: any, nodeType: BpmNodeTypeEnum) {
   return (
-    task.reason &&
+    (task.reason || task.attachments?.length > 0) &&
     [BpmNodeTypeEnum.START_USER_NODE, BpmNodeTypeEnum.USER_TASK_NODE].includes(
       nodeType,
     )
   );
 }
 
+function getAttachmentName(url: string) {
+  return decodeURIComponent(url.slice(url.lastIndexOf('/') + 1));
+}
+
+function isImageAttachment(url: string) {
+  const ext = url.split('.').pop()?.toLowerCase();
+  return ['bmp', 'gif', 'jpeg', 'jpg', 'png', 'webp'].includes(ext || '');
+}
+
 /** 用户选择弹窗关闭 */
 function handleUserSelectClosed() {
   selectedUsers.value = [];
@@ -411,13 +420,60 @@ defineExpose({ setCustomApproveUsers, batchSetCustomApproveUsers });
                 </div>
               </div>
 
-              <!-- 审批意见和签名 -->
+              <!-- 审批意见,附件和签名 -->
               <teleport defer :to="`#activity-task-${activity.id}-${index}`">
                 <div
-                  v-if="shouldShowApprovalReason(task, activity.nodeType)"
+                  v-if="shouldShowReasonAndAttachment(task, activity.nodeType)"
                   class="mt-1 w-full rounded-md bg-gray-100 p-2 text-sm text-gray-500"
                 >
-                  审批意见：{{ task.reason }}
+                  <div v-if="task.reason">审批意见：{{ task.reason }}</div>
+                  <div
+                    v-if="(task.attachments?.length || 0) > 0"
+                    :class="{
+                      'mt-2 border-t border-dashed border-gray-300 pt-2':
+                        task.reason,
+                    }"
+                  >
+                    <div class="mb-1 text-xs font-semibold text-gray-400">
+                      附件列表：
+                    </div>
+                    <div class="flex flex-col gap-1.5">
+                      <template
+                        v-for="(
+                          attachment, attachmentIndex
+                        ) in task.attachments"
+                        :key="attachmentIndex"
+                      >
+                        <div class="flex items-center gap-2">
+                          <IconifyIcon
+                            :icon="
+                              isImageAttachment(attachment)
+                                ? 'lucide:image'
+                                : 'lucide:file-text'
+                            "
+                            class="text-gray-400"
+                          />
+                          <ElImage
+                            v-if="isImageAttachment(attachment)"
+                            style="width: 32px; height: 32px"
+                            class="rounded border border-solid border-gray-200 object-cover"
+                            :src="attachment"
+                            :preview-src-list="[attachment]"
+                            fit="cover"
+                          />
+                          <a
+                            v-else
+                            :href="attachment"
+                            target="_blank"
+                            class="max-w-[240px] truncate text-blue-500 hover:text-blue-600 hover:underline"
+                            :title="getAttachmentName(attachment)"
+                          >
+                            {{ getAttachmentName(attachment) }}
+                          </a>
+                        </div>
+                      </template>
+                    </div>
+                  </div>
                 </div>
                 <div
                   v-if="