From e6e48aec2eea7e247307413883fe712234316a20 Mon Sep 17 00:00:00 2001
From: zhangwencui <1064582902@qq.com>
Date: 星期一, 25 五月 2026 11:18:14 +0800
Subject: [PATCH] 巡检暂无附件展示问题

---
 src/pages/oa/_utils/approvalModuleListSearch.js |  423 +++++++++++++++++++++++++++++++++++-----------------
 1 files changed, 280 insertions(+), 143 deletions(-)

diff --git a/src/pages/oa/_utils/approvalModuleListSearch.js b/src/pages/oa/_utils/approvalModuleListSearch.js
index 45a7d43..a98409a 100644
--- a/src/pages/oa/_utils/approvalModuleListSearch.js
+++ b/src/pages/oa/_utils/approvalModuleListSearch.js
@@ -4,7 +4,10 @@
   getApprovalModuleConfig,
   getModuleMatchingBusinessTypes,
 } from "./approvalModuleRegistry.js";
-import { parseApprovalFormConfig } from "./approvalFormField.js";
+import {
+  parseApprovalFormConfig,
+  parseDatetimerangeValue,
+} from "./approvalFormField.js";
 import { matchBusinessTypeValue } from "./approvalTemplateType.js";
 
 /** 涓� Web leave-apply LEAVE_TYPE_OPTIONS 涓�鑷� */
@@ -49,16 +52,53 @@
   return payload;
 }
 
+function guessFieldTypeFromValue(val) {
+  if (Array.isArray(val)) return "datetimerange";
+  if (typeof val === "number") return "number";
+  return "text";
+}
+
 /** 瑙ｆ瀽瀹炰緥 formConfig / formPayload锛堜笌 Web resolveInstanceFormFields 瀵归綈锛� */
 export function resolveInstanceFormPayload(row) {
   const cfg = parseApprovalFormConfig(row?.formConfig);
-  const fields = (row?.formFieldDefs?.length ? row.formFieldDefs : cfg.fields) || [];
+  let fields = (row?.formFieldDefs?.length ? row.formFieldDefs : cfg.fields) || [];
   const formPayload = {
     ...(fields.length ? buildFormPayloadFromFields(fields) : {}),
     ...cfg.formPayload,
     ...(row?.formPayload || {}),
   };
+  if (!fields.length && Object.keys(formPayload).length) {
+    fields = Object.keys(formPayload)
+      .filter(k => k && k !== "summary")
+      .map(k => ({
+        key: k,
+        label: k,
+        type: guessFieldTypeFromValue(formPayload[k]),
+        required: false,
+        options: [],
+      }));
+  }
+  fields = fields.map(field => ({
+    ...field,
+    value:
+      formPayload[field.key] ?? field.value ?? field.defaultValue ?? "",
+  }));
   return { fields, formPayload };
+}
+
+/** 宸茬煡涓嬫媺瀛楁 value 鈫� 灞曠ず鏂囨锛堟ā鏉挎湭甯� options 鏃跺厹搴曪級 */
+export function formatKnownSelectLabel(prop, val) {
+  if (val === undefined || val === null || val === "") return "";
+  const maps = {
+    leaveType: LEAVE_TYPE_OPTIONS,
+    overtimeType: OVERTIME_TYPE_OPTIONS,
+    handoverStatus: HANDOVER_STATUS_OPTIONS,
+    handoverType: HANDOVER_TYPE_OPTIONS,
+  };
+  const options = maps[prop];
+  if (!options) return "";
+  const hit = options.find(o => String(o.value) === String(val));
+  return hit?.label || "";
 }
 
 export function getRowPayloadValue(row, keys) {
@@ -71,57 +111,202 @@
   return "";
 }
 
