fix
parent
21ff39b55d
commit
3460e81ea4
|
|
@ -303,7 +303,7 @@ function PersonnelInfoPage(props) {
|
|||
<StaffViewModal
|
||||
open={viewModalOpen}
|
||||
currentId={currentId}
|
||||
requestDetails={props.staffInfoGet}
|
||||
|
||||
onCancel={() => {
|
||||
setViewModalOpen(false);
|
||||
setCurrentId("");
|
||||
|
|
|
|||
|
|
@ -120,7 +120,7 @@ export default function StaffViewModal({
|
|||
onCancel={onCancel}
|
||||
>
|
||||
<Descriptions bordered column={2} labelStyle={{ width: 120 }}>
|
||||
<Descriptions.Item label="姓名">{info.userName}</Descriptions.Item>
|
||||
<Descriptions.Item label="姓名">{ info.titleName}</Descriptions.Item>
|
||||
<Descriptions.Item label="性别">
|
||||
{GENDER_MAP[info.genderCode]}
|
||||
</Descriptions.Item>
|
||||
|
|
@ -131,7 +131,7 @@ export default function StaffViewModal({
|
|||
<Descriptions.Item label="部门">{info.deptName}</Descriptions.Item>
|
||||
<Descriptions.Item label="岗位">{info.postName}</Descriptions.Item>
|
||||
<Descriptions.Item label="人员类型">
|
||||
{info.personType || "基础人员"}
|
||||
{info.personTypeName || "基础人员"}
|
||||
</Descriptions.Item>
|
||||
<Descriptions.Item label="资质范围">
|
||||
{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 },
|
||||
|
|
|
|||
|
|
@ -110,7 +110,7 @@ function OrgPersonnelSelectModalInner(props) {
|
|||
<StaffViewModal
|
||||
open={!!viewId}
|
||||
currentId={viewId}
|
||||
requestDetails={props.staffInfoGet}
|
||||
|
||||
onCancel={() => setViewId("")}
|
||||
/>
|
||||
</>
|
||||
|
|
|
|||
|
|
@ -177,6 +177,7 @@ function FilingFormPage(props) {
|
|||
return {
|
||||
...item,
|
||||
personName: item.userName,
|
||||
sourcePersonnelId: item.id,
|
||||
};
|
||||
});
|
||||
delete params.personnelList;
|
||||
|
|
|
|||
|
|
@ -283,9 +283,7 @@ function RegisteredOrgDetailPage(props) {
|
|||
<StaffViewModal
|
||||
open={!!viewPersonnelId}
|
||||
currentId={viewPersonnelId}
|
||||
requestDetails={fetchRegisteredOrgPersonnelDetail}
|
||||
requestCertList={fetchRegisteredOrgPersonnelCertList}
|
||||
requestCertDetails={fetchRegisteredOrgPersonnelCertDetail}
|
||||
|
||||
onCancel={() => setViewPersonnelId("")}
|
||||
/>
|
||||
)}
|
||||
|
|
|
|||
|
|
@ -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;
|
||||
}
|
||||
|
|
|
|||
Loading…
Reference in New Issue