diff --git a/src/api/staffInfo/index.js b/src/api/staffInfo/index.js index 8ef9e4d..49d53b5 100644 --- a/src/api/staffInfo/index.js +++ b/src/api/staffInfo/index.js @@ -1,5 +1,6 @@ import { declareRequest } from "@cqsjjb/jjb-dva-runtime"; -import { apiPost, apiPostDelete, safeAction } from "../enterpriseInfo/http"; +import { apiPost, safeAction } from "../enterpriseInfo/http"; +import { asId } from "../enterpriseInfo/idUtil"; export const staffInfoList = declareRequest( "staffInfoLoading", @@ -25,13 +26,10 @@ export const staffInfoEdit = declareRequest( export const staffInfoRemove = declareRequest( "staffInfoLoading", - safeAction(async ({ id }) => apiPostDelete("/safetyEval/org-personnel/delete", id)), + safeAction(async ({ id }) => apiPost("/safetyEval/org-personnel/delete", { data: asId(id) })), ); export const staffInfoResetPassword = declareRequest( "staffInfoLoading", - safeAction(async ({ id }) => { - const url = `/safetyEval/org-personnel/reset-password?id=${encodeURIComponent(id)}`; - return apiPost(url, {}); - }), + safeAction(async ({ id }) => apiPost("/safetyEval/org-personnel/reset-password", { data: asId(id) })), ); \ No newline at end of file diff --git a/src/pages/Container/EnterpriseInfo/DepartmentPosition/index.js b/src/pages/Container/EnterpriseInfo/DepartmentPosition/index.js index 0b47aff..f8dd9bb 100644 --- a/src/pages/Container/EnterpriseInfo/DepartmentPosition/index.js +++ b/src/pages/Container/EnterpriseInfo/DepartmentPosition/index.js @@ -55,9 +55,9 @@ function DepartmentPositionPage(props) { try { const res = await props.staffInfoList?.({ pageIndex: 1, pageSize: 500 }); setStaffOptions((res?.data || []).map((s) => ({ - label: `${s.staffName}(${s.account})`, + label: `${s.userName ?? s.staffName}(${s.account})`, value: s.account, - staffName: s.staffName, + staffName: s.userName ?? s.staffName, }))); } catch (err) { diff --git a/src/pages/Container/EnterpriseInfo/PersonnelChange/index.js b/src/pages/Container/EnterpriseInfo/PersonnelChange/index.js index 11dc383..e9423d6 100644 --- a/src/pages/Container/EnterpriseInfo/PersonnelChange/index.js +++ b/src/pages/Container/EnterpriseInfo/PersonnelChange/index.js @@ -183,8 +183,8 @@ function PersonnelChangePage(props) { width: 140, render: (_, record) => { const code = record.resignAuditStatus ?? record.auditStatus ?? record.auditStatusCode; - return RESIGN_AUDIT_STATUS_LABEL[code] ? {label} : "-"; - + const label = RESIGN_AUDIT_STATUS_LABEL[code]; + return label ? {label} : "-"; }, }, { diff --git a/src/pages/Container/EnterpriseInfo/QualificationCert/index.js b/src/pages/Container/EnterpriseInfo/QualificationCert/index.js index 6faadc6..a4fa6ac 100644 --- a/src/pages/Container/EnterpriseInfo/QualificationCert/index.js +++ b/src/pages/Container/EnterpriseInfo/QualificationCert/index.js @@ -56,6 +56,13 @@ function QualificationCertPage(props) { ...router.query, current: router.query.current || 1, 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); if (res?.success !== false) { diff --git a/src/pages/Container/EnterpriseInfo/ResignationApply/index.js b/src/pages/Container/EnterpriseInfo/ResignationApply/index.js index 7930e3b..75e4fa3 100644 --- a/src/pages/Container/EnterpriseInfo/ResignationApply/index.js +++ b/src/pages/Container/EnterpriseInfo/ResignationApply/index.js @@ -13,7 +13,6 @@ import { } from "antd"; import TableAction from "@cqsjjb/jjb-react-admin-component/TableAction"; import AttachmentUpload from "~/components/AttachmentUpload"; -import { UploadOutlined } from "@ant-design/icons"; import PreviewUrlButton from "~/components/PreviewUrlButton"; import { useEffect, useState } from "react"; import PageLayout from "@cqsjjb/jjb-react-admin-component/PageLayout"; @@ -222,6 +221,12 @@ function AddModal({ open, staffOptions, requestAdd, onCancel, onSuccess }) { const handleSubmit = async () => { try { const values = await form.validateFields(); + if (!values.reportFileUrl?.length) { + form.setFields([ + { name: "reportFileUrl", errors: ["请上传离职通知报告"] }, + ]); + return; + } setSubmitting(true); values.applyTime = values.applyTime?.format?.("YYYY-MM-DD HH:mm:ss") || values.applyTime; @@ -292,52 +297,12 @@ function AddModal({ open, staffOptions, requestAdd, onCancel, onSuccess }) { - - - { - const url = form.getFieldValue("reportFileUrl"); - if (url) window.open(url); - }} - onChange={(info) => { - if (info.file.status === "uploading") { - setUploading(true); - } else { - setUploading(false); - if (info.file.status === "done") { - const data = info.file.response?.data; - if (data) { - const url = data.url || data; - form.setFieldsValue({ reportFileUrl: url }); - } else { - message.error("上传失败,未获取到文件地址"); - } - } else if (info.file.status === "error") { - message.error(`${info.file.name} 上传失败`); - } - } - }} - onRemove={() => { - form.setFieldsValue({ reportFileUrl: "" }); - }} - > - - - + maxCount={1} + accept=".pdf" + /> );