-function pickDateRange(searchForm) {
-  const range =
-    searchForm?.createTimeRange ??
-    searchForm?.applyDateRange ??
-    searchForm?.transferDateRange;
-  if (!Array.isArray(range) || !range[0]) return {};
-  const out = { createTimeStart: range[0] };
-  if (range[1]) out.createTimeEnd = range[1];
+const DATETIME_RANGE_KEYS = [
+  "dateRange",
+  "leaveTime",
+  "overtimeTime",
+  "timeRange",
+];
+
+function pickDatetimerangeRaw(formPayload, fields = []) {
+  for (const key of DATETIME_RANGE_KEYS) {
+    const v = formPayload?.[key];
+    if (v != null && v !== "") return v;
+    const field = (fields || []).find(f => f?.key === key);
+    const fv = field?.value ?? field?.defaultValue;
+    if (fv != null && fv !== "") return fv;
+  }
+  const rangeField = (fields || []).find(
+    f => String(f?.type || "").toLowerCase() === "datetimerange"
+  );
+  if (rangeField?.key) {
+    const v =
+      formPayload?.[rangeField.key] ?? rangeField.value ?? rangeField.defaultValue;
+    if (v != null && v !== "") return v;
+  }
+  return null;
+}
+
+function splitRangeValue(val) {
+  if (val === undefined || val === null || val === "") {
+    return { start: "", end: "" };
+  }
+  if (Array.isArray(val)) {
+    return { start: val[0] || "", end: val[1] || "" };
+  }
+  return parseDatetimerangeValue(val);
+}
+
+/**
+ * 鍒楄〃鍒� prop 涓� formPayload 瀵归綈锛堣鍋� startTime/endTime 鏉ヨ嚜 dateRange锛�
+ */
+export function resolveListFieldRawValue(prop, row, fields = [], formPayload = {}) {
+  const payload = formPayload || {};
+  const direct = payload[prop] ?? row?.[prop];
+
+  if (prop === "startTime" || prop === "endTime") {
+    if (direct != null && direct !== "") return direct;
+    const altStart =
+      payload.start ?? payload.startDate ?? payload.beginTime ?? row?.startTime;
+    const altEnd =
+      payload.end ?? payload.endDate ?? payload.finishTime ?? row?.endTime;
+    if (prop === "startTime" && altStart) return altStart;
+    if (prop === "endTime" && altEnd) return altEnd;
+    const { start, end } = splitRangeValue(pickDatetimerangeRaw(payload, fields));
+    return prop === "startTime" ? start : end;
+  }
+
+  if (prop === "overtimeDate") {
+    const d = payload.overtimeDate ?? payload.date ?? direct;
+    if (d != null && d !== "") return Array.isArray(d) ? d[0] || "" : d;
+    const { start } = splitRangeValue(pickDatetimerangeRaw(payload, fields));
+    return start || "";
+  }
+
+  if (direct != null && direct !== "") return direct;
+  const hit = (fields || []).find(f => f?.key === prop);
+  return hit?.value ?? hit?.defaultValue ?? "";
+}
+
+/** 鎵佸钩鍖栦负 Spring GET 鍙粦瀹氱殑 query锛坅pprovalInstanceDto.xxx锛屽嬁鐢ㄦ柟鎷彿锛� */
+export 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;
+  }
+}
+
+function pickApplicantFromSearchForm(searchForm = {}) {
+  const out = {};
+  const sf = searchForm || {};
+  const name = (sf.applicantName || "").trim();
+  const kw = (sf.applicantKeyword || "").trim();
+  const id = sf.applicantId;
+
+  if (name) out.applicantName = name;
+  if (kw) {
+    out.applicantName = kw;
+    if (/^\d+$/.test(kw)) out.applicantId = Number(kw);
+  }
+  if (id != null && id !== "") {
+    out.applicantId = typeof id === "number" ? id : Number(id) || id;
+  }
   return out;
 }
 
