Compare commits

..

No commits in common. "a2dc77d99ce4f24b5b11856a7d586d71c4bf0f4b" and "f70bd6afc3d767071fb1856ad303fb1715a1251a" have entirely different histories.

2 changed files with 6 additions and 11 deletions

View File

@ -1,6 +1,5 @@
import { declareRequest } from "@cqsjjb/jjb-dva-runtime"; import { declareRequest } from "@cqsjjb/jjb-dva-runtime";
import { apiPost, safeAction } from "../enterpriseInfo/http"; import { apiPost, apiPostDelete, safeAction } from "../enterpriseInfo/http";
import { asId } from "../enterpriseInfo/idUtil";
export const staffInfoList = declareRequest( export const staffInfoList = declareRequest(
"staffInfoLoading", "staffInfoLoading",
@ -26,10 +25,13 @@ export const staffInfoEdit = declareRequest(
export const staffInfoRemove = declareRequest( export const staffInfoRemove = declareRequest(
"staffInfoLoading", "staffInfoLoading",
safeAction(async ({ id }) => apiPost("/safetyEval/org-personnel/delete", { data: asId(id) })), safeAction(async ({ id }) => apiPostDelete("/safetyEval/org-personnel/delete", id)),
); );
export const staffInfoResetPassword = declareRequest( export const staffInfoResetPassword = declareRequest(
"staffInfoLoading", "staffInfoLoading",
safeAction(async ({ id }) => apiPost("/safetyEval/org-personnel/reset-password", { data: asId(id) })), safeAction(async ({ id }) => {
const url = `/safetyEval/org-personnel/reset-password?id=${encodeURIComponent(id)}`;
return apiPost(url, {});
}),
); );

View File

@ -56,13 +56,6 @@ function QualificationCertPage(props) {
...router.query, ...router.query,
current: router.query.current || 1, current: router.query.current || 1,
pageSize: router.query.pageSize || 10, pageSize: router.query.pageSize || 10,
// 映射后端期望的字段名:前端 likeCertName → 后端 certName
certName: router.query.likeCertName || undefined,
// 映射日期筛选:前端 validStartDate/validEndDate → 后端 startTime/endTime (LocalDateTime 格式)
startTime: router.query.validStartDate ? `${router.query.validStartDate} 00:00:00` : undefined,
endTime: router.query.validEndDate ? `${router.query.validEndDate} 23:59:59` : undefined,
// 后端分页字段名为 size
size: router.query.pageSize || 10,
}; };
const res = await props.orgQualificationCertList(params); const res = await props.orgQualificationCertList(params);
if (res?.success !== false) { if (res?.success !== false) {