diff --git a/src/pages/Container/SafetyEvalBusiness/ProjectFlow/ControlContent.js b/src/pages/Container/SafetyEvalBusiness/ProjectFlow/ControlContent.js index 60f3dfe..37c7e80 100644 --- a/src/pages/Container/SafetyEvalBusiness/ProjectFlow/ControlContent.js +++ b/src/pages/Container/SafetyEvalBusiness/ProjectFlow/ControlContent.js @@ -75,8 +75,8 @@ const ControlContent = ({ readOnly, ...props }) => { setRows(next); }; - const isDispatched = - processControl?.reviewerSignatureTaskStatus !== "non_dispatched"; + const isDispatched = processControl?.reviewerSignatureTaskStatus !== "completed"; + const isOrgHeadSignature = processControl?.orgHeadSignatureTaskStatus !== "completed"; // 过程控制签字提交(confirm) const handleConfirm = async (resultCode) => { @@ -330,7 +330,7 @@ const ControlContent = ({ readOnly, ...props }) => { size="small" allowClear style={{ width: 180 }} - disabled={isDispatched || readOnly} + disabled={isDispatched || isOrgHeadSignature || readOnly} value={selectPeople?.value} onChange={(value, option) => { setSelectPeople(option); @@ -346,9 +346,9 @@ const ControlContent = ({ readOnly, ...props }) => { loading={ props.safetyEvalBusiness?.processControlAssignLoading } - disabled={isDispatched || !selectPeople?.value || readOnly} + disabled={isDispatched || isOrgHeadSignature || !selectPeople?.value || readOnly} > - {isDispatched ? "已下发APP签字" : "下发APP签字"} + {isDispatched ? "过程控制审核暂未完成" : isOrgHeadSignature ? "已下发APP签字" : "下发APP签字"} diff --git a/src/pages/Container/SafetyEvalBusiness/ProjectFlow/SurveyContent.js b/src/pages/Container/SafetyEvalBusiness/ProjectFlow/SurveyContent.js index 8ce2433..64bbcae 100644 --- a/src/pages/Container/SafetyEvalBusiness/ProjectFlow/SurveyContent.js +++ b/src/pages/Container/SafetyEvalBusiness/ProjectFlow/SurveyContent.js @@ -289,6 +289,7 @@ const SurveyContent = ({ readOnly, ...props }) => { message.warning("文件上传中,请稍后再保存"); return; } + if(!validateSurveyStep()) return; const payload = []; for (const s of STAGES) { const fileList = values[s.key] || [];