From 31acf8d8830c5b8b33e0599018544aa4d68e351b Mon Sep 17 00:00:00 2001
From: huminmin <mac@MacBook-Pro.local>
Date: 星期一, 25 五月 2026 14:12:24 +0800
Subject: [PATCH] Merge branch 'dev_NEW_pro' of http://114.132.189.42:9002/r/product-inventory-management into dev_NEW_pro

---
 src/views/officeProcessAutomation/ApproveManage/approve-shared/approvalInstanceFormConfigTable.js |   74 ++++++++++++++++++++++--------------
 1 files changed, 45 insertions(+), 29 deletions(-)

diff --git a/src/views/officeProcessAutomation/ApproveManage/approve-shared/approvalInstanceFormConfigTable.js b/src/views/officeProcessAutomation/ApproveManage/approve-shared/approvalInstanceFormConfigTable.js
index 895ff0d..d6bec18 100644
--- a/src/views/officeProcessAutomation/ApproveManage/approve-shared/approvalInstanceFormConfigTable.js
+++ b/src/views/officeProcessAutomation/ApproveManage/approve-shared/approvalInstanceFormConfigTable.js
@@ -1,13 +1,36 @@
 import { computed } from "vue";
-import {
-  businessApprovalStatusLabel,
-  businessApprovalStatusTagType,
-  formatFieldDisplayValue,
-  resolveInstanceFormFields,
-} from "../approve-list/approveListConstants.js";
+import { businessApprovalStatusLabel, businessApprovalStatusTagType, formatFieldDisplayValue, resolveInstanceFormFields } from "../approve-list/approveListConstants.js";
+import { INSTANCE_NO_SEARCH_MODULE_KEYS, INSTANCE_NO_TABLE_COLUMN } from "./approvalInstanceListSearch.js";
 
-/** 鍒楄〃/璇︽儏涓嶅洖鏄句负鐙珛鍒楃殑濉姤椤� key */
-const DEFAULT_EXCLUDE_KEYS = new Set(["summary"]);
+/** 鍒楄〃/璇︽儏涓嶅洖鏄句负鐙珛鍒楃殑濉姤椤� key锛堥伩鍏嶈鐩栧疄渚嬬郴缁熷瓧娈碉級 */
+const DEFAULT_EXCLUDE_KEYS = new Set(["summary", "status", "approvalStatus", "approvalstatus", "instanceStatus", "publishStatus", "newsStatus"]);
+
+/** enrich 鍚庡繀椤讳繚鐣欑殑瀹炰緥瀛楁锛堜笉琚� formConfig 閾哄钩瑕嗙洊锛� */
+const PRESERVE_INSTANCE_FIELDS = [
+  "id",
+  "approvalStatus",
+  "statusRaw",
+  "status",
+  "instanceNo",
+  "templateId",
+  "templateName",
+  "businessType",
+  "businessId",
+  "businessName",
+  "applicantId",
+  "applicantNo",
+  "applicantName",
+  "createTime",
+  "applyTime",
+  "finishTime",
+  "title",
+  "isApprove",
+  "unread",
+  "currentLevel",
+  "newsStatus",
+  "storageBlobVOList",
+  "storageBlobDTOs",
+];
 
 /**
  * 浠庤鏁版嵁 formConfig 瑙ｆ瀽瀛楁瀹氫箟涓庡～鎶ュ�硷紝骞堕摵骞冲埌琛屼笂渚涗富琛� prop 缁戝畾锛堝睍绀虹敤鏍煎紡鍖栧�硷級
@@ -27,18 +50,16 @@
     if (!f?.key || DEFAULT_EXCLUDE_KEYS.has(f.key)) continue;
     const val = formPayload[f.key];
     let text = formatFieldDisplayValue(f, val, caches);
-    if (
-      text === String(val) &&
-      row?.applicantName &&
-      (f.label === "鐢宠浜�" || f.key === "applicant" || f.key === "applicantName")
-    ) {
-      const idMatch =
-        String(val) === String(row.applicantId) ||
-        String(val) === String(row.applicantNo);
+    if (text === String(val) && row?.applicantName && (f.label === "鐢宠浜�" || f.key === "applicant" || f.key === "applicantName")) {
+      const idMatch = String(val) === String(row.applicantId) || String(val) === String(row.applicantNo);
       if (idMatch) text = row.applicantName;
     }
     formDisplay[f.key] = text;
     displayRow[f.key] = text;
+  }
+
+  for (const key of PRESERVE_INSTANCE_FIELDS) {
+    if (row[key] !== undefined) displayRow[key] = row[key];
   }
 
   return displayRow;
@@ -48,10 +69,8 @@
  * 浠庡垪琛ㄩ琛� formConfig 鐢熸垚涓昏〃鍔ㄦ�佸垪锛坙abel 鍙栬嚜妯℃澘瀛楁 label锛�
  */
 export function getFormConfigFieldColumns(firstRow, { excludeKeys = DEFAULT_EXCLUDE_KEYS } = {}) {
-  const fields = (firstRow?.formFieldDefs || []).filter(
-    (f) => f?.key && !excludeKeys.has(f.key)
-  );
-  return fields.map((f) => ({
+  const fields = (firstRow?.formFieldDefs || []).filter(f => f?.key && !excludeKeys.has(f.key));
+  return fields.map(f => ({
     label: f.label || f.key,
     prop: f.key,
     minWidth: f.type === "textarea" ? 200 : f.type === "datetimerange" ? 160 : 120,
@@ -63,17 +82,14 @@
  * 涓氬姟鐢宠涓昏〃鍒楋細鍥哄畾鍒� + formConfig 鍔ㄦ�佸垪 + 瀹℃壒鐘舵�� + 鎿嶄綔
  */
 export function buildInstanceTableColumns(tableDataRef, buildTableActions, options = {}) {
-  const {
-    excludeKeys = DEFAULT_EXCLUDE_KEYS,
-    beforeFormColumns = [],
-    extraColumns = [],
-    afterFormColumns = [],
-    actionWidth = 260,
-  } = options;
+  const { moduleKey, excludeKeys = DEFAULT_EXCLUDE_KEYS, beforeFormColumns = [], extraColumns = [], afterFormColumns = [], actionWidth = 260 } = options;
+
+  const leadingCols = moduleKey && INSTANCE_NO_SEARCH_MODULE_KEYS.has(moduleKey) ? [INSTANCE_NO_TABLE_COLUMN] : [];
 
   return computed(() => {
     const formCols = getFormConfigFieldColumns(tableDataRef.value?.[0], { excludeKeys });
     return [
+      ...leadingCols,
       ...beforeFormColumns,
       ...formCols,
       ...extraColumns,
@@ -84,8 +100,8 @@
         prop: "approvalStatus",
         width: 110,
         dataType: "tag",
-        formatData: (v) => businessApprovalStatusLabel(v),
-        formatType: (v) => businessApprovalStatusTagType(v),
+        formatData: v => businessApprovalStatusLabel(v),
+        formatType: v => businessApprovalStatusTagType(v),
       },
       {
         dataType: "action",

--
Gitblit v1.9.3