diff --git a/src/pages/Container/EnterpriseInfo/PersonnelInfo/Certificate/index.js b/src/pages/Container/EnterpriseInfo/PersonnelInfo/Certificate/index.js index e22e261..5829768 100644 --- a/src/pages/Container/EnterpriseInfo/PersonnelInfo/Certificate/index.js +++ b/src/pages/Container/EnterpriseInfo/PersonnelInfo/Certificate/index.js @@ -2,6 +2,7 @@ import { Connect } from "@cqsjjb/jjb-dva-runtime"; import { Button, DatePicker, Descriptions, Form, Input, message, Modal, Select, Table, Upload } from "antd"; import { UploadOutlined } from "@ant-design/icons"; import { useEffect, useState } from "react"; +import dayjs from "dayjs"; import PageLayout from "@cqsjjb/jjb-react-admin-component/PageLayout"; import SearchForm from "@cqsjjb/jjb-react-admin-component/SearchForm"; import ControlWrapper from "@cqsjjb/jjb-react-admin-component/ControlWrapper"; @@ -60,21 +61,29 @@ function StaffCertificatePage(props) { }; return ( - + { setCurrentId(""); setAddModalOpen(true); }}>新增证书 + } + > + + , , - - + + , - - + + , ]} onReset={() => { @@ -89,8 +98,10 @@ function StaffCertificatePage(props) { f.url || f.response?.url).filter(Boolean).join(",") : "", @@ -260,12 +279,6 @@ function CertModal({ - - - - - - @@ -279,7 +292,25 @@ function CertModal({ > - + + + + + + + + + + + + + + + + + + + @@ -340,12 +371,17 @@ function ViewModal({ open, currentId, staffCertificateInfo, onCancel }) { > {info.certName} - {info.certCategory} + {info.certTypeCode} + {info.certTypeName} + {info.certCategoryCode} + {info.certCategoryName} + {info.operationCategoryCode} + {info.operationCategoryName} {info.certNo} {info.issueOrg} {info.validStartDate} {info.validEndDate} - {info.reviewDate} + {info.reviewDate}