From 261f2ed00235d47df3754291a4fdca9ba5cb8e7a Mon Sep 17 00:00:00 2001
From: spring <2396852758@qq.com>
Date: 星期四, 21 五月 2026 17:16:09 +0800
Subject: [PATCH] fix: 合并财务数据
---
src/api/viewIndex.js | 21 ++++-----------------
1 files changed, 4 insertions(+), 17 deletions(-)
diff --git a/src/api/viewIndex.js b/src/api/viewIndex.js
index dafe6e8..9cae219 100644
--- a/src/api/viewIndex.js
+++ b/src/api/viewIndex.js
@@ -347,30 +347,18 @@
});
};
-const HOME_PROGRESS_STATUS_LIST = ["all", "waiting", "inProgress", "completed", "paused", "1", "2", "3", "4"];
-const HOME_PROGRESS_TAB_LIST = ["all", "inProgress", "completed", "paused"];
-const HOME_DATE_PATTERN = /^\d{4}-\d{2}-\d{2}$/;
-
-const normalizeDateParam = (value) => {
- const dateText = typeof value === "string" ? value.trim() : "";
- return HOME_DATE_PATTERN.test(dateText) ? dateText : undefined;
-};
-
export const productionOrderProgress = (params = {}) => {
const safePageNum = Math.max(1, Number(params.pageNum || 1));
const safePageSize = Math.min(50, Math.max(1, Number(params.pageSize || 10)));
- const rawStatus = String(params.status ?? "").trim();
- const safeStatus = HOME_PROGRESS_STATUS_LIST.includes(rawStatus) ? rawStatus : undefined;
- const safeTab = HOME_PROGRESS_TAB_LIST.includes(params.tab) ? params.tab : "all";
- const normalizedTab = safeStatus && HOME_PROGRESS_TAB_LIST.includes(safeStatus) ? safeStatus : safeTab;
+ const safeTab = ["all", "inProgress", "completed", "paused"].includes(params.tab)
+ ? params.tab
+ : "all";
return request({
url: "/home/productionOrderProgress",
method: "get",
params: {
...params,
- status: safeStatus,
- tab: normalizedTab,
- bizDate: normalizeDateParam(params.bizDate),
+ tab: safeTab,
pageNum: safePageNum,
pageSize: safePageSize,
},
@@ -388,7 +376,6 @@
params: {
...params,
limit: safeLimit,
- planDate: normalizeDateParam(params.planDate),
},
headers: {
handleAuthError: false,
--
Gitblit v1.9.3