cq_anquan
/
safety-eval-service-frontend
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

fix

dev_1.0.1
tangjie 2026-07-08 22:33:22 +08:00
parent 21ff39b55d
commit 3460e81ea4
6 changed files with 8 additions and 10 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
src/pages/Container/EnterpriseInfo/PersonnelInfo/List/index.js
View File

@ -303,7 +303,7 @@ function PersonnelInfoPage(props) {
<StaffViewModal <StaffViewModal
open={viewModalOpen} open={viewModalOpen}
currentId={currentId} currentId={currentId}
requestDetails={props.staffInfoGet}
onCancel={() => { onCancel={() => {
setViewModalOpen(false); setViewModalOpen(false);
setCurrentId(""); setCurrentId("");

6
src/pages/Container/EnterpriseInfo/PersonnelInfo/StaffViewModal.js
View File

@ -120,7 +120,7 @@ export default function StaffViewModal({
onCancel={onCancel} onCancel={onCancel}
> >
<Descriptions bordered column={2} labelStyle={{ width: 120 }}> <Descriptions bordered column={2} labelStyle={{ width: 120 }}>
<Descriptions.Item label="姓名">{info.userName}</Descriptions.Item> <Descriptions.Item label="姓名">{ info.titleName}</Descriptions.Item>
<Descriptions.Item label="性别"> <Descriptions.Item label="性别">
{GENDER_MAP[info.genderCode]} {GENDER_MAP[info.genderCode]}
</Descriptions.Item> </Descriptions.Item>
@ -131,7 +131,7 @@ export default function StaffViewModal({
<Descriptions.Item label="部门">{info.deptName}</Descriptions.Item> <Descriptions.Item label="部门">{info.deptName}</Descriptions.Item>
<Descriptions.Item label="岗位">{info.postName}</Descriptions.Item> <Descriptions.Item label="岗位">{info.postName}</Descriptions.Item>
<Descriptions.Item label="人员类型"> <Descriptions.Item label="人员类型">
{info.personType || "基础人员"} {info.personTypeName || "基础人员"}
</Descriptions.Item> </Descriptions.Item>
<Descriptions.Item label="资质范围"> <Descriptions.Item label="资质范围">
{info.qualScope || "-"} {info.qualScope || "-"}
@ -217,7 +217,7 @@ export default function StaffViewModal({
columns={[ columns={[
{ title: "证照名称", dataIndex: "certName" }, { title: "证照名称", dataIndex: "certName" },
{ title: "证书编号", dataIndex: "certNo" }, { title: "证书编号", dataIndex: "certNo" },
{ title: "证书类别", dataIndex: "certCategory" }, { title: "证书类别", dataIndex: "certTypeName" },
{ title: "发证机关", dataIndex: "issueOrg" }, { title: "发证机关", dataIndex: "issueOrg" },
{ title: "有效开始日期", dataIndex: "validStartDate", width: 120 }, { title: "有效开始日期", dataIndex: "validStartDate", width: 120 },
{ title: "有效结束日期", dataIndex: "validEndDate", width: 120 }, { title: "有效结束日期", dataIndex: "validEndDate", width: 120 },

2
src/pages/Container/QualApplication/FilingForm/components/OrgPersonnelSelectModal.jsx
View File

@ -110,7 +110,7 @@ function OrgPersonnelSelectModalInner(props) {
<StaffViewModal <StaffViewModal
open={!!viewId} open={!!viewId}
currentId={viewId} currentId={viewId}
requestDetails={props.staffInfoGet}
onCancel={() => setViewId("")} onCancel={() => setViewId("")}
/> />
</> </>

1
src/pages/Container/QualApplication/FilingForm/index.js
View File

@ -177,6 +177,7 @@ function FilingFormPage(props) {
return { return {
...item, ...item,
personName: item.userName, personName: item.userName,
sourcePersonnelId: item.id,
}; };
}); });
delete params.personnelList; delete params.personnelList;

4
src/pages/Container/Supervision/BasicInfo/RegisteredOrg/Detail/index.js
View File

@ -283,9 +283,7 @@ function RegisteredOrgDetailPage(props) {
<StaffViewModal <StaffViewModal
open={!!viewPersonnelId} open={!!viewPersonnelId}
currentId={viewPersonnelId} currentId={viewPersonnelId}
requestDetails={fetchRegisteredOrgPersonnelDetail}
requestCertList={fetchRegisteredOrgPersonnelCertList}
requestCertDetails={fetchRegisteredOrgPersonnelCertDetail}
onCancel={() => setViewPersonnelId("")} onCancel={() => setViewPersonnelId("")}
/> />
)} )}

3
src/utils/qualFiling/personnelHelper.js
View File

@ -1,8 +1,7 @@
import { fromSingleResponse, toStaffForm } from "../enterpriseInfo/adapter";
import { apiGet } from "../enterpriseInfo/http"; import { apiGet } from "../enterpriseInfo/http";
import { asId } from "../enterpriseInfo/idUtil"; import { asId } from "../enterpriseInfo/idUtil";
export async function fetchOrgPersonnelDetail(params) { export async function fetchOrgPersonnelDetail(params) {
const res = await apiGet("/safetyEval/org-personnel/get", { id: asId(params?.id) }); const res = await apiGet("/safetyEval/org-personnel/get", { id: asId(params?.id) });
return fromSingleResponse(res, toStaffForm); return res;
} }