diff --git a/jjb.config.js b/jjb.config.js index b0e9e8b..8c58ad4 100644 --- a/jjb.config.js +++ b/jjb.config.js @@ -10,7 +10,7 @@ module.exports = { javaGitBranch: "dev", // 本地联调 safetyEval-service(context-path: /safetyEval,默认端口 8095) // 可通过环境变量覆盖: SAFETY_EVAL_API_HOST=http://192.168.x.x:8095 - API_HOST: "http://192.168.0.149", + API_HOST: "http://192.168.0.152", }, production: { // 应用后端分支名称,部署上线需要 diff --git a/src/pages/Container/EnterpriseInfo/PersonnelInfo/StaffViewModal.js b/src/components/StaffViewModal/index.js similarity index 91% rename from src/pages/Container/EnterpriseInfo/PersonnelInfo/StaffViewModal.js rename to src/components/StaffViewModal/index.js index 96afd47..75034b0 100644 --- a/src/pages/Container/EnterpriseInfo/PersonnelInfo/StaffViewModal.js +++ b/src/components/StaffViewModal/index.js @@ -120,7 +120,7 @@ export default function StaffViewModal({ onCancel={onCancel} > - { info.titleName} + {info.titleName} {GENDER_MAP[info.genderCode]} @@ -183,17 +183,23 @@ export default function StaffViewModal({ {proofMaterialUrl.length ? proofMaterialUrl.map((item) => { - const isImage = /\.(jpg|jpeg|png|gif|webp|bmp|svg)(\?.*)?$/i.test(item.url); + const isImage = + /\.(jpg|jpeg|png|gif|webp|bmp|svg)(\?.*)?$/i.test(item.url); return (
{isImage ? ( ) : ( - )} @@ -284,7 +290,7 @@ export default function StaffViewModal({ {certPreviewInfo.certNo} - {certPreviewInfo.certCategory || "-"} + {certPreviewInfo.certTypeName || "-"} {certPreviewInfo.issueOrg || "-"} @@ -295,11 +301,17 @@ export default function StaffViewModal({ {certPreviewInfo.validEndDate || "-"} + + {certPreviewInfo.certAttachmentUrl && + certPreviewInfo.certAttachmentUrl.split(",").map((item) => ( + + ))} + -
)} diff --git a/src/pages/Container/EnterpriseInfo/PersonnelInfo/List/index.js b/src/pages/Container/EnterpriseInfo/PersonnelInfo/List/index.js index e792777..38c2482 100644 --- a/src/pages/Container/EnterpriseInfo/PersonnelInfo/List/index.js +++ b/src/pages/Container/EnterpriseInfo/PersonnelInfo/List/index.js @@ -32,7 +32,7 @@ import { import { getBirthDateFromIdCard } from "~/utils"; import { idCardRule, mobileRule } from "~/utils/validators"; import AttachmentUpload from "~/components/AttachmentUpload"; -import StaffViewModal from "../StaffViewModal"; +import StaffViewModal from "~/components/StaffViewModal"; const { router } = tools; diff --git a/src/pages/Container/QualApplication/FilingForm/components/OrgPersonnelSelectModal.jsx b/src/pages/Container/QualApplication/FilingForm/components/OrgPersonnelSelectModal.jsx index 0f659a5..28779c7 100644 --- a/src/pages/Container/QualApplication/FilingForm/components/OrgPersonnelSelectModal.jsx +++ b/src/pages/Container/QualApplication/FilingForm/components/OrgPersonnelSelectModal.jsx @@ -2,7 +2,7 @@ import { Connect } from "@cqsjjb/jjb-dva-runtime"; import { Button, Form, Input, Modal, Table } from "antd"; import { useEffect, useState } from "react"; import { NS_STAFF_INFO } from "~/enumerate/namespace"; -import StaffViewModal from "~/pages/Container/EnterpriseInfo/PersonnelInfo/StaffViewModal"; +import StaffViewModal from "~/components/StaffViewModal"; function OrgPersonnelSelectModalInner(props) { const { open, onCancel, onConfirm, existingIds = [] } = props; diff --git a/src/pages/Container/QualApplication/FilingForm/components/PersonnelStep.jsx b/src/pages/Container/QualApplication/FilingForm/components/PersonnelStep.jsx index a76a819..0a6f0eb 100644 --- a/src/pages/Container/QualApplication/FilingForm/components/PersonnelStep.jsx +++ b/src/pages/Container/QualApplication/FilingForm/components/PersonnelStep.jsx @@ -1,6 +1,6 @@ import { Button, Modal, Space, Table } from "antd"; import { useState } from "react"; -import StaffViewModal from "~/pages/Container/EnterpriseInfo/PersonnelInfo/StaffViewModal"; +import StaffViewModal from "~/components/StaffViewModal"; import OrgPersonnelSelectModal from "./OrgPersonnelSelectModal"; diff --git a/src/pages/Container/QualificationReview/FilingTabs/index.js b/src/pages/Container/QualificationReview/FilingTabs/index.js index 2765f0f..f55cb87 100644 --- a/src/pages/Container/QualificationReview/FilingTabs/index.js +++ b/src/pages/Container/QualificationReview/FilingTabs/index.js @@ -2,7 +2,7 @@ import React, { useState, useEffect } from "react"; import { Button, Descriptions, Table, Tag, Tabs, Select, Modal, Space, Image } from "antd"; import { Connect } from "@cqsjjb/jjb-dva-runtime"; import { NS_QUAL_REVIEW } from "~/enumerate/namespace"; -import StaffViewModal from "~/pages/Container/EnterpriseInfo/PersonnelInfo/StaffViewModal"; +import StaffViewModal from "~/components/StaffViewModal"; import PreviewUrlButton from "~/components/PreviewUrlButton/index"; diff --git a/src/pages/Container/Supervision/BasicInfo/RegisteredOrg/Detail/index.js b/src/pages/Container/Supervision/BasicInfo/RegisteredOrg/Detail/index.js index 9a097d3..da52621 100644 --- a/src/pages/Container/Supervision/BasicInfo/RegisteredOrg/Detail/index.js +++ b/src/pages/Container/Supervision/BasicInfo/RegisteredOrg/Detail/index.js @@ -12,7 +12,7 @@ import { fetchRegisteredOrgQualificationGroups, } from "~/utils/regulatorOrgInfo"; import { buildOrgInfoFormOptions } from "../../../../EnterpriseInfo/OrgInfo/formOptions"; -import StaffViewModal from "../../../../EnterpriseInfo/PersonnelInfo/StaffViewModal"; +import StaffViewModal from "~/components/StaffViewModal"; const LIST_PATH = "/container/supervision/basicInfo/registeredOrg/list"; const ORG_INFO_FORM_OPTIONS = buildOrgInfoFormOptions();