Merge remote-tracking branch 'origin/dev' into dev

src/pages/Container/EnterpriseInfo/PersonnelInfo/Certificate/index.js

@@ -59,21 +59,29 @@ function StaffCertificatePage(props) {
   };
 
   return (
-    <PageLayout title={`人员证书 - ${staffName || ""}`}>
+    <PageLayout
+      title={`人员证书 - ${staffName || ""}`}
+      extra={
+        <Button type="primary" onClick={() => { setCurrentId(""); setAddModalOpen(true); }}>新增证书</Button>
+      }
+    >
       <Button style={{ marginBottom: 16 }} onClick={goBack}>返回</Button>
       <SearchForm
         style={{ marginBottom: 24 }}
         form={searchForm}
         loading={loading}
         formLine={[
+          <Form.Item key="certName" name="certName">
+            <ControlWrapper.Input label="证照名称" placeholder="请输入证照名称" allowClear />
+          </Form.Item>,
           <Form.Item key="certNo" name="certNo">
             <ControlWrapper.Input label="证书编号" placeholder="请输入证书编号" allowClear />
           </Form.Item>,
-          <Form.Item key="certCategory" name="certCategory">
+          <Form.Item key="certCategoryName" name="certCategoryName">
-            <ControlWrapper.Input label="证书类别" placeholder="请输入证书类别" allowClear />
+            <ControlWrapper.Input label="证书类别名称" placeholder="请输入证书类别名称" allowClear />
           </Form.Item>,
-          <Form.Item key="certWorkCategory" name="certWorkCategory">
+          <Form.Item key="operationCategoryName" name="operationCategoryName">
-            <ControlWrapper.Input label="证书作业类别" placeholder="请输入证书作业类别" allowClear />
+            <ControlWrapper.Input label="证书作业类别名称" placeholder="请输入证书作业类别名称" allowClear />
           </Form.Item>,
         ]}
         onReset={() => {
@@ -88,8 +96,10 @@ function StaffCertificatePage(props) {
       <Table
         rowKey="id"
         columns={[
-          { title: "证书类型", dataIndex: "certCategory" },
+          { title: "证照名称", dataIndex: "certName" },
-          { title: "证书作业类别", dataIndex: "certWorkCategory" },
+          { title: "证书类型", dataIndex: "certTypeName" },
+          { title: "证书类别", dataIndex: "certCategoryName" },
+          { title: "证书作业类别", dataIndex: "operationCategoryName" },
           { title: "证书编号", dataIndex: "certNo" },
           {
             title: "操作",
@@ -259,12 +269,6 @@ function CertModal({
         <Form.Item name="certName" label="证照名称" rules={[{ required: true, message: "请输入证照名称" }]}>
           <Input placeholder="请输入证照名称" />
         </Form.Item>
-        <Form.Item name="certCategory" label="证书类别" rules={[{ required: true, message: "请选择证书类别" }]}>
-          <Input placeholder="请输入证书类别" />
-        </Form.Item>
-        <Form.Item name="certWorkCategory" label="证书作业类别">
-          <Input placeholder="请输入证书作业类别" />
-        </Form.Item>
         <Form.Item name="certNo" label="证书编号" rules={[{ required: true, message: "请输入证书编号" }]}>
           <Input placeholder="请输入证书编号" />
         </Form.Item>
@@ -278,7 +282,25 @@ function CertModal({
         >
           <DatePicker.RangePicker style={{ width: "100%" }} />
         </Form.Item>
-        <Form.Item name="reviewDate" label="复合日期">
+        <Form.Item name="certTypeCode" label="证书类型编码">
+          <Input placeholder="请输入证书类型编码" />
+        </Form.Item>
+        <Form.Item name="certTypeName" label="证书类型名称">
+          <Input placeholder="请输入证书类型名称" />
+        </Form.Item>
+        <Form.Item name="certCategoryCode" label="证书类别编码">
+          <Input placeholder="请输入证书类别编码" />
+        </Form.Item>
+        <Form.Item name="certCategoryName" label="证书类别名称">
+          <Input placeholder="请输入证书类别名称" />
+        </Form.Item>
+        <Form.Item name="operationCategoryCode" label="证书作业类别编码">
+          <Input placeholder="请输入证书作业类别编码" />
+        </Form.Item>
+        <Form.Item name="operationCategoryName" label="证书作业类别名称">
+          <Input placeholder="请输入证书作业类别名称" />
+        </Form.Item>
+        <Form.Item name="reviewDate" label="复核日期">
           <DatePicker style={{ width: "100%" }} />
         </Form.Item>
         <Form.Item
@@ -357,12 +379,17 @@ function ViewModal({ open, currentId, staffCertificateInfo, onCancel }) {
     >
       <Descriptions bordered column={1} labelStyle={{ width: 160 }}>
         <Descriptions.Item label="证照名称">{info.certName}</Descriptions.Item>
-        <Descriptions.Item label="证书类别">{info.certCategory}</Descriptions.Item>
+        <Descriptions.Item label="证书类型编码">{info.certTypeCode}</Descriptions.Item>
+        <Descriptions.Item label="证书类型名称">{info.certTypeName}</Descriptions.Item>
+        <Descriptions.Item label="证书类别编码">{info.certCategoryCode}</Descriptions.Item>
+        <Descriptions.Item label="证书类别名称">{info.certCategoryName}</Descriptions.Item>
+        <Descriptions.Item label="证书作业类别编码">{info.operationCategoryCode}</Descriptions.Item>
+        <Descriptions.Item label="证书作业类别名称">{info.operationCategoryName}</Descriptions.Item>
         <Descriptions.Item label="证书编号">{info.certNo}</Descriptions.Item>
         <Descriptions.Item label="发证机关">{info.issueOrg}</Descriptions.Item>
         <Descriptions.Item label="证书有效开始日期">{info.validStartDate}</Descriptions.Item>
         <Descriptions.Item label="证书有效结束日期">{info.validEndDate}</Descriptions.Item>
-        <Descriptions.Item label="复合日期">{info.reviewDate}</Descriptions.Item>
+        <Descriptions.Item label="复核日期">{info.reviewDate}</Descriptions.Item>
         <Descriptions.Item label="证书图片"><CertPreviewImg files={info.certDisplayFiles} /></Descriptions.Item>
       </Descriptions>
     </Modal>