From 61b9452f138841d453bf4b2503d78c2aaf2e4394 Mon Sep 17 00:00:00 2001
From: yyb <995253665@qq.com>
Date: 星期六, 23 五月 2026 17:13:33 +0800
Subject: [PATCH] Merge branch 'dev-new_pro_OA' into dev_NEW_pro
---
src/views/officeProcessAutomation/ApproveManage/approve-shared/approvalInstanceFormConfigTable.js | 11 +++++++++++
1 files changed, 11 insertions(+), 0 deletions(-)
diff --git a/src/views/officeProcessAutomation/ApproveManage/approve-shared/approvalInstanceFormConfigTable.js b/src/views/officeProcessAutomation/ApproveManage/approve-shared/approvalInstanceFormConfigTable.js
index fef178f..0251647 100644
--- a/src/views/officeProcessAutomation/ApproveManage/approve-shared/approvalInstanceFormConfigTable.js
+++ b/src/views/officeProcessAutomation/ApproveManage/approve-shared/approvalInstanceFormConfigTable.js
@@ -5,6 +5,10 @@
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([
@@ -101,6 +105,7 @@
*/
export function buildInstanceTableColumns(tableDataRef, buildTableActions, options = {}) {
const {
+ moduleKey,
excludeKeys = DEFAULT_EXCLUDE_KEYS,
beforeFormColumns = [],
extraColumns = [],
@@ -108,9 +113,15 @@
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,
--
Gitblit v1.9.3