From 0244b11e00c4607af57940aacc4657918f47471b Mon Sep 17 00:00:00 2001
From: zhangwencui <1064582902@qq.com>
Date: 星期三, 01 七月 2026 16:53:45 +0800
Subject: [PATCH] 差旅报销新增隐藏收款账号和开户行；差旅报销和费用报销页面详情接口传参值替换
---
src/pages/oa/_utils/finReimbursementMappers.js | 257 ++++++++++++---------------------------------------
1 files changed, 60 insertions(+), 197 deletions(-)
diff --git a/src/pages/oa/_utils/finReimbursementMappers.js b/src/pages/oa/_utils/finReimbursementMappers.js
index 9c9a511..147e20c 100644
--- a/src/pages/oa/_utils/finReimbursementMappers.js
+++ b/src/pages/oa/_utils/finReimbursementMappers.js
@@ -1,15 +1,8 @@
import dayjs from "dayjs";
-import {
- deleteFinReimbursement,
- getFinReimbursementDetail,
- persistFinReimbursement,
-} from "@/api/oa/finReimbursement.js";
+import { deleteFinReimbursement, getFinReimbursementDetail, persistFinReimbursement } from "@/api/oa/finReimbursement.js";
import { APPROVAL_MODULE_KEYS } from "./approvalModuleRegistry.js";
import { businessStatusClass, normalizeApprovalStatusKey } from "./approveListUtils.js";
-import {
- EXPENSE_CATEGORY_OPTIONS,
- expenseTypeToCategory,
-} from "../ReimburseManage/_utils/costReimburseUtils.js";
+import { EXPENSE_CATEGORY_OPTIONS, expenseTypeToCategory } from "../ReimburseManage/_utils/costReimburseUtils.js";
import { EXPENSE_SUBJECT_OPTIONS as TRAVEL_EXPENSE_SUBJECTS } from "../ReimburseManage/_utils/travelReimburseUtils.js";
import { EXPENSE_SUBJECT_OPTIONS as COST_EXPENSE_SUBJECTS } from "../ReimburseManage/_utils/costReimburseUtils.js";
import { resolveExpenseSubjectLabel } from "../ReimburseManage/_utils/expenseDetailDisplay.js";
@@ -57,11 +50,7 @@
export function resolveReimbursementType(raw, fallback) {
const fromApi = normalizeReimbursementType(raw?.reimbursementType);
if (fromApi) return fromApi;
- return (
- normalizeReimbursementType(fallback) ||
- getReimbursementTypeByModuleKey(fallback) ||
- ""
- );
+ return normalizeReimbursementType(fallback) || getReimbursementTypeByModuleKey(fallback) || "";
}
export function isTravelReimbursementType(type) {
@@ -129,7 +118,9 @@
}
export function mapBillStatusToApprovalKey(billStatus) {
- const upper = String(billStatus ?? "").trim().toUpperCase();
+ const upper = String(billStatus ?? "")
+ .trim()
+ .toUpperCase();
if (upper === "DRAFT") return "draft";
if (upper === "IN_APPROVAL") return "pending";
if (upper === "APPROVED") return "approved";
@@ -140,7 +131,9 @@
}
export function billStatusLabel(billStatus) {
- const upper = String(billStatus ?? "").trim().toUpperCase();
+ const upper = String(billStatus ?? "")
+ .trim()
+ .toUpperCase();
if (BILL_STATUS_LABEL[upper]) return BILL_STATUS_LABEL[upper];
const key = mapBillStatusToApprovalKey(billStatus);
if (key === "draft") return "鑽夌";
@@ -151,9 +144,7 @@
}
export function billStatusCssClass(item) {
- return businessStatusClass(
- mapBillStatusToApprovalKey(item?.billStatus ?? item?.status)
- );
+ return businessStatusClass(mapBillStatusToApprovalKey(item?.billStatus ?? item?.status));
}
function pickApplicantQuery(searchForm = {}) {
@@ -175,17 +166,9 @@
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));
+ 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));
});
}
@@ -198,12 +181,7 @@
}
}
-export function buildFinReimbursementListParams({
- page,
- searchForm,
- reimbursementType,
- extraDto = {},
-}) {
+export function buildFinReimbursementListParams({ page, searchForm, reimbursementType, extraDto = {} }) {
const dto = {
reimbursementType,
...pickApplicantQuery(searchForm),
@@ -233,43 +211,14 @@
/** 鍏煎 list/detail 澶氱宸梾瀛愬璞＄粨鏋� */
export function pickTravelFromRow(row) {
if (!row || typeof row !== "object") return {};
- const nested =
- (row.travel && typeof row.travel === "object" ? row.travel : null) ||
- row.finReimbursementTravel ||
- row.finReimbursementTravelDto ||
- row.travelDto ||
- row.travelVO ||
- {};
- const src =
- nested && typeof nested === "object" && Object.keys(nested).length
- ? nested
- : row;
+ const nested = (row.travel && typeof row.travel === "object" ? row.travel : null) || row.finReimbursementTravel || row.finReimbursementTravelDto || row.travelDto || row.travelVO || {};
+ const src = nested && typeof nested === "object" && Object.keys(nested).length ? nested : row;
return {
- startTime: pickTravelField(src, [
- "startTime",
- "travelStartTime",
- "startDate",
- "travelStartDate",
- "departureTime",
- ]),
- endTime: pickTravelField(src, [
- "endTime",
- "travelEndTime",
- "endDate",
- "travelEndDate",
- "returnTime",
- ]),
+ startTime: pickTravelField(src, ["startTime", "travelStartTime", "startDate", "travelStartDate", "departureTime"]),
+ endTime: pickTravelField(src, ["endTime", "travelEndTime", "endDate", "travelEndDate", "returnTime"]),
travelDays: src.travelDays,
- departureCity: pickTravelField(src, [
- "departureCity",
- "departurePlace",
- "departure",
- ]),
- destinationCity: pickTravelField(src, [
- "destinationCity",
- "destination",
- "destinationPlace",
- ]),
+ departureCity: pickTravelField(src, ["departureCity", "departurePlace", "departure"]),
+ destinationCity: pickTravelField(src, ["destinationCity", "destination", "destinationPlace"]),
hotelStandard: src.hotelStandard,
lodgingDays: src.lodgingDays ?? src.hotelDays,
mealAllowance: src.mealAllowance ?? src.livingSubsidy,
@@ -293,10 +242,7 @@
export function mapFinReimbursementFromApi(row, { reimbursementType, moduleKey } = {}) {
if (!row) return {};
- const type = resolveReimbursementType(
- row,
- reimbursementType || getReimbursementTypeByModuleKey(moduleKey)
- );
+ const type = resolveReimbursementType(row, reimbursementType || getReimbursementTypeByModuleKey(moduleKey));
const isTravel = type === FIN_REIMBURSEMENT_TYPE.TRAVEL;
const travel = isTravel ? pickTravelFromRow(row) : {};
const apiNodes = resolveRowApiNodes(row);
@@ -306,11 +252,12 @@
nodes: apiNodes,
approvalFlowNodes,
});
- const instanceId = row.approvalInstanceId ?? row.id;
+ const instanceId = row.id ?? row.approvalInstanceId;
+ const reimbursementId = row.reimbursementId ?? row.id;
return {
...row,
- reimbursementId: row.id,
+ reimbursementId,
id: instanceId,
approvalInstanceId: row.approvalInstanceId,
instanceNo: row.billNo || "",
@@ -351,7 +298,7 @@
reason: row.reason,
approvalFlowSummary: flowSummary,
},
- type
+ type,
),
};
}
@@ -368,12 +315,7 @@
{ label: "鍗曟嵁鐘舵��", value: billStatusLabel(item.billStatus) },
];
if (isTravel) {
- rows.splice(
- 1,
- 0,
- { label: "鍑哄樊鍦�", value: item.departurePlace },
- { label: "鐩殑鍦�", value: item.destination }
- );
+ rows.splice(1, 0, { label: "鍑哄樊鍦�", value: item.departurePlace }, { label: "鐩殑鍦�", value: item.destination });
} else {
rows.splice(1, 0, { label: "璐圭敤绫诲瀷", value: item.expenseType });
}
@@ -397,7 +339,7 @@
/** 鍒楄〃琛屼富閿紙鍒犻櫎/淇敼鐢� fin_reimbursement.id锛屽嬁鐢� item.id 瀹℃壒瀹炰緥 ID锛� */
export function resolveReimbursementDeleteId(row) {
- const raw = row?.reimbursementId;
+ const raw = row?.reimbursementId ?? row?.reimbursementID ?? row?.finReimbursementId;
if (raw == null || raw === "" || String(raw).startsWith("local_")) {
return undefined;
}
@@ -407,11 +349,11 @@
/** 鏄惁鍏佽鍒犻櫎锛堝鎵逛腑銆佸凡閫氳繃銆佸凡浠樻涓嶅彲鍒狅級 */
export function canDeleteReimbursementRow(row) {
- const upper = String(row?.billStatus ?? row?.status ?? "").trim().toUpperCase();
+ const upper = String(row?.billStatus ?? row?.status ?? "")
+ .trim()
+ .toUpperCase();
if (upper === "PAID") return false;
- const key = mapBillStatusToApprovalKey(
- row?.billStatus ?? row?.approvalStatus ?? row?.status
- );
+ const key = mapBillStatusToApprovalKey(row?.billStatus ?? row?.approvalStatus ?? row?.status);
return key !== "pending" && key !== "approved";
}
@@ -444,7 +386,7 @@
expenseType: row.expenseCategory || row.expenseType,
reason: row.reimburseReason || row.reason,
},
- type
+ type,
),
};
}
@@ -460,19 +402,14 @@
}
function expenseSubjectToCategory(subject) {
- const hit =
- TRAVEL_EXPENSE_SUBJECTS.find(x => x.value === subject) ||
- COST_EXPENSE_SUBJECTS.find(x => x.value === subject);
+ const hit = TRAVEL_EXPENSE_SUBJECTS.find(x => x.value === subject) || COST_EXPENSE_SUBJECTS.find(x => x.value === subject);
return hit?.label || subject || "";
}
function mapDetailRowFromApi(d, reimbursementType) {
const type = normalizeReimbursementType(reimbursementType);
const raw = d.expenseCategory ?? d.expenseSubject ?? "";
- const opts =
- type === FIN_REIMBURSEMENT_TYPE.TRAVEL
- ? TRAVEL_EXPENSE_SUBJECTS
- : COST_EXPENSE_SUBJECTS;
+ const opts = type === FIN_REIMBURSEMENT_TYPE.TRAVEL ? TRAVEL_EXPENSE_SUBJECTS : COST_EXPENSE_SUBJECTS;
const label = resolveExpenseSubjectLabel(raw, {
isTravel: type === FIN_REIMBURSEMENT_TYPE.TRAVEL,
subjectOptions: opts,
@@ -491,13 +428,7 @@
export function resolveRowApiNodes(row) {
if (!row || typeof row !== "object") return [];
- const list =
- row.nodes ||
- row.flowNodes ||
- row.approveNodes ||
- row.finReimbursementNodes ||
- row.nodeList ||
- [];
+ const list = row.nodes || row.flowNodes || row.approveNodes || row.finReimbursementNodes || row.nodeList || [];
return Array.isArray(list) ? list : [];
}
@@ -512,9 +443,7 @@
function formatApiNodeApproverLabel(node, index) {
if (!node || typeof node !== "object") return "";
const approvers = Array.isArray(node.approvers) ? node.approvers : [];
- const names = approvers
- .map(a => (a?.approverName || "").trim())
- .filter(Boolean);
+ const names = approvers.map(a => (a?.approverName || "").trim()).filter(Boolean);
if (names.length) return names.join("/");
return (node.approverName || "").trim() || `鑺傜偣${index + 1}`;
}
@@ -524,20 +453,13 @@
return sortFlowNodesByLevel(nodes).map((n, i) => {
const approvers = Array.isArray(n.approvers) ? n.approvers : [];
const first = approvers[0] || null;
- const names = approvers
- .map(a => (a?.approverName || "").trim())
- .filter(Boolean);
+ const names = approvers.map(a => (a?.approverName || "").trim()).filter(Boolean);
return {
...n,
nodeOrder: n.levelNo ?? n.nodeOrder ?? i + 1,
signMode: String(n.approveType || "").toUpperCase() === "OR" ? "or_sign" : "countersign",
- approverId:
- toNumber(first?.approverId ?? n.approverId) ??
- first?.approverId ??
- n.approverId ??
- "",
- approverName:
- names.join("銆�") || first?.approverName || n.approverName || "",
+ approverId: toNumber(first?.approverId ?? n.approverId) ?? first?.approverId ?? n.approverId ?? "",
+ approverName: names.join("銆�") || first?.approverName || n.approverName || "",
nodeStatus: n.nodeStatus,
};
});
@@ -547,10 +469,8 @@
const list = sortFlowNodesByLevel(
(Array.isArray(tasks) ? tasks : []).map((t, i) => ({
levelNo: t.levelNo ?? t.taskLevel ?? i + 1,
- approverName:
- (t.approverName || t.operatorName || t.createUserName || "").trim() ||
- "",
- }))
+ approverName: (t.approverName || t.operatorName || t.createUserName || "").trim() || "",
+ })),
);
const parts = list.map(t => t.approverName).filter(Boolean);
return parts.length ? parts.join(" 鈫� ") : "";
@@ -558,10 +478,7 @@
function buildApprovalFlowSummaryForRow(row) {
const apiNodes = sortFlowNodesByLevel(resolveRowApiNodes(row));
- let flowNodes =
- row?.approvalFlowNodes?.length > 0
- ? sortFlowNodesByLevel(row.approvalFlowNodes)
- : mapNodesToFormFlow(apiNodes);
+ let flowNodes = row?.approvalFlowNodes?.length > 0 ? sortFlowNodesByLevel(row.approvalFlowNodes) : mapNodesToFormFlow(apiNodes);
if (!flowNodes.length && apiNodes.length) {
const line = apiNodes
@@ -593,16 +510,11 @@
}
/** listPage 甯镐笉甯﹀畬鏁� nodes锛屽垪琛ㄥ姞杞藉悗缁熶竴鎷夎鎯呰ˉ鍏ㄥ绾у鎵规祦绋� */
-export async function enrichReimbursementListRowsWithApprovalFlow(
- rows,
- reimbursementType
-) {
+export async function enrichReimbursementListRowsWithApprovalFlow(rows, reimbursementType) {
const list = Array.isArray(rows) ? rows : [];
if (!list.length) return list;
- const needIds = list
- .map(r => resolveReimbursementDeleteId(r))
- .filter(id => id != null);
+ const needIds = list.map(r => resolveReimbursementDeleteId(r)).filter(id => id != null);
if (!needIds.length) return list;
@@ -615,13 +527,10 @@
} catch {
/* ignore */
}
- })
+ }),
);
- const mapRow =
- reimbursementType === FIN_REIMBURSEMENT_TYPE.TRAVEL
- ? mapTravelReimbursementRow
- : mapCostReimbursementRow;
+ const mapRow = reimbursementType === FIN_REIMBURSEMENT_TYPE.TRAVEL ? mapTravelReimbursementRow : mapCostReimbursementRow;
return list.map(row => {
const id = resolveReimbursementDeleteId(row);
@@ -638,8 +547,7 @@
/** 琛ㄥ崟涓婄殑瀹℃壒娴侊紙鍏煎 approvalFlowNodes / nodes / flowNodes锛� */
export function resolveFormApprovalFlowNodes(form) {
- const list =
- form?.approvalFlowNodes ?? form?.nodes ?? form?.flowNodes ?? [];
+ const list = form?.approvalFlowNodes ?? form?.nodes ?? form?.flowNodes ?? [];
return Array.isArray(list) ? list : [];
}
@@ -727,46 +635,22 @@
/** 琛ㄥ崟闄勪欢鍒楄〃锛堝吋瀹瑰绉嶅瓧娈靛悕锛� */
export function resolveFormAttachmentList(form) {
- const list =
- form?.attachmentList ??
- form?.storageBlobDTOs ??
- form?.storageBlobVOList ??
- form?.invoiceAttachments ??
- [];
+ const list = form?.attachmentList ?? form?.storageBlobDTOs ?? form?.storageBlobVOList ?? form?.invoiceAttachments ?? [];
return Array.isArray(list) ? list : [];
}
/** 椤甸潰闄勪欢 鈫� 淇濆瓨 DTO锛坰torageBlobVOList / storageBlobDTOs锛� */
export function mapFormAttachmentsToApi(list = [], reimbursementId) {
- const rid =
- reimbursementId != null
- ? toNumber(reimbursementId) ?? reimbursementId
- : undefined;
+ const rid = reimbursementId != null ? (toNumber(reimbursementId) ?? reimbursementId) : undefined;
return (list || [])
.map((item, i) => {
if (!item) return null;
- const url =
- item.url ||
- item.fileUrl ||
- item.downloadUrl ||
- item.downloadURL ||
- item.previewUrl ||
- item.previewURL ||
- item.link ||
- "";
- const name =
- item.fileName ||
- item.originalFilename ||
- item.originalFileName ||
- item.blobName ||
- item.name ||
- `闄勪欢${i + 1}`;
+ const url = item.url || item.fileUrl || item.downloadUrl || item.downloadURL || item.previewUrl || item.previewURL || item.link || "";
+ const name = item.fileName || item.originalFilename || item.originalFileName || item.blobName || item.name || `闄勪欢${i + 1}`;
const idRaw = item.id ?? item.blobId;
- const isTempId =
- idRaw != null &&
- /^(inv_|att_|ed_|local_)/.test(String(idRaw));
+ const isTempId = idRaw != null && /^(inv_|att_|ed_|local_)/.test(String(idRaw));
if (!url && (idRaw == null || isTempId)) return null;
@@ -789,10 +673,7 @@
}
function applyStorageBlobsToSaveDto(dto, form) {
- const blobs = mapFormAttachmentsToApi(
- resolveFormAttachmentList(form),
- dto?.id ?? form?.reimbursementId ?? form?.id
- );
+ const blobs = mapFormAttachmentsToApi(resolveFormAttachmentList(form), dto?.id ?? form?.reimbursementId ?? form?.id);
if (blobs.length) {
dto.storageBlobVOList = blobs;
dto.storageBlobDTOs = blobs;
@@ -863,13 +744,8 @@
payeeAccount: row.payeeAccount || "",
payeeBank: row.payeeBank || "",
billStatus: row.billStatus,
- expenseDetails: details.map(d =>
- mapDetailRowFromApi(d, FIN_REIMBURSEMENT_TYPE.TRAVEL)
- ),
- travel:
- row.travel && typeof row.travel === "object" && Object.keys(row.travel).length
- ? row.travel
- : travel,
+ expenseDetails: details.map(d => mapDetailRowFromApi(d, FIN_REIMBURSEMENT_TYPE.TRAVEL)),
+ travel: row.travel && typeof row.travel === "object" && Object.keys(row.travel).length ? row.travel : travel,
details,
nodes: resolveRowApiNodes(row),
approvalFlowNodes: mapNodesToFormFlow(resolveRowApiNodes(row)),
@@ -907,9 +783,7 @@
bankBranch: row.payeeBank || "",
payeeBank: row.payeeBank || "",
billStatus: row.billStatus,
- expenseDetails: details.map(d =>
- mapDetailRowFromApi(d, FIN_REIMBURSEMENT_TYPE.COST)
- ),
+ expenseDetails: details.map(d => mapDetailRowFromApi(d, FIN_REIMBURSEMENT_TYPE.COST)),
details,
nodes: apiNodes,
approvalFlowNodes,
@@ -942,9 +816,7 @@
const enriched = applyFinReimbursementDetailEnrichment(mapped, raw);
return {
...enriched,
- approvalFlowNodes: formApprovalFlowNodes.length
- ? formApprovalFlowNodes
- : enriched.approvalFlowNodes,
+ approvalFlowNodes: formApprovalFlowNodes.length ? formApprovalFlowNodes : enriched.approvalFlowNodes,
reimbursementType: type,
reimbursementTypeLabel: reimbursementTypeLabel(type),
moduleKey: getModuleKeyByReimbursementType(type),
@@ -956,10 +828,7 @@
const details = mapDetailsToApi(form.expenseDetails);
const detailTotal = sumDetailAmount(form.expenseDetails);
const applyAmount = toNumber(form.applyAmount) ?? detailTotal;
- const travelDays =
- form.travelDays != null
- ? toNumber(form.travelDays)
- : computeTravelDays?.(form.travelStartTime, form.travelEndTime);
+ const travelDays = form.travelDays != null ? toNumber(form.travelDays) : computeTravelDays?.(form.travelStartTime, form.travelEndTime);
const dto = {
reimbursementType: FIN_REIMBURSEMENT_TYPE.TRAVEL,
@@ -992,10 +861,7 @@
withinStandard: form.needSpecialApproval ? "0" : "1",
},
details,
- nodes: mapApprovalFlowNodesToApi(
- resolveFormApprovalFlowNodes(form),
- form.templateId
- ),
+ nodes: mapApprovalFlowNodesToApi(resolveFormApprovalFlowNodes(form), form.templateId),
};
const id = resolveReimbursementId(form);
@@ -1032,10 +898,7 @@
billStatus: "IN_APPROVAL",
deptId: toNumber(form.deptId),
details,
- nodes: mapApprovalFlowNodesToApi(
- resolveFormApprovalFlowNodes(form),
- form.templateId
- ),
+ nodes: mapApprovalFlowNodesToApi(resolveFormApprovalFlowNodes(form), form.templateId),
};
const id = resolveReimbursementId(form);
--
Gitblit v1.9.3