From db4baa7759b46a23faa3ff536220aa255542af59 Mon Sep 17 00:00:00 2001
From: zhangwencui <1064582902@qq.com>
Date: 星期一, 25 五月 2026 13:31:49 +0800
Subject: [PATCH] OA审批的修改中的附件列表没有带出来

---
 src/views/officeProcessAutomation/ApproveManage/approve-list/approveListConstants.js |  125 ++++++++++-------------------------------
 1 files changed, 31 insertions(+), 94 deletions(-)

diff --git a/src/views/officeProcessAutomation/ApproveManage/approve-list/approveListConstants.js b/src/views/officeProcessAutomation/ApproveManage/approve-list/approveListConstants.js
index ea61076..3251f0c 100644
--- a/src/views/officeProcessAutomation/ApproveManage/approve-list/approveListConstants.js
+++ b/src/views/officeProcessAutomation/ApproveManage/approve-list/approveListConstants.js
@@ -1,21 +1,7 @@
-import {
-  createEmptyNode,
-  formatDisplayTime,
-  mapNodesFromApi,
-  mapSignModeFromApi,
-  mapSignModeToApi,
-  normalizeFlowNodes,
-  nodeSignModeLabel,
-} from "../approve-template/approveTemplateConstants.js";
+import { createEmptyNode, formatDisplayTime, mapNodesFromApi, mapSignModeFromApi, mapSignModeToApi, normalizeFlowNodes, nodeSignModeLabel } from "../approve-template/approveTemplateConstants.js";
 import { buildFormPayloadFromFields, parseFormConfigToData } from "../approve-template/formConfigUtils.js";
