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-list/approveListConstants.js | 41 ++++++++++++++++++-----------------------
1 files changed, 18 insertions(+), 23 deletions(-)
diff --git a/src/views/officeProcessAutomation/ApproveManage/approve-list/approveListConstants.js b/src/views/officeProcessAutomation/ApproveManage/approve-list/approveListConstants.js
index 96f7158..938a787 100644
--- a/src/views/officeProcessAutomation/ApproveManage/approve-list/approveListConstants.js
+++ b/src/views/officeProcessAutomation/ApproveManage/approve-list/approveListConstants.js
@@ -12,6 +12,10 @@
isDynamicOptionSource,
resolveSelectDisplayLabel,
} from "../approve-template/selectOptionSource.js";
+import {
+ appendDotNotationQuery,
+ buildApprovalInstanceSearchDto,
+} from "../approve-shared/approvalInstanceListSearch.js";
/** 瀹℃壒绫诲瀷锛堜笌鍚庣瀛楁 approvalType 瀵归綈锛屽悗鏈熷彲鍚屾锛� */
export const APPROVAL_TYPE_OPTIONS = [
@@ -520,35 +524,26 @@
};
}
-export function buildApprovalInstanceListParams({ page, searchForm, businessType, extraParams }) {
- const extra = { ...(extraParams && typeof extraParams === "object" ? extraParams : {}) };
- if (extra.createTime != null && extra.createTimeStart == null) {
- extra.createTimeStart = extra.createTime;
+export function buildApprovalInstanceListParams({
+ page,
+ searchForm,
+ businessType,
+ extraParams,
+}) {
+ const dto = buildApprovalInstanceSearchDto(searchForm, extraParams);
+ 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 = range[0];
- }
- if (Array.isArray(range) && range[1]) {
- params.createTimeEnd = range[1];
- }
+ appendDotNotationQuery(params, "approvalInstanceDto", dto);
return params;
}
--
Gitblit v1.9.3