diff --git a/src/pages/Container/EnterpriseInfo/PersonnelInfo/Certificate/index.js b/src/pages/Container/EnterpriseInfo/PersonnelInfo/Certificate/index.js index 122bbcc..ba8985d 100644 --- a/src/pages/Container/EnterpriseInfo/PersonnelInfo/Certificate/index.js +++ b/src/pages/Container/EnterpriseInfo/PersonnelInfo/Certificate/index.js @@ -62,12 +62,13 @@ function StaffCertificatePage(props) { return ( { setCurrentId(""); setAddModalOpen(true); }}>新增证书 } > - { - const base = window.location.pathname.replace(/\/List.*$/, ""); - window.location.href = `${base}/Certificate?staffId=${id}&staffName=${encodeURIComponent(staffName || "")}`; + + + props.history.push(`Certificate?staffId=${id}&staffName=${encodeURIComponent(staffName || "")}`); }; const onDelete = (id) => { diff --git a/src/pages/Container/QualApplication/filingVerify.js b/src/pages/Container/QualApplication/filingVerify.js index 1cd5ff8..b595da7 100644 --- a/src/pages/Container/QualApplication/filingVerify.js +++ b/src/pages/Container/QualApplication/filingVerify.js @@ -95,16 +95,15 @@ export function verifyFilingPrerequisites(detail = {}) { passed: SKIP_PERSONNEL_VERIFY || keyOk, }); - const mgmtUploaded = detail.materials.every((m) => m.attachmentUrl); + const mgmtUploaded = + SKIP_PERSONNEL_VERIFY || detail.materials.every((m) => m.attachmentUrl); - if (SKIP_PERSONNEL_VERIFY) { - items.push({ - key: "mgmtSystem", - label: "管理体系", - desc: mgmtUploaded ? "管理体系文件已上传" : "尚未上传管理体系文件", - passed: mgmtUploaded, - }); - } + items.push({ + key: "mgmtSystem", + label: "管理体系", + desc: mgmtUploaded ? "管理体系文件已上传" : "尚未上传管理体系文件", + passed: mgmtUploaded, + }); return { passed: items.every((item) => item.passed),