diff --git a/src/pages/Container/EnterpriseInfo/ResignationApply/index.js b/src/pages/Container/EnterpriseInfo/ResignationApply/index.js index 16f5106..8d61f35 100644 --- a/src/pages/Container/EnterpriseInfo/ResignationApply/index.js +++ b/src/pages/Container/EnterpriseInfo/ResignationApply/index.js @@ -220,12 +220,7 @@ function AddModal({ open, staffOptions, requestAdd, onCancel, onSuccess }) { const handleSubmit = async () => { try { const values = await form.validateFields(); - if (!values.reportFileUrl?.length) { - form.setFields([ - { name: "reportFileUrl", errors: ["请上传离职通知报告"] }, - ]); - return; - } + setSubmitting(true); values.applyTime = values.applyTime?.format?.("YYYY-MM-DD HH:mm:ss") || values.applyTime; @@ -233,13 +228,17 @@ function AddModal({ open, staffOptions, requestAdd, onCancel, onSuccess }) { values.expectedResignDate = values.expectedResignDate?.format?.("YYYY-MM-DD") || values.expectedResignDate; - values.reportFileUrl = values.reportFileUrl?.map?.((f) => f.url).filter(Boolean).join(",") || undefined; + values.reportFileUrl = + values.reportFileUrl + ?.map?.((f) => f.url) + .filter(Boolean) + .join(",") || undefined; const res = await requestAdd(values); if (res?.success !== false) { message.success("提交成功"); handleCancel(); onSuccess(); - } + } } catch { // validation error } finally { @@ -289,15 +288,16 @@ function AddModal({ open, staffOptions, requestAdd, onCancel, onSuccess }) { label="离职原因" rules={[{ required: true, message: "请输入离职原因" }]} > - + - + @@ -354,13 +354,22 @@ function ViewModal({ open, currentId, requestDetail, onCancel }) { {info.remark} {info.reportFileUrl ? ( - + 查看文件 ) : ( "-" )} + {info.rejectReason && ( + + {info.rejectReason} + + )} ); diff --git a/src/pages/Container/QualApplication/FilingForm/index.js b/src/pages/Container/QualApplication/FilingForm/index.js index dfb8b14..5366c3b 100644 --- a/src/pages/Container/QualApplication/FilingForm/index.js +++ b/src/pages/Container/QualApplication/FilingForm/index.js @@ -89,7 +89,10 @@ function FilingFormPage(props) { }); }); } else { - setDetail((prev) => ({ ...prev, materials: getFilingMaterialTemplate(mode) })); + setDetail((prev) => ({ + ...prev, + materials: getFilingMaterialTemplate(mode), + })); } }, []); @@ -141,7 +144,7 @@ function FilingFormPage(props) { return; } const currentDetail = collectCurrentDetail(); - if(!currentDetail?.commitment.legalRepSignatureUrl){ + if (!currentDetail?.commitment.legalRepSignatureUrl) { message.warning("法定代表人尚未签字"); return; } @@ -221,10 +224,9 @@ function FilingFormPage(props) { message.success("已推送签字"); } else { message.success(config.isSaveDraft ? "暂存成功" : "提交成功"); - if(!config.isSaveDraft){ + if (!config.isSaveDraft) { props.history.goBack(); } - } } } @@ -359,7 +361,10 @@ function FilingFormPage(props) { label: "2. 管理人员基本情况汇总表", children: ( item.technicalDirectorFlag || item.processControlLeaderFlag)} + personnelList={(detail?.personnelList || []).filter( + (item) => + item.technicalDirectorFlag || item.processControlLeaderFlag, + )} disabled={readOnly} onAdd={handlePersonnelAdd} key="managementPersonnel" @@ -373,7 +378,10 @@ function FilingFormPage(props) { label: "3. 专职安全评价师基本情况汇总表", children: ( !item.technicalDirectorFlag && !item.processControlLeaderFlag)} + personnelList={(detail?.personnelList || []).filter( + (item) => + !item.technicalDirectorFlag && !item.processControlLeaderFlag, + )} disabled={readOnly} onAdd={handlePersonnelAdd} key="personnel" @@ -421,8 +429,6 @@ function FilingFormPage(props) { ), forceRender: true, }, - - ]; const stepIndex = STEP_ITEMS.findIndex((item) => item.key === activeStep); @@ -444,15 +450,8 @@ function FilingFormPage(props) { ) : null } - > - - - - + footer={ + {stepIndex > 0 && (