From 3ce715a4e66955eac86dcd2f5c8afcfdf8becb6d Mon Sep 17 00:00:00 2001
From: zhangwencui <1064582902@qq.com>
Date: 星期四, 29 十月 2026 16:46:47 +0800
Subject: [PATCH] Merge origin/dev_项目管理 into dev_项目管理
---
src/views/officeProcessAutomation/ApproveManage/approve-shared/approvalInstanceFormConfigTable.js | 10 +++++++++-
1 files changed, 9 insertions(+), 1 deletions(-)
diff --git a/src/views/officeProcessAutomation/ApproveManage/approve-shared/approvalInstanceFormConfigTable.js b/src/views/officeProcessAutomation/ApproveManage/approve-shared/approvalInstanceFormConfigTable.js
index d6bec18..50d67ca 100644
--- a/src/views/officeProcessAutomation/ApproveManage/approve-shared/approvalInstanceFormConfigTable.js
+++ b/src/views/officeProcessAutomation/ApproveManage/approve-shared/approvalInstanceFormConfigTable.js
@@ -87,7 +87,15 @@
const leadingCols = moduleKey && INSTANCE_NO_SEARCH_MODULE_KEYS.has(moduleKey) ? [INSTANCE_NO_TABLE_COLUMN] : [];
return computed(() => {
- const formCols = getFormConfigFieldColumns(tableDataRef.value?.[0], { excludeKeys });
+ // 鍥哄畾鍒楀凡灞曠ず鐨勫瓧娈典笉鍐嶇敱 formConfig 鍔ㄦ�佸垪閲嶅鐢熸垚
+ const fixedProps = new Set(
+ [...beforeFormColumns, ...extraColumns, ...afterFormColumns]
+ .map(c => c?.prop)
+ .filter(Boolean)
+ );
+ const formCols = getFormConfigFieldColumns(tableDataRef.value?.[0], {
+ excludeKeys: new Set([...(excludeKeys || []), ...fixedProps]),
+ });
return [
...leadingCols,
...beforeFormColumns,
--
Gitblit v1.9.3