diff --git a/src/pages/Container/Supervision/BasicInfo/EvaluatorInfo/index.js b/src/pages/Container/Supervision/BasicInfo/EvaluatorInfo/index.js index c79570c..909f0e8 100644 --- a/src/pages/Container/Supervision/BasicInfo/EvaluatorInfo/index.js +++ b/src/pages/Container/Supervision/BasicInfo/EvaluatorInfo/index.js @@ -1,5 +1,5 @@ import { Connect } from "@cqsjjb/jjb-dva-runtime"; -import { Button, Form, Table, Tag } from "antd"; +import { Button, Form, Space, Table, Tag } from "antd"; import { AntdTableFuncControl } from "@cqsjjb/jjb-common-decorator/antd"; import { useEffect, useState } from "react"; import ControlWrapper from "@cqsjjb/jjb-react-admin-component/ControlWrapper"; @@ -7,7 +7,11 @@ import PageLayout from "@cqsjjb/jjb-react-admin-component/PageLayout"; import SearchForm from "~/components/SearchForm"; import StaffResumeModal from "~/components/StaffResumeModal"; import { NS_ORG_INFO, NS_STAFF_INFO } from "~/enumerate/namespace"; -import { REGISTER_ENGINEER_OPTIONS } from "~/enumerate/enterpriseOptions"; +import { + REGISTER_ENGINEER_OPTIONS, + TITLE_LEVEL_MAP, +} from "~/enumerate/enterpriseOptions"; +import { CERT_LEVEL_LABEL_BY_TYPE } from "~/enumerate/constant"; const EMPLOYMENT_STATUS_OPTIONS = [ { label: "在职", value: 1 }, @@ -16,6 +20,7 @@ const EMPLOYMENT_STATUS_OPTIONS = [ const REGISTER_ENGINEER_MAP = { 1: "是", 2: "否" }; const PERSONNEL_STATUS_MAP = { 1: "正常", 2: "异常" }; +const evalCertLevelMap = CERT_LEVEL_LABEL_BY_TYPE.evaluator; function EvaluatorInfoPage(props) { const [searchForm] = Form.useForm(); @@ -144,7 +149,31 @@ function EvaluatorInfoPage(props) { width: 160, render: (val) => REGISTER_ENGINEER_MAP[val] || "-", }, - { title: "资格证书", dataIndex: "certNames", ellipsis: true }, + { + title: "证照名称", + dataIndex: "personnelCertFilingPageCOList", + width: 280, + render: (_, record) => { + const arr = []; + if (record.registeredSafetyEngineerCert) { + arr.push( + + {TITLE_LEVEL_MAP[record.registeredSafetyEngineerCert.certLevel]} + 注册安全工程师 + , + ); + } + if (record.evaluatorCert) { + arr.push( + + {evalCertLevelMap[record.evaluatorCert.certLevel]} + 注册安全评价师 + , + ); + } + return arr.length ? {arr} : "-"; + }, + }, { title: "状态", dataIndex: "personnelStatus",