From a0f40b656d906eb69dda0e4ccb3c29d5ab758b63 Mon Sep 17 00:00:00 2001
From: gaoluyang <2820782392@qq.com>
Date: 星期一, 26 十月 2026 13:17:52 +0800
Subject: [PATCH] feat(转正申请): 列表新增申请人列
---
src/views/officeProcessAutomation/HrManage/regular-apply/index.vue | 8 ++++++++
src/views/officeProcessAutomation/ApproveManage/approve-shared/approvalInstanceFormConfigTable.js | 10 +++++++++-
2 files changed, 17 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,
diff --git a/src/views/officeProcessAutomation/HrManage/regular-apply/index.vue b/src/views/officeProcessAutomation/HrManage/regular-apply/index.vue
index df70f4f..07f33e9 100644
--- a/src/views/officeProcessAutomation/HrManage/regular-apply/index.vue
+++ b/src/views/officeProcessAutomation/HrManage/regular-apply/index.vue
@@ -130,6 +130,14 @@
const tableColumn = buildInstanceTableColumns(tableData, buildTableActions, {
moduleKey: APPROVAL_MODULE_KEYS.REGULAR,
+ beforeFormColumns: [
+ {
+ label: "鐢宠浜�",
+ prop: "applicantName",
+ width: 120,
+ showOverflowTooltip: true,
+ },
+ ],
});
function onSearch() {
--
Gitblit v1.9.3