From 61a2db936dcbc3d5aebe8ff850bcaab76e3b3785 Mon Sep 17 00:00:00 2001
From: zhangwencui <1064582902@qq.com>
Date: 星期一, 15 六月 2026 11:09:18 +0800
Subject: [PATCH] 合并恢复
---
src/pages/oa/_utils/approveListUtils.js | 38 +++++++++++---------------------------
1 files changed, 11 insertions(+), 27 deletions(-)
diff --git a/src/pages/oa/_utils/approveListUtils.js b/src/pages/oa/_utils/approveListUtils.js
index f7ddc00..538fec9 100644
--- a/src/pages/oa/_utils/approveListUtils.js
+++ b/src/pages/oa/_utils/approveListUtils.js
@@ -6,6 +6,8 @@
mergeFormConfigForEdit,
} from "./approvalFormField.js";
import {
+ appendDotNotationQuery,
+ buildApprovalInstanceSearchDto,
formatKnownSelectLabel,
resolveInstanceFormPayload,
resolveListFieldRawValue,
@@ -272,8 +274,7 @@
}
/**
- * 涓� Web buildApprovalInstanceListParams 涓�鑷达細鎵佸钩 query锛坈urrent/size/businessType/...锛�
- * 瀹℃壒鍒楄〃涓嶄紶 businessType 鍗虫煡鍏ㄩ儴
+ * 涓� Web buildApprovalInstanceListParams 涓�鑷�
*/
export function buildInstanceListParams({
page,
@@ -281,37 +282,20 @@
extraDto = {},
searchForm,
}) {
- const extra = { ...(extraDto && typeof extraDto === "object" ? extraDto : {}) };
- if (extra.createTime != null && extra.createTimeStart == null) {
- extra.createTimeStart = extra.createTime;
+ const dto = buildApprovalInstanceSearchDto(searchForm, extraDto);
+ const bizType = businessType ?? searchForm?.businessType;
+ if (bizType != null && bizType !== "") {
+ dto.businessType = bizType;
}
- delete extra.createTime;
const params = {
current: page.current,
size: page.size,
- ...extra,
+ "page.current": page.current,
+ "page.size": page.size,
+ ...dto,
};
-
- const bizType = businessType ?? searchForm?.businessType;
- if (bizType != null && bizType !== "") {
- params.businessType = bizType;
- }
- if (searchForm?.status) {
- params.status = searchForm.status;
- }
-
- const range =
- searchForm?.createTimeRange ??
- searchForm?.applyDateRange ??
- searchForm?.transferDateRange;
- if (Array.isArray(range) && range[0] && params.createTimeStart == null) {
- params.createTimeStart = range[0];
- }
- if (Array.isArray(range) && range[1] && params.createTimeEnd == null) {
- params.createTimeEnd = range[1];
- }
-
+ appendDotNotationQuery(params, "approvalInstanceDto", dto);
return params;
}
--
Gitblit v1.9.3