diff --git a/src/pages/Container/SafetyEvalBusiness/EvalProject/Create/index.js b/src/pages/Container/SafetyEvalBusiness/EvalProject/Create/index.js index f255cff..8c19e54 100644 --- a/src/pages/Container/SafetyEvalBusiness/EvalProject/Create/index.js +++ b/src/pages/Container/SafetyEvalBusiness/EvalProject/Create/index.js @@ -318,7 +318,7 @@ const EvalProjectCreate = (props) => { diff --git a/src/pages/Container/SafetyEvalBusiness/ProjectFlow/SurveyContent.js b/src/pages/Container/SafetyEvalBusiness/ProjectFlow/SurveyContent.js index 5a0c6b1..8ce2433 100644 --- a/src/pages/Container/SafetyEvalBusiness/ProjectFlow/SurveyContent.js +++ b/src/pages/Container/SafetyEvalBusiness/ProjectFlow/SurveyContent.js @@ -135,10 +135,10 @@ const InspectionPanel = ({ dataSource = [], evalProjectDetailData = {}, readOnly name="SITE_INSPECTION_FORM" label="现场检查表" maxCount={10} - accept=".pdf,.doc,.docx,.xls,.xlsx" + accept=".pdf,.doc,.docx,.xls,.xlsx,.png,.jpg,.jpeg" disabled={readOnly} extra="检查表应包含项目名称、检查日期、检查人员、检查依据、逐项检查结果和不符合项记录;上传后与人员打卡记录共同作为现场踏勘凭证。 - 支持Excel、Word、PDF和清晰扫描件" + 支持 PDF、Word、Excel、PNG、JPG 格式,最多上传 10 个文件" /> ); @@ -157,9 +157,9 @@ const RectificationNoticePanel = ({ readOnly }) => ( name="RECTIFICATION_NOTICE" label="整改通知单" maxCount={10} - accept=".pdf,.doc,.docx,.jpg,.jpeg,.png,.xls,.xlsx" + accept=".pdf,.doc,.docx,.xls,.xlsx,.png,.jpg,.jpeg" disabled={readOnly} - extra="支持 PDF、Word、JPG、PNG、Excel 格式,最多上传 10 个文件" + extra="支持 PDF、Word、Excel、PNG、JPG 格式,最多上传 10 个文件" /> ); @@ -177,9 +177,9 @@ const EnterpriseRectificationPanel = ({ readOnly }) => ( name="ENTERPRISE_RECTIFICATION" label="企业整改报告" maxCount={10} - accept=".pdf,.doc,.docx,.jpg,.jpeg,.png,.zip,.rar,.7z" + accept=".pdf,.doc,.docx,.xls,.xlsx,.png,.jpg,.jpeg" disabled={readOnly} - extra="支持 PDF、Word、压缩包、图片格式,最多上传 10 个文件" + extra="支持 PDF、Word、Excel、PNG、JPG 格式,最多上传 10 个文件" /> ); @@ -197,9 +197,9 @@ const RectificationReviewPanel = ({ readOnly }) => ( name="RECTIFICATION_REVIEW" label="整改情况复查单" maxCount={10} - accept=".pdf,.doc,.docx,.jpg,.jpeg,.png,.xls,.xlsx" + accept=".pdf,.doc,.docx,.xls,.xlsx,.png,.jpg,.jpeg" disabled={readOnly} - extra="支持 PDF、Word、JPG、PNG、Excel 格式,最多上传 10 个文件" + extra="支持 PDF、Word、Excel、PNG、JPG 格式,最多上传 10 个文件" /> ); @@ -253,12 +253,29 @@ const SurveyContent = ({ readOnly, ...props }) => { } }, [projectId]); + const validateSurveyStep = () => { + if (surveyPersonnel.length < 2) { + message.warning("您的打卡信息未完善,请前往现场在APP中进行定位打卡"); + return false; + } + const hasProjectLead = surveyPersonnel.some((p) => + Array.isArray(p.role) ? p.role.includes("PROJECT_LEAD") : p.role === "PROJECT_LEAD" + ); + if (!hasProjectLead) { + message.warning("您的打卡信息未完善,请前往现场在APP中进行定位打卡"); + return false; + } + return true; + }; + const goPrev = () => { if (currentIdx > 0) setActiveStage(STAGES[currentIdx - 1].key); }; const goNext = () => { - if (currentIdx < STAGES.length - 1) setActiveStage(STAGES[currentIdx + 1].key); + if (currentIdx === STAGES.length - 1) return; + if (activeStage === "SITE_INSPECTION_FORM" && !validateSurveyStep()) return; + setActiveStage(STAGES[currentIdx + 1].key); }; const handleSave = async () => {