From 4ab0be7d4441f378add1f242b168d80fb27e65fe Mon Sep 17 00:00:00 2001
From: yyb <995253665@qq.com>
Date: 星期五, 22 五月 2026 17:57:44 +0800
Subject: [PATCH] OA部分查询条件变更
---
src/views/officeProcessAutomation/ApproveManage/approve-shared/approvalInstanceFormConfigTable.js | 52 ++++++++++++++++++++++++++++++++++++++++++++++++++--
1 files changed, 50 insertions(+), 2 deletions(-)
diff --git a/src/views/officeProcessAutomation/ApproveManage/approve-shared/approvalInstanceFormConfigTable.js b/src/views/officeProcessAutomation/ApproveManage/approve-shared/approvalInstanceFormConfigTable.js
index 895ff0d..0251647 100644
--- a/src/views/officeProcessAutomation/ApproveManage/approve-shared/approvalInstanceFormConfigTable.js
+++ b/src/views/officeProcessAutomation/ApproveManage/approve-shared/approvalInstanceFormConfigTable.js
@@ -5,9 +5,46 @@
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",
+];
/**
* 浠庤鏁版嵁 formConfig 瑙ｆ瀽瀛楁瀹氫箟涓庡～鎶ュ�硷紝骞堕摵骞冲埌琛屼笂渚涗富琛� prop 缁戝畾锛堝睍绀虹敤鏍煎紡鍖栧�硷級
@@ -41,6 +78,10 @@
displayRow[f.key] = text;
}
+ for (const key of PRESERVE_INSTANCE_FIELDS) {
+ if (row[key] !== undefined) displayRow[key] = row[key];
+ }
+
return displayRow;
}
@@ -64,6 +105,7 @@
*/
export function buildInstanceTableColumns(tableDataRef, buildTableActions, options = {}) {
const {
+ moduleKey,
excludeKeys = DEFAULT_EXCLUDE_KEYS,
beforeFormColumns = [],
extraColumns = [],
@@ -71,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