-/** 鍚勬ā鍧楅粯璁ゆ煡璇㈣〃鍗曪紙涓� Web searchForm 瀛楁涓�鑷达級 */
-export function createModuleSearchForm(moduleKey) {
-  switch (moduleKey) {
-    case APPROVAL_MODULE_KEYS.REGULAR:
-      return { applicantName: "", applyDateRange: null };
-    case APPROVAL_MODULE_KEYS.TRANSFER:
-      return { applicantId: "", transferDateRange: null };
-    case APPROVAL_MODULE_KEYS.WORK_HANDOVER:
-      return { applicantId: "", handoverStatus: "", handoverType: "" };
-    case APPROVAL_MODULE_KEYS.LEAVE:
-      return { applicantKeyword: "", leaveType: "" };
-    case APPROVAL_MODULE_KEYS.OVERTIME:
-      return { applicantKeyword: "", overtimeType: "" };
-    default:
-      return {};
-  }
+function pickInstanceNoFromSearchForm(searchForm = {}) {
+  const no = (searchForm?.instanceNo || "").trim();
+  return no ? { instanceNo: no } : {};
 }
 
-/** 鏈嶅姟绔� listPage DTO 鐗囨锛堜笌 Web buildExtraListParams + buildApprovalInstanceListParams 涓�鑷达級 */
-export function buildModuleListDto(moduleKey, searchForm = {}) {
-  const sf = searchForm || {};
-  const dto = { ...pickDateRange(sf) };
+/** 鏀寔瀹℃壒鍗曞彿鏌ヨ鐨勫鎵圭敵璇锋ā鍧� */
+export const INSTANCE_NO_SEARCH_MODULE_KEYS = new Set([
+  APPROVAL_MODULE_KEYS.REGULAR,
+  APPROVAL_MODULE_KEYS.TRANSFER,
+  APPROVAL_MODULE_KEYS.WORK_HANDOVER,
+  APPROVAL_MODULE_KEYS.LEAVE,
+  APPROVAL_MODULE_KEYS.OVERTIME,
+]);
 
-  switch (moduleKey) {
-    case APPROVAL_MODULE_KEYS.REGULAR: {
-      const name = (sf.applicantName || "").trim();
-      if (name) dto.applicantName = name;
-      break;
-    }
-    case APPROVAL_MODULE_KEYS.TRANSFER:
-      break;
-    case APPROVAL_MODULE_KEYS.WORK_HANDOVER:
-      break;
-    case APPROVAL_MODULE_KEYS.LEAVE:
-    case APPROVAL_MODULE_KEYS.OVERTIME:
-      break;
-    default:
-      break;
-  }
+const INSTANCE_NO_SEARCH_FIELD = {
+  key: "instanceNo",
+  type: "input",
+  label: "瀹℃壒鍗曞彿",
+  placeholder: "璇疯緭鍏ュ鎵瑰崟鍙�",
+};
+
+/** 缁勮 approvalInstanceDto 鏌ヨ鐗囨锛堢敵璇蜂汉 + 瀹℃壒鍗曞彿锛� */
+export function buildApprovalInstanceSearchDto(searchForm = {}, extraParams = {}) {
+  const dto = {
+    ...(extraParams && typeof extraParams === "object" ? extraParams : {}),
+  };
+  Object.assign(dto, pickApplicantFromSearchForm(searchForm));
+  Object.assign(dto, pickInstanceNoFromSearchForm(searchForm));
+  delete dto.createTime;
+  delete dto.createTimeStart;
+  delete dto.createTimeEnd;
   return dto;
+}
+
+function pickDateRange(searchForm) {
+  return buildApprovalInstanceSearchDto(searchForm);
+}
+
+/** 鍚勬ā鍧楅粯璁ゆ煡璇㈣〃鍗曪紙涓� Web searchForm 瀛楁涓�鑷达級 */
+const APPLICANT_ONLY_MODULE_KEYS = new Set([
+  APPROVAL_MODULE_KEYS.REGULAR,
+  APPROVAL_MODULE_KEYS.TRANSFER,
+  APPROVAL_MODULE_KEYS.WORK_HANDOVER,
+  APPROVAL_MODULE_KEYS.LEAVE,
+  APPROVAL_MODULE_KEYS.OVERTIME,
+  APPROVAL_MODULE_KEYS.TRAVEL_REIMBURSE,
+  APPROVAL_MODULE_KEYS.COST_REIMBURSE,
+]);
+
+function withInstanceNoSearch(moduleKey, base) {
+  if (INSTANCE_NO_SEARCH_MODULE_KEYS.has(moduleKey)) {
+    return { instanceNo: "", ...base };
+  }
+  return base;
+}
+
+function applicantOnlySearchForm(moduleKey) {
+  if (moduleKey === APPROVAL_MODULE_KEYS.REGULAR) {
+    return withInstanceNoSearch(moduleKey, { applicantName: "" });
+  }
+  if (
+    moduleKey === APPROVAL_MODULE_KEYS.TRANSFER ||
+    moduleKey === APPROVAL_MODULE_KEYS.WORK_HANDOVER
+  ) {
+    return withInstanceNoSearch(moduleKey, { applicantId: "" });
+  }
+  if (APPLICANT_ONLY_MODULE_KEYS.has(moduleKey)) {
+    return withInstanceNoSearch(moduleKey, { applicantKeyword: "" });
+  }
+  return {};
+}
+
+export function createModuleSearchForm(moduleKey) {
+  if (APPLICANT_ONLY_MODULE_KEYS.has(moduleKey)) {
+    return applicantOnlySearchForm(moduleKey);
+  }
+  if (moduleKey === APPROVAL_MODULE_KEYS.ENTERPRISE_NEWS) {
+    return { applicantKeyword: "" };
+  }
+  return {};
+}
+
+/** 鏈嶅姟绔� listPage DTO 鐗囨锛堜笌 Web buildApprovalInstanceListParams 涓�鑷达級 */
+export function buildModuleListDto(moduleKey, searchForm = {}) {
+  return buildApprovalInstanceSearchDto(searchForm);
+}
+
+function matchInstanceNo(row, instanceNo) {
+  const kw = (instanceNo || "").trim().toLowerCase();
+  if (!kw) return true;
+  const parts = [row?.instanceNo, row?.bizId]
+    .filter(v => v != null && v !== "")
+    .map(v => String(v).toLowerCase());
+  return parts.some(p => p.includes(kw));
+}
+
+export function hasActiveModuleSearch(moduleKey, searchForm = {}) {
+  const sf = searchForm || {};
+  if ((sf.instanceNo || "").trim()) return true;
+  if ((sf.applicantKeyword || "").trim()) return true;
+  if ((sf.applicantName || "").trim()) return true;
+  return sf.applicantId != null && sf.applicantId !== "";
 }
 
 function matchApplicantKeyword(row, keyword) {
@@ -187,114 +372,66 @@
   });
 }
 
