From 87f597ff61daa63920a57bfe30c5be866dba0406 Mon Sep 17 00:00:00 2001 From: tangjie <122778500@qq.com> Date: Mon, 10 Aug 2026 09:45:05 +0800 Subject: [PATCH] feat --- src/components/StaffViewModal/index.js | 16 +++++++++++--- .../PersonnelInfo/List/index.js | 22 +++++++++++++++---- .../FilingForm/components/PersonnelStep.jsx | 9 +++++--- .../QualApplication/FilingForm/index.js | 4 ++-- 4 files changed, 39 insertions(+), 12 deletions(-) diff --git a/src/components/StaffViewModal/index.js b/src/components/StaffViewModal/index.js index b6e51a6..c1bbc46 100644 --- a/src/components/StaffViewModal/index.js +++ b/src/components/StaffViewModal/index.js @@ -3,7 +3,6 @@ import { useEffect, useRef, useState } from "react"; import { fetchOrgPersonnelDetail } from "~/utils/qualFiling/personnelHelper"; import { REGISTER_ENGINEER_CATEGORY_MAP, - PERSONNEL_POST_TYPE_MAP, ABILITY_SOURCE_MAP, TITLE_LEVEL_MAP, } from "~/enumerate/enterpriseOptions"; @@ -170,8 +169,19 @@ export default function StaffViewModal({ {info.basicDisciplineMajorName || "-"} - - {PERSONNEL_POST_TYPE_MAP[info.personnelPositionType] || "-"} + + {info.technicalDirectorFlag === true + ? "是" + : info.technicalDirectorFlag === false + ? "否" + : "-"} + + + {info.processControlLeaderFlag === true + ? "是" + : info.processControlLeaderFlag === false + ? "否" + : "-"} {info.workExperience || "-"} diff --git a/src/pages/Container/EnterpriseInfo/PersonnelInfo/List/index.js b/src/pages/Container/EnterpriseInfo/PersonnelInfo/List/index.js index 625a306..b3000ea 100644 --- a/src/pages/Container/EnterpriseInfo/PersonnelInfo/List/index.js +++ b/src/pages/Container/EnterpriseInfo/PersonnelInfo/List/index.js @@ -32,7 +32,6 @@ import { EDUCATION_TYPE_OPTIONS, REGISTER_ENGINEER_OPTIONS, REGISTER_ENGINEER_CATEGORY_OPTIONS, - PERSONNEL_POST_TYPE_OPTIONS, ABILITY_SOURCE_OPTIONS, EVALUATOR_OPTIONS, TITLE_LEVEL_OPTIONS, @@ -831,11 +830,26 @@ function StaffFormModal({ /> - + diff --git a/src/pages/Container/QualApplication/FilingForm/components/PersonnelStep.jsx b/src/pages/Container/QualApplication/FilingForm/components/PersonnelStep.jsx index 8d452df..b7c46ab 100644 --- a/src/pages/Container/QualApplication/FilingForm/components/PersonnelStep.jsx +++ b/src/pages/Container/QualApplication/FilingForm/components/PersonnelStep.jsx @@ -2,7 +2,6 @@ import { Button, Modal, Space, Table } from "antd"; import { useState } from "react"; import { CAPABILITY_MAP, CERT_LEVEL_LABEL_BY_TYPE } from "~/enumerate/constant"; import { - PERSONNEL_POST_TYPE_MAP, TITLE_LEVEL_MAP, } from "~/enumerate/enterpriseOptions"; import StaffViewModal from "~/components/StaffViewModal"; @@ -87,9 +86,13 @@ const PersonnelStep = ({ personnelList = [], disabled, onAdd, onRemove, manageme { title: "姓名", dataIndex: "personName" }, { title: "职务", - dataIndex: "personnelPositionType", width: 120, - render: (v) => PERSONNEL_POST_TYPE_MAP[v] || "-", + render: (_, record) => { + const roles = []; + if (record.technicalDirectorFlag === true) roles.push("技术负责人"); + if (record.processControlLeaderFlag === true) roles.push("过程控制负责人"); + return roles.length ? roles.join("、") : "-"; + }, }, { title: "职称", diff --git a/src/pages/Container/QualApplication/FilingForm/index.js b/src/pages/Container/QualApplication/FilingForm/index.js index 233ecd3..1a4b75d 100644 --- a/src/pages/Container/QualApplication/FilingForm/index.js +++ b/src/pages/Container/QualApplication/FilingForm/index.js @@ -356,7 +356,7 @@ function FilingFormPage(props) { label: "2. 管理人员基本情况汇总表", children: ( !!item.personnelPositionType)} + personnelList={(detail?.personnelList || []).filter((item) => item.technicalDirectorFlag || item.processControlLeaderFlag)} disabled={readOnly} onAdd={handlePersonnelAdd} onRemove={handlePersonnelRemove} @@ -369,7 +369,7 @@ function FilingFormPage(props) { label: "3. 专职安全评价师基本情况汇总表", children: ( !item.personnelPositionType)} + personnelList={(detail?.personnelList || []).filter((item) => !item.technicalDirectorFlag && !item.processControlLeaderFlag)} disabled={readOnly} onAdd={handlePersonnelAdd} onRemove={handlePersonnelRemove}