diff --git a/src/pages/Container/EnterpriseInfo/PersonnelInfo/List/index.js b/src/pages/Container/EnterpriseInfo/PersonnelInfo/List/index.js index e4ceae0..e792777 100644 --- a/src/pages/Container/EnterpriseInfo/PersonnelInfo/List/index.js +++ b/src/pages/Container/EnterpriseInfo/PersonnelInfo/List/index.js @@ -303,7 +303,7 @@ function PersonnelInfoPage(props) { { setViewModalOpen(false); setCurrentId(""); diff --git a/src/pages/Container/EnterpriseInfo/PersonnelInfo/StaffViewModal.js b/src/pages/Container/EnterpriseInfo/PersonnelInfo/StaffViewModal.js index f67f118..96afd47 100644 --- a/src/pages/Container/EnterpriseInfo/PersonnelInfo/StaffViewModal.js +++ b/src/pages/Container/EnterpriseInfo/PersonnelInfo/StaffViewModal.js @@ -120,7 +120,7 @@ export default function StaffViewModal({ onCancel={onCancel} > - {info.userName} + { info.titleName} {GENDER_MAP[info.genderCode]} @@ -131,7 +131,7 @@ export default function StaffViewModal({ {info.deptName} {info.postName} - {info.personType || "基础人员"} + {info.personTypeName || "基础人员"} {info.qualScope || "-"} @@ -217,7 +217,7 @@ export default function StaffViewModal({ columns={[ { title: "证照名称", dataIndex: "certName" }, { title: "证书编号", dataIndex: "certNo" }, - { title: "证书类别", dataIndex: "certCategory" }, + { title: "证书类别", dataIndex: "certTypeName" }, { title: "发证机关", dataIndex: "issueOrg" }, { title: "有效开始日期", dataIndex: "validStartDate", width: 120 }, { title: "有效结束日期", dataIndex: "validEndDate", width: 120 }, diff --git a/src/pages/Container/QualApplication/FilingForm/components/OrgPersonnelSelectModal.jsx b/src/pages/Container/QualApplication/FilingForm/components/OrgPersonnelSelectModal.jsx index 364cc2b..0f659a5 100644 --- a/src/pages/Container/QualApplication/FilingForm/components/OrgPersonnelSelectModal.jsx +++ b/src/pages/Container/QualApplication/FilingForm/components/OrgPersonnelSelectModal.jsx @@ -110,7 +110,7 @@ function OrgPersonnelSelectModalInner(props) { setViewId("")} /> diff --git a/src/pages/Container/QualApplication/FilingForm/index.js b/src/pages/Container/QualApplication/FilingForm/index.js index f801ae2..d9c3329 100644 --- a/src/pages/Container/QualApplication/FilingForm/index.js +++ b/src/pages/Container/QualApplication/FilingForm/index.js @@ -177,6 +177,7 @@ function FilingFormPage(props) { return { ...item, personName: item.userName, + sourcePersonnelId: item.id, }; }); delete params.personnelList; diff --git a/src/pages/Container/Supervision/BasicInfo/RegisteredOrg/Detail/index.js b/src/pages/Container/Supervision/BasicInfo/RegisteredOrg/Detail/index.js index eb42d91..9a097d3 100644 --- a/src/pages/Container/Supervision/BasicInfo/RegisteredOrg/Detail/index.js +++ b/src/pages/Container/Supervision/BasicInfo/RegisteredOrg/Detail/index.js @@ -283,9 +283,7 @@ function RegisteredOrgDetailPage(props) { setViewPersonnelId("")} /> )} diff --git a/src/utils/qualFiling/personnelHelper.js b/src/utils/qualFiling/personnelHelper.js index 5eb807e..0cd7aef 100644 --- a/src/utils/qualFiling/personnelHelper.js +++ b/src/utils/qualFiling/personnelHelper.js @@ -1,8 +1,7 @@ -import { fromSingleResponse, toStaffForm } from "../enterpriseInfo/adapter"; import { apiGet } from "../enterpriseInfo/http"; import { asId } from "../enterpriseInfo/idUtil"; export async function fetchOrgPersonnelDetail(params) { const res = await apiGet("/safetyEval/org-personnel/get", { id: asId(params?.id) }); - return fromSingleResponse(res, toStaffForm); + return res; }