-/** 鍓嶇绛涢�夛紙Web 鏈笅鍙戞帴鍙ｇ殑瀛楁涓� Web 琛屼负涓�鑷达級 */
+/** 鎸夌敵璇蜂汉銆佸鎵瑰崟鍙峰仛鍓嶇鍏滃簳绛涢�� */
 export function filterRowsByModuleSearch(moduleKey, rows, searchForm = {}) {
   const sf = searchForm || {};
   const list = Array.isArray(rows) ? rows : [];
+  if (!hasActiveModuleSearch(moduleKey, sf)) return list;
 
-  switch (moduleKey) {
-    case APPROVAL_MODULE_KEYS.TRANSFER:
-      return list.filter(
-        row =>
-          matchApplicantId(row, sf.applicantId) &&
-          matchApplicantKeyword(row, sf.applicantKeyword)
-      );
-    case APPROVAL_MODULE_KEYS.WORK_HANDOVER:
-      return list.filter(
-        row =>
-          matchApplicantId(row, sf.applicantId) &&
-          matchSelectValue(row, ["handoverStatus", "浜ゆ帴鐘舵��"], sf.handoverStatus) &&
-          matchSelectValue(row, ["handoverType", "浜ゆ帴绫诲瀷"], sf.handoverType)
-      );
-    case APPROVAL_MODULE_KEYS.LEAVE:
-      return list.filter(
-        row =>
-          matchApplicantKeyword(row, sf.applicantKeyword) &&
-          matchSelectValue(row, ["leaveType", "璇峰亣绫诲瀷"], sf.leaveType)
-      );
-    case APPROVAL_MODULE_KEYS.OVERTIME:
-      return list.filter(
-        row =>
-          matchApplicantKeyword(row, sf.applicantKeyword) &&
-          matchSelectValue(row, ["overtimeType", "鍔犵彮绫诲瀷"], sf.overtimeType)
-      );
-    default:
-      return list;
-  }
+  return list.filter(
+    row =>
+      matchInstanceNo(row, sf.instanceNo) &&
+      matchApplicantId(row, sf.applicantId) &&
+      matchApplicantKeyword(row, sf.applicantKeyword || sf.applicantName)
+  );
+}
+
+function prependInstanceNoField(fields, moduleKey) {
+  if (!INSTANCE_NO_SEARCH_MODULE_KEYS.has(moduleKey)) return fields;
+  return [INSTANCE_NO_SEARCH_FIELD, ...fields];
 }
 
 /** 妯″潡绛涢�� UI 閰嶇疆 */
 export function getModuleSearchMeta(moduleKey) {
-  switch (moduleKey) {
-    case APPROVAL_MODULE_KEYS.REGULAR:
-      return {
-        fields: [
+  if (moduleKey === APPROVAL_MODULE_KEYS.REGULAR) {
+    return {
+      fields: prependInstanceNoField(
+        [
           { key: "applicantName", type: "input", label: "鐢宠浜�", placeholder: "璇疯緭鍏ョ敵璇蜂汉" },
-          { key: "applyDateRange", type: "daterange", label: "鐢宠鏃ユ湡" },
         ],
-      };
-    case APPROVAL_MODULE_KEYS.TRANSFER:
-      return {
-        fields: [
-          { key: "applicantId", type: "user", label: "鐢宠浜�", placeholder: "璇烽�夋嫨鐢宠浜�" },
-          { key: "transferDateRange", type: "daterange", label: "杞矖鏃堕棿" },
-        ],
-      };
-    case APPROVAL_MODULE_KEYS.WORK_HANDOVER:
-      return {
-        fields: [
-          { key: "applicantId", type: "user", label: "鐢宠浜�", placeholder: "璇烽�夋嫨鐢宠浜�" },
-          {
-            key: "handoverStatus",
-            type: "select",
-            label: "浜ゆ帴鐘舵��",
-            options: HANDOVER_STATUS_OPTIONS,
-          },
-          {
-            key: "handoverType",
-            type: "select",
-            label: "浜ゆ帴绫诲瀷",
-            options: HANDOVER_TYPE_OPTIONS,
-          },
-        ],
-      };
-    case APPROVAL_MODULE_KEYS.LEAVE:
-      return {
-        fields: [
-          {
-            key: "applicantKeyword",
-            type: "input",
-            label: "鐢宠浜�",
-            placeholder: "濮撳悕鎴栫紪鍙�",
-          },
-          {
-            key: "leaveType",
-            type: "select",
-            label: "璇峰亣绫诲瀷",
-            options: LEAVE_TYPE_OPTIONS,
-          },
-        ],
-      };
-    case APPROVAL_MODULE_KEYS.OVERTIME:
-      return {
-        fields: [
-          {
-            key: "applicantKeyword",
-            type: "input",
-            label: "鐢宠浜�",
-            placeholder: "濮撳悕鎴栫紪鍙�",
-          },
-          {
-            key: "overtimeType",
-            type: "select",
-            label: "鍔犵彮绫诲瀷",
-            options: OVERTIME_TYPE_OPTIONS,
-          },
-        ],
-      };
-    default:
-      return { fields: [] };
+        moduleKey
+      ),
+    };
   }
+  if (
+    moduleKey === APPROVAL_MODULE_KEYS.TRANSFER ||
+    moduleKey === APPROVAL_MODULE_KEYS.WORK_HANDOVER
+  ) {
+    return {
+      fields: prependInstanceNoField(
+        [
+          { key: "applicantId", type: "user", label: "鐢宠浜�", placeholder: "璇烽�夋嫨鐢宠浜�" },
+        ],
+        moduleKey
+      ),
+    };
+  }
+  if (APPLICANT_ONLY_MODULE_KEYS.has(moduleKey)) {
+    return {
+      fields: prependInstanceNoField(
+        [
+          {
+            key: "applicantKeyword",
+            type: "input",
+            label: "鐢宠浜�",
+            placeholder: "濮撳悕鎴栫紪鍙�",
+          },
+        ],
+        moduleKey
+      ),
+    };
+  }
+  return { fields: [] };
 }
 
 export function resetModuleSearchForm(moduleKey, target) {

--
Gitblit v1.9.3