From 2d3530a7c11557a40807ad7c0b9e302ce6ce3a9f Mon Sep 17 00:00:00 2001
From: hsy <1029150275@qq.com>
Date: 星期五, 28 八月 2026 10:16:32 +0800
Subject: [PATCH] feat: 综合业务模块页面重构与交互完善
---
src/views/officeProcessAutomation/ReimburseManage/shared/finReimbursementMappers.js | 137 ++++++++++++++++++++++++++++++++-------------
1 files changed, 98 insertions(+), 39 deletions(-)
diff --git a/src/views/officeProcessAutomation/ReimburseManage/shared/finReimbursementMappers.js b/src/views/officeProcessAutomation/ReimburseManage/shared/finReimbursementMappers.js
index 44fd1b4..85029bc 100644
--- a/src/views/officeProcessAutomation/ReimburseManage/shared/finReimbursementMappers.js
+++ b/src/views/officeProcessAutomation/ReimburseManage/shared/finReimbursementMappers.js
@@ -165,11 +165,81 @@
function pickApplicantQuery(searchForm = {}) {
const kw = (searchForm.applicantKeyword || "").trim();
if (!kw) return {};
- if (/[\u4e00-\u9fa5]/.test(kw)) return { applicantName: kw };
- return { applicantCode: kw };
+ // 鍗犱綅銆屽鍚嶆垨缂栧彿銆嶏細濮撳悕璧� applicantName锛涚紪鍙峰彟浼� applicantCode
+ const out = { applicantName: kw };
+ if (!/[\u4e00-\u9fa5]/.test(kw)) {
+ out.applicantCode = kw;
+ }
+ return out;
}
-/** 缁勮 listPage 鏌ヨ鍙傛暟锛坧age + finReimbursementDto锛� */
+
+export function expenseTypeToCategory(typeLabel) {
+ const hit = EXPENSE_CATEGORY_OPTIONS.find((x) => x.label === typeLabel || x.value === typeLabel);
+ return hit?.value || typeLabel || "";
+}
+
+/** 鏄惁瀛樺湪鍒楄〃绛涢�夋潯浠� */
+export function hasActiveReimbursementSearch(searchForm = {}) {
+ return Boolean(
+ (searchForm?.applicantKeyword || "").trim() ||
+ searchForm?.deptId ||
+ searchForm?.expenseCategory ||
+ (searchForm?.applyTimeRange && searchForm.applyTimeRange.length === 2)
+ );
+}
+
+/** 鏈嶅姟绔湭鐢熸晥鏃讹紝鎸夋潯浠跺仛鍓嶇鍏滃簳绛涢�� */
+export function filterReimbursementRowsBySearch(rows, searchForm = {}) {
+ const list = Array.isArray(rows) ? rows : [];
+ let result = list;
+
+ const kw = (searchForm?.applicantKeyword || "").trim().toLowerCase();
+ if (kw) {
+ result = result.filter((row) => {
+ const parts = [
+ row.applicantName,
+ row.employeeName,
+ row.applicantNo,
+ row.applicantCode,
+ row.employeeNo,
+ ]
+ .filter((v) => v != null && v !== "")
+ .map((v) => String(v).toLowerCase());
+ return parts.some((p) => p.includes(kw));
+ });
+ }
+
+ if (searchForm?.deptId) {
+ result = result.filter(row => String(row.deptId) === String(searchForm.deptId));
+ }
+
+ if (searchForm?.expenseCategory) {
+ result = result.filter(row => row.expenseCategory === searchForm.expenseCategory);
+ }
+
+ if (searchForm?.applyTimeRange && searchForm.applyTimeRange.length === 2) {
+ const start = searchForm.applyTimeRange[0];
+ const end = searchForm.applyTimeRange[1];
+ result = result.filter(row => {
+ const t = (row.applyTime || row.createTime || "").substring(0, 10);
+ return t >= start && t <= end;
+ });
+ }
+
+ return result;
+}
+
+/** 鎵佸钩鍖栦负 Spring GET 鍙粦瀹氱殑 query锛坒inReimbursementDto.xxx锛屽嬁鐢ㄦ柟鎷彿锛� */
+function appendDotNotationQuery(target, prefix, fields) {
+ if (!fields || typeof fields !== "object") return;
+ for (const [key, value] of Object.entries(fields)) {
+ if (value == null || value === "") continue;
+ target[`${prefix}.${key}`] = value;
+ }
+}
+
+/** 缁勮 listPage 鏌ヨ鍙傛暟锛堟墎骞� page.* / finReimbursementDto.*锛屼笌 detail 鎺ュ彛涓�鑷达級 */
export function buildFinReimbursementListParams({
page,
searchForm,
@@ -178,44 +248,29 @@
}) {
const dto = {
reimbursementType,
+ deptId: searchForm.deptId || undefined,
+ expenseType: searchForm.expenseCategory ? expenseCategoryToType(searchForm.expenseCategory) : undefined,
+ createTimeStart: searchForm.applyTimeRange?.[0] || undefined,
+ createTimeEnd: searchForm.applyTimeRange?.[1] || undefined,
...pickApplicantQuery(searchForm),
...(extraDto && typeof extraDto === "object" ? extraDto : {}),
};
- if (searchForm?.billStatus) {
- dto.billStatus = searchForm.billStatus;
- }
-
- const range =
- searchForm?.createTimeRange ??
- searchForm?.applyDateRange ??
- (searchForm?.applyTimeFrom || searchForm?.applyTimeTo
- ? [searchForm.applyTimeFrom, searchForm.applyTimeTo]
- : null);
-
- if (Array.isArray(range) && range[0]) {
- dto.createTimeStart = range[0];
- }
- if (Array.isArray(range) && range[1]) {
- dto.createTimeEnd = range[1];
- }
-
- if (reimbursementType === FIN_REIMBURSEMENT_TYPE.TRAVEL) {
- if (searchForm?.travelStartFrom) {
- dto.startTimeStart = searchForm.travelStartFrom;
- }
- if (searchForm?.travelEndTo) {
- dto.endTimeEnd = searchForm.travelEndTo;
- }
- }
-
- return {
- page: {
- current: page.current,
- size: page.size,
- },
- finReimbursementDto: dto,
+ const params = {
+ current: page.current,
+ size: page.size,
+ "page.current": page.current,
+ "page.size": page.size,
+ ...dto,
};
+
+ if (searchForm.applyTimeRange && searchForm.applyTimeRange.length === 2) {
+ params["params[beginTime]"] = searchForm.applyTimeRange[0] + " 00:00:00";
+ params["params[endTime]"] = searchForm.applyTimeRange[1] + " 23:59:59";
+ }
+
+ appendDotNotationQuery(params, "finReimbursementDto", dto);
+ return params;
}
function pickTravelField(obj, keys) {
@@ -306,7 +361,8 @@
applicantName: row.applicantName || "",
employeeNo: row.applicantCode || "",
employeeName: row.applicantName || "",
- applicantDeptName: row.applicantDeptName || "",
+ applicantDeptName: row.deptName || "",
+ deptId: row.deptId,
reimburseReason: row.reason || "",
travelStartTime: formatReimbursementDateTime(travel.startTime),
travelEndTime: formatReimbursementDateTime(travel.endTime),
@@ -362,12 +418,14 @@
applicantName: row.applicantName || "",
employeeNo: row.applicantCode || "",
employeeName: row.applicantName || "",
- applicantDeptName: row.applicantDeptName || "",
+ applicantDeptName: row.deptName || "",
+ deptId: row.deptId,
reimburseReason: row.reason || "",
- expenseCategory: row.expenseType || "",
+ expenseCategory: expenseTypeToCategory(row.expenseType) || "",
applyAmount: row.applyAmount,
applyTime: formatReimbursementDateTime(row.createTime),
payee: row.payeeName || "",
+ payer: row.payer || "",
payeeAccount: row.payeeAccount || "",
bankBranch: row.payeeBank || "",
billStatus: row.billStatus,
@@ -833,6 +891,7 @@
applyAmount,
detailTotalAmount: detailTotal,
payeeName: form.payee || "",
+ payer: form.payer || "",
payeeAccount: form.payeeAccount || "",
payeeBank: form.bankBranch || form.payeeBank || "",
billStatus: "IN_APPROVAL",
--
Gitblit v1.9.3