-import {
-  isDynamicOptionSource,
-  resolveSelectDisplayLabel,
-} from "../approve-template/selectOptionSource.js";
-import {
-  appendDotNotationQuery,
-  buildApprovalInstanceSearchDto,
-} from "../approve-shared/approvalInstanceListSearch.js";
+import { isDynamicOptionSource, resolveSelectDisplayLabel } from "../approve-template/selectOptionSource.js";
+import { appendDotNotationQuery, buildApprovalInstanceSearchDto } from "../approve-shared/approvalInstanceListSearch.js";
 
 /** 瀹℃壒绫诲瀷锛堜笌鍚庣瀛楁 approvalType 瀵归綈锛屽悗鏈熷彲鍚屾锛� */
 export const APPROVAL_TYPE_OPTIONS = [
@@ -80,24 +66,11 @@
   if (upper === "APPROVED" || upper === "APPROVE" || upper === "PASS" || upper === "AGREE") {
     return "approved";
   }
-  if (
-    upper === "REJECTED" ||
-    upper === "REJECT" ||
-    upper === "REFUSE" ||
-    upper === "REFUSED" ||
-    upper === "DENIED"
-  ) {
+  if (upper === "REJECTED" || upper === "REJECT" || upper === "REFUSE" || upper === "REFUSED" || upper === "DENIED") {
     return "rejected";
   }
   if (upper === "CANCELLED" || upper === "CANCEL" || upper === "REVOKED") return "cancelled";
-  if (
-    upper === "PENDING" ||
-    upper === "IN_PROGRESS" ||
-    upper === "PROCESSING" ||
-    upper === "RUNNING" ||
-    upper === "WAIT" ||
-    upper === "WAITING"
-  ) {
+  if (upper === "PENDING" || upper === "IN_PROGRESS" || upper === "PROCESSING" || upper === "RUNNING" || upper === "WAIT" || upper === "WAITING") {
     return "pending";
   }
   if (s.includes("鑽夌")) return "draft";
@@ -134,13 +107,9 @@
   }
   const tasks = row.tasks;
   if (Array.isArray(tasks) && tasks.length) {
-    const rejected = tasks.some((t) =>
-      normalizeApprovalStatusKey(t?.status ?? t?.taskStatus) === "rejected"
-    );
+    const rejected = tasks.some(t => normalizeApprovalStatusKey(t?.status ?? t?.taskStatus) === "rejected");
     if (rejected) return "REJECTED";
-    const allApproved = tasks.every((t) =>
-      normalizeApprovalStatusKey(t?.status ?? t?.taskStatus) === "approved"
-    );
+    const allApproved = tasks.every(t => normalizeApprovalStatusKey(t?.status ?? t?.taskStatus) === "approved");
     if (allApproved) return "APPROVED";
   }
   return "";
@@ -175,7 +144,7 @@
 /** 鍚庣 records 鈫� 鏃堕棿绾垮睍绀虹粨鏋� */
 export function mapRecordsFromApi(records) {
   const list = Array.isArray(records) ? records : [];
-  return list.map((r) => ({
+  return list.map(r => ({
     id: r.id,
     operatorName: r.approverName || r.operatorName || r.createUserName || "",
     result: mapRecordResultFromApi(r.approveAction ?? r.action ?? r.status),
@@ -198,7 +167,7 @@
   const list = Array.isArray(tasks) ? tasks : [];
   if (!list.length) return [];
   const byLevel = new Map();
-  list.forEach((t) => {
+  list.forEach(t => {
     const level = Number(t.levelNo ?? t.taskLevel ?? t.nodeOrder ?? 1);
     if (!byLevel.has(level)) {
       byLevel.set(level, {
@@ -226,16 +195,14 @@
       node.signMode = mapSignModeFromApi(t.approveType);
     }
   });
-  return [...byLevel.entries()]
-    .sort(([a], [b]) => a - b)
-    .map(([, node]) => node);
+  return [...byLevel.entries()].sort(([a], [b]) => a - b).map(([, node]) => node);
 }
 
 /** 椤甸潰 flowNodes 鈫� 鍚庣 tasks */
 export function mapFlowNodesToTasks(flowNodes, { instanceId, templateId } = {}) {
   const nodes = normalizeFlowNodes(flowNodes);
   const tasks = [];
-  nodes.forEach((n) => {
+  nodes.forEach(n => {
     const levelNo = n.nodeOrder ?? 1;
     const approveType = mapSignModeToApi(n.signMode);
     n.approvers.forEach((a, idx) => {
@@ -278,7 +245,7 @@
     return String(val);
   }
   if (field?.type === "select" && field.options?.length) {
-    const hit = field.options.find((o) => String(o.value) === String(val));
+    const hit = field.options.find(o => String(o.value) === String(val));
     return hit?.label || String(val);
   }
   if (Array.isArray(val)) return val.join(" 鑷� ");
@@ -298,8 +265,8 @@
   };
   if (!fields.length && Object.keys(formPayload).length) {
     fields = Object.keys(formPayload)
-      .filter((k) => k && k !== "summary")
-      .map((k) => ({
+      .filter(k => k && k !== "summary")
+      .map(k => ({
         key: k,
         label: k,
         type: guessFieldTypeFromValue(formPayload[k]),
@@ -366,11 +333,7 @@
 export function buildInstanceDto({ submitForm, activeTemplate, userStore, flowNodes, existingRow }) {
   const payload = submitForm?.formPayload || {};
   const tpl = activeTemplate || {};
-  const title =
-    String(payload.summary || payload.title || "").trim() ||
-    tpl.label ||
-    submitForm?.templateName ||
-    "瀹℃壒鐢宠";
+  const title = String(payload.summary || payload.title || "").trim() || tpl.label || submitForm?.templateName || "瀹℃壒鐢宠";
   const templateId = submitForm?.templateId || tpl.templateId;
   const instanceId = existingRow?.id ?? submitForm?.instanceId;
   const taskList = mapFlowNodesToTasks(flowNodes || submitForm?.flowNodes, {
@@ -388,20 +351,13 @@
     tasks: taskList,
   };
 
-  const attachments =
-    (Array.isArray(submitForm?.storageBlobDTOs) && submitForm.storageBlobDTOs.length
-      ? submitForm.storageBlobDTOs
-      : null) || tpl.storageBlobDTOs;
+  const attachments = (Array.isArray(submitForm?.storageBlobDTOs) && submitForm.storageBlobDTOs.length ? submitForm.storageBlobDTOs : null) || tpl.storageBlobDTOs;
   if (attachments?.length) dto.storageBlobDTOs = attachments;
 
   if (isUpdate) {
     dto.id = existingRow?.id ?? submitForm?.instanceId;
     dto.instanceNo = existingRow?.instanceNo ?? submitForm?.instanceNo ?? "";
-    dto.status =
-      submitForm?.saveStatusApi ||
-      existingRow?.statusRaw ||
-      mapInstanceStatusToApi(existingRow?.approvalStatus) ||
-      "PENDING";
+    dto.status = submitForm?.saveStatusApi || existingRow?.statusRaw || mapInstanceStatusToApi(existingRow?.approvalStatus) || "PENDING";
     dto.currentLevel = existingRow?.currentLevel ?? submitForm?.currentLevel ?? 1;
     dto.applicantId = existingRow?.applicantId ?? existingRow?.applicantNo;
     dto.applicantName = existingRow?.applicantName || "";
@@ -440,7 +396,7 @@
 /** 椤甸潰 approvalStatus 鈫� 鍚庣 status */
 export function mapInstanceStatusToApi(approvalStatus) {
   const key = normalizeApprovalStatusKey(approvalStatus);
-  const hit = APPROVAL_STATUS_OPTIONS.find((x) => x.value === key);
+  const hit = APPROVAL_STATUS_OPTIONS.find(x => x.value === key);
   return hit?.api || "PENDING";
 }
 
@@ -463,9 +419,7 @@
   const resolved = resolveInstanceFormFields(row);
   const { fields, formPayload, templateSnapshot } = resolved;
   const tasks = Array.isArray(row.tasks) ? row.tasks : [];
-  const flowNodes = tasks.length
-    ? mapTasksToFlowNodes(tasks)
-    : mapNodesFromApi(row.nodes || row.flowNodes);
+  const flowNodes = tasks.length ? mapTasksToFlowNodes(tasks) : mapNodesFromApi(row.nodes || row.flowNodes);
   const approvalRecords = mapRecordsFromApi(row.records);
   return {
     id: row.id,
@@ -497,12 +451,12 @@
     tasks,
     records: Array.isArray(row.records) ? row.records : [],
     storageBlobVOList: row.storageBlobVOList || [],
+    storageBlobDTOs: row.storageBlobVOList || row.storageBlobDTOs || [],
     flowNodes,
     approvalFlowNodes: [],
     currentNodeIndex: 0,
     approvalRecords,
-    rejectReason:
-      approvalRecords.find((r) => r.result === "rejected")?.opinion || "",
+    rejectReason: approvalRecords.find(r => r.result === "rejected")?.opinion || "",
   };
 }
 
@@ -525,12 +479,7 @@
   };
 }
 
-export function buildApprovalInstanceListParams({
-  page,
-  searchForm,
-  businessType,
-  extraParams,
-}) {
+export function buildApprovalInstanceListParams({ page, searchForm, businessType, extraParams }) {
   const dto = buildApprovalInstanceSearchDto(searchForm, extraParams);
   const bizType = businessType ?? searchForm?.businessType;
   if (bizType != null && bizType !== "") {
@@ -549,11 +498,11 @@
 }
 
 export function approvalTypeLabel(v) {
-  return APPROVAL_TYPE_OPTIONS.find((x) => x.value === v)?.label || v || "鈥�";
+  return APPROVAL_TYPE_OPTIONS.find(x => x.value === v)?.label || v || "鈥�";
 }
 
 export function approvalTypeStyle(v) {
-  const hit = APPROVAL_TYPE_OPTIONS.find((x) => x.value === v);
+  const hit = APPROVAL_TYPE_OPTIONS.find(x => x.value === v);
   if (!hit) return {};
   return {
     backgroundColor: hit.cellBg,
@@ -564,7 +513,7 @@
 
 export function approvalStatusLabel(v) {
   const key = normalizeApprovalStatusKey(v);
-  return APPROVAL_STATUS_OPTIONS.find((x) => x.value === key)?.label || "鈥�";
+  return APPROVAL_STATUS_OPTIONS.find(x => x.value === key)?.label || "鈥�";
 }
 
 /** 涓氬姟鐢宠椤电姸鎬佹枃妗堬細PENDING鈫掕繘琛屼腑 APPROVED鈫掑凡瀹屾垚 REJECTED鈫掑凡椹冲洖 */
@@ -583,9 +532,7 @@
  * 杩涜涓�(PENDING)銆佸凡瀹屾垚(APPROVED) 涓嶅彲淇敼锛涘凡椹冲洖銆佸凡鎾ら攢绛夊彲淇敼
  */
 export function canEditBusinessInstanceRow(row) {
-  const key = normalizeApprovalStatusKey(
-    row?.approvalStatus ?? row?.statusRaw ?? row?.status
-  );
+  const key = normalizeApprovalStatusKey(row?.approvalStatus ?? row?.statusRaw ?? row?.status);
   return key !== "pending" && key !== "approved";
 }
 
@@ -610,12 +557,8 @@
 /** 鍒楄〃琛� 鈫� 缂栬緫琛ㄥ崟锛堜粎鐢ㄨ鏁版嵁鍥炴樉锛� */
 export function buildEditFormFromInstanceRow(row) {
   const { fields, formPayload, templateSnapshot } = resolveInstanceFormFields(row);
-  const normalized = normalizeFlowNodes(
-    row?.flowNodes?.length ? row.flowNodes : mapTasksToFlowNodes(row?.tasks)
-  );
-  const flowNodes = normalized.length
-    ? JSON.parse(JSON.stringify(normalized))
-    : [createEmptyNode(1)];
+  const normalized = normalizeFlowNodes(row?.flowNodes?.length ? row.flowNodes : mapTasksToFlowNodes(row?.tasks));
+  const flowNodes = normalized.length ? JSON.parse(JSON.stringify(normalized)) : [createEmptyNode(1)];
 
   return {
     templateKey: String(row?.templateId || ""),
@@ -632,9 +575,7 @@
     formPayload,
     flowNodes,
     templateAttachments: initTemplateAttachmentsFromSnapshot(templateSnapshot),
-    storageBlobDTOs: row?.storageBlobDTOs?.length
-      ? JSON.parse(JSON.stringify(row.storageBlobDTOs))
-      : [],
+    storageBlobDTOs: (row?.storageBlobDTOs?.length ? row.storageBlobDTOs : row?.storageBlobVOList || []).map(f => JSON.parse(JSON.stringify(f))),
   };
 }
 
@@ -642,9 +583,7 @@
   const tpl = templateOverride || null;
   const payload = tpl?.fields?.length ? buildFormPayloadFromFields(tpl.fields) : { summary: "" };
   const normalized = normalizeFlowNodes(flowNodesOverride);
-  const flowNodes = normalized.length
-    ? JSON.parse(JSON.stringify(normalized))
-    : [createEmptyNode(1)];
+  const flowNodes = normalized.length ? JSON.parse(JSON.stringify(normalized)) : [createEmptyNode(1)];
   return {
     templateKey: templateKey || "",
     templateId: tpl?.templateId || "",
@@ -659,9 +598,7 @@
     formFieldDefs: tpl?.fields || [],
     formPayload: payload,
     flowNodes,
-    templateAttachments: tpl?.storageBlobDTOs
-      ? JSON.parse(JSON.stringify(tpl.storageBlobDTOs))
-      : [],
+    templateAttachments: tpl?.storageBlobDTOs ? JSON.parse(JSON.stringify(tpl.storageBlobDTOs)) : [],
     storageBlobDTOs: [],
   };
 }

--
Gitblit v1.9.3