From fdd776214d77a657f65fb1555637b03b95e82643 Mon Sep 17 00:00:00 2001
From: liding <756868258@qq.com>
Date: 星期五, 05 六月 2026 15:38:59 +0800
Subject: [PATCH] fix(files): 修复文件删除功能中ID字段映射错误

---
 src/views/officeProcessAutomation/ReimburseManage/shared/finReimbursementMappers.js |   98 ++++++++++++++++++++++++++++++-------------------
 1 files changed, 60 insertions(+), 38 deletions(-)

diff --git a/src/views/officeProcessAutomation/ReimburseManage/shared/finReimbursementMappers.js b/src/views/officeProcessAutomation/ReimburseManage/shared/finReimbursementMappers.js
index 44fd1b4..d34f4a4 100644
--- a/src/views/officeProcessAutomation/ReimburseManage/shared/finReimbursementMappers.js
+++ b/src/views/officeProcessAutomation/ReimburseManage/shared/finReimbursementMappers.js
@@ -165,11 +165,49 @@
 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 hasActiveReimbursementSearch(searchForm = {}) {
+  return Boolean((searchForm?.applicantKeyword || "").trim());
+}
+
+/** 鏈嶅姟绔湭鐢熸晥鏃讹紝鎸夌敵璇蜂汉鍋氬墠绔厹搴曠瓫閫� */
+export function filterReimbursementRowsBySearch(rows, searchForm = {}) {
+  const list = Array.isArray(rows) ? rows : [];
+  const kw = (searchForm?.applicantKeyword || "").trim().toLowerCase();
+  if (!kw) return list;
+
+  return list.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));
+  });
+}
+
+/** 鎵佸钩鍖栦负 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,
@@ -182,40 +220,15 @@
     ...(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,
   };
+  appendDotNotationQuery(params, "finReimbursementDto", dto);
+  return params;
 }
 
 function pickTravelField(obj, keys) {
@@ -329,7 +342,7 @@
     createTime: formatReimbursementDateTime(row.createTime),
     expenseDetails: details.map((d) => ({
       ...d,
-      expenseSubject: d.expenseCategory,
+      expenseSubject: resolveExpenseSubjectValue(d.expenseCategory ?? d.expenseSubject),
     })),
     travel:
       row.travel && typeof row.travel === "object" && Object.keys(row.travel).length
@@ -375,7 +388,7 @@
     createTime: formatReimbursementDateTime(row.createTime),
     expenseDetails: details.map((d) => ({
       ...d,
-      expenseSubject: d.expenseCategory,
+      expenseSubject: resolveExpenseSubjectValue(d.expenseCategory ?? d.expenseSubject),
     })),
     details,
     nodes: apiNodes,
@@ -400,6 +413,15 @@
   return hit?.label || subject || "";
 }
 
+/** 鎺ュ彛杩斿洖鐨� expenseCategory 鍙兘鏄腑鏂� label锛屽弽杞负鍓嶇 value锛涘凡缁忔槸 value 鍒欏師鏍疯繑鍥� */
+function resolveExpenseSubjectValue(val) {
+  if (!val) return "";
+  const byValue = EXPENSE_SUBJECT_OPTIONS.find((x) => x.value === val);
+  if (byValue) return val;
+  const byLabel = EXPENSE_SUBJECT_OPTIONS.find((x) => x.label === val);
+  return byLabel?.value || val;
+}
+
 function expenseCategoryToType(category) {
   const hit = EXPENSE_CATEGORY_OPTIONS.find((x) => x.value === category);
   return hit?.label || category || "";

--
Gitblit v1.9.3