From d0396a0b013fc122021449157b9a5376fa757f17 Mon Sep 17 00:00:00 2001 From: tangjie <122778500@qq.com> Date: Tue, 7 Jul 2026 16:57:40 +0800 Subject: [PATCH] feat --- .../EnterpriseInfo/PersonnelChange/index.js | 12 +++-- .../QualApplication/FiledManage/List/index.js | 2 +- .../FilingForm/components/PersonnelStep.jsx | 2 +- .../Container/QualApplication/filingVerify.js | 53 +++++++++++-------- 4 files changed, 41 insertions(+), 28 deletions(-) diff --git a/src/pages/Container/EnterpriseInfo/PersonnelChange/index.js b/src/pages/Container/EnterpriseInfo/PersonnelChange/index.js index 72376ec..11dc383 100644 --- a/src/pages/Container/EnterpriseInfo/PersonnelChange/index.js +++ b/src/pages/Container/EnterpriseInfo/PersonnelChange/index.js @@ -54,16 +54,18 @@ function PersonnelChangePage(props) { }, []); const handleLogSearch = () => { - if (selectedStaff?.staffId) { - props.staffChangeLogList({ eqStaffId: selectedStaff.staffId }); + if (selectedStaff?.id) { + props.staffChangeLogList({ personnelId: selectedStaff.id }); } }; useEffect(() => { - if (viewMode === "log" && selectedStaff?.staffId) { + + if (viewMode === "log" && selectedStaff?.id) { + handleLogSearch(); } - }, [viewMode, selectedStaff?.staffId]); + }, [viewMode, selectedStaff?.id]); const onDelete = (record) => { Modal.confirm({ @@ -210,7 +212,7 @@ function PersonnelChangePage(props) { const logColumns = [ { title: "变更事项", dataIndex: "changeItem", width: 200 }, { title: "变更时间", dataIndex: "changeTime", width: 160 }, - { title: "操作人", dataIndex: "createBy", width: 100 }, + { title: "操作人", dataIndex: "operatorName", width: 100 }, ]; if (viewMode === "log") { diff --git a/src/pages/Container/QualApplication/FiledManage/List/index.js b/src/pages/Container/QualApplication/FiledManage/List/index.js index 8859cae..fe71833 100644 --- a/src/pages/Container/QualApplication/FiledManage/List/index.js +++ b/src/pages/Container/QualApplication/FiledManage/List/index.js @@ -24,7 +24,7 @@ function FiledManageListPage(props) { ...router.query, current: pagination?.current || router.query.current || 1, size: pagination?.size || router.query.size || 10, - applyTypeCode: 2, + applyTypeCode: 3, }; const res = await props.qualFilingPage(params); if (res?.success !== false) { diff --git a/src/pages/Container/QualApplication/FilingForm/components/PersonnelStep.jsx b/src/pages/Container/QualApplication/FilingForm/components/PersonnelStep.jsx index 5e86751..57eb3f0 100644 --- a/src/pages/Container/QualApplication/FilingForm/components/PersonnelStep.jsx +++ b/src/pages/Container/QualApplication/FilingForm/components/PersonnelStep.jsx @@ -13,7 +13,7 @@ export default function PersonnelStep({ const [selectOpen, setSelectOpen] = useState(false); const [viewId, setViewId] = useState(""); - const existingIds = personnelList.map((item) => String(item.sourcePersonnelId || "")); + const existingIds = personnelList.map((item) => String(item.id || "")); console.log(personnelList); return ( diff --git a/src/pages/Container/QualApplication/filingVerify.js b/src/pages/Container/QualApplication/filingVerify.js index 5d7c262..1cd5ff8 100644 --- a/src/pages/Container/QualApplication/filingVerify.js +++ b/src/pages/Container/QualApplication/filingVerify.js @@ -47,19 +47,23 @@ export function verifyFilingPrerequisites(detail = {}) { const personnel = detail.personnelList || []; const total = personnel.length; const regEngineerCount = personnel.filter(isRegisterEngineer).length; - const midTitleCount = personnel.filter((p) => includesMidTitle(p.titleName)).length; - const seniorTitleCount = personnel.filter((p) => includesSeniorTitle(p.titleName)).length; + const midTitleCount = personnel.filter((p) => + includesMidTitle(p.titleName), + ).length; + const seniorTitleCount = personnel.filter((p) => + includesSeniorTitle(p.titleName), + ).length; items.push({ key: "personnelStructure", label: "人员数量与结构", desc: "专职技术人员≥25人，中级注安师≥30%，中级职称≥50%，高级职称≥30%", - passed: SKIP_PERSONNEL_VERIFY || ( - total >= 25 - && ratio(regEngineerCount, total) >= 0.3 - && ratio(midTitleCount, total) >= 0.5 - && ratio(seniorTitleCount, total) >= 0.3 - ), + passed: + SKIP_PERSONNEL_VERIFY || + (total >= 25 && + ratio(regEngineerCount, total) >= 0.3 && + ratio(midTitleCount, total) >= 0.5 && + ratio(seniorTitleCount, total) >= 0.3), }); const withExperience = personnel.filter((p) => { @@ -71,12 +75,18 @@ export function verifyFilingPrerequisites(detail = {}) { key: "personnelExp", label: "人员资历", desc: "专职技术人员在本行业领域工作二年以上", - passed: SKIP_PERSONNEL_VERIFY || (total >= 25 && ratio(withExperience, total) >= 0.8), + passed: + SKIP_PERSONNEL_VERIFY || + (total >= 25 && ratio(withExperience, total) >= 0.8), }); - const keyOk = KEY_POSITIONS.every((pos) => personnel.some( - (p) => String(p.positionName || "").includes(pos) && includesSeniorTitle(p.titleName), - )); + const keyOk = KEY_POSITIONS.every((pos) => + personnel.some( + (p) => + String(p.positionName || "").includes(pos) && + includesSeniorTitle(p.titleName), + ), + ); items.push({ key: "keyPosition", @@ -84,16 +94,17 @@ export function verifyFilingPrerequisites(detail = {}) { desc: "负责人、技术负责人、质量负责人具有高级职称，工作八年以上", passed: SKIP_PERSONNEL_VERIFY || keyOk, }); - - - // const mgmtUploaded=detail.materials.every((m) => m.attachmentUrl); - // items.push({ - // key: "mgmtSystem", - // label: "管理体系", - // desc: mgmtUploaded? "管理体系文件已上传" : "尚未上传管理体系文件", - // passed: mgmtUploaded, - // }); + const mgmtUploaded = detail.materials.every((m) => m.attachmentUrl); + + if (SKIP_PERSONNEL_VERIFY) { + items.push({ + key: "mgmtSystem", + label: "管理体系", + desc: mgmtUploaded ? "管理体系文件已上传" : "尚未上传管理体系文件", + passed: mgmtUploaded, + }); + } return { passed: items.every((item) => item.passed),