diff --git a/src/pages/Evaluation/BidPreliminary/BidPreliminaryManager/components/PreliminarySummary.tsx b/src/pages/Evaluation/BidPreliminary/BidPreliminaryManager/components/PreliminarySummary.tsx index b098eea..ad02f35 100644 --- a/src/pages/Evaluation/BidPreliminary/BidPreliminaryManager/components/PreliminarySummary.tsx +++ b/src/pages/Evaluation/BidPreliminary/BidPreliminaryManager/components/PreliminarySummary.tsx @@ -36,6 +36,8 @@ const PreliminarySummary: React.FC = (props) => { const [processValue, setProcessValue] = useState(); //是否公开比选一阶段二次项目 const [isBxOneSecond, setIsBxOneSecond] = useState(false); + //合格供应商数量 + const [qualifyNumber, setQualifyNumber] = useState(3); //每页显示数量常量 const pageSize = 3; const { TextArea } = Input; @@ -238,11 +240,11 @@ const PreliminarySummary: React.FC = (props) => { if (response?.code == 200) { if (response?.data == undefined || response?.data?.id == null) { } else { setIsShowFoot(true) + setIsBxOneSecond(response?.data?.bxOneSecondProjectStatus); setRadioValue(response.data?.continueStatus) if (response.data?.continueStatus == 1) { setFileId(response.data?.fileId) setProcessValue(response?.data?.customizeFlowStatus); - setIsBxOneSecond(response?.data?.bxOneSecondProjectStatus); form.setFieldsValue({ remarks: response.data?.remarks }) @@ -279,6 +281,15 @@ const PreliminarySummary: React.FC = (props) => { supplierRegisterIds: pagingSupplier.map((e: any) => e.supplierRegisterId), }).then((response) => { if (response?.code == 200) { + let count = 0; + totalSupplier.forEach((ele: any) => { + if ( + response?.data[response?.data.length - 1].detailList[0].earlyMap[ele.supplierRegisterId].judgesResult == true + ) { + count = count + 1; + } + }); + setQualifyNumber(count); //调用数据处理方法并初始化表格 InitializeTable(pagingSupplier, response?.data); getFooterData() @@ -293,7 +304,7 @@ const PreliminarySummary: React.FC = (props) => { {isShowFoot ? (
- {(isBxOneSecond && isNotEmpty(processValue)) ? '合格供应商仅一家,是否继续进行' : '合格供应商不足三家,是否继续进行详审'}: + {qualifyNumber == 1 && isBxOneSecond ? '合格供应商仅一家,是否继续进行' : '合格供应商不足三家,是否继续进行详审'}: 是,继续进行 否,终止评审 diff --git a/src/pages/Evaluation/BidPreliminary/BidPreliminaryReviewLeader/components/BidPreliminarySummary.tsx b/src/pages/Evaluation/BidPreliminary/BidPreliminaryReviewLeader/components/BidPreliminarySummary.tsx index 2a8db9c..abf13f6 100644 --- a/src/pages/Evaluation/BidPreliminary/BidPreliminaryReviewLeader/components/BidPreliminarySummary.tsx +++ b/src/pages/Evaluation/BidPreliminary/BidPreliminaryReviewLeader/components/BidPreliminarySummary.tsx @@ -6,6 +6,7 @@ import { CheckOutlined, CloseOutlined } from '@ant-design/icons'; import { getURLInformation } from '@/utils/CommonUtils'; import { getProMethod, getRoomId } from '@/utils/session'; import MACAddressPrompt from '@/pages/Evaluation/BidControl/BidControlManager/components/MACAddressPrompt'; +import { getSectionDataById } from '@/services/common'; interface BidPreliminarySummaryProps { totalSupplier?: any; @@ -79,11 +80,9 @@ const BidPreliminarySummary: React.FC = (props) => { }).then((response) => { if (response?.code == 200) { const data = response?.data; - //判断采购方式是否符合 - isCheckShow(juryDataParams.assessRoomId).then((res) => { - if (res.code == 200) { - isShowRef.current = res.data; - if (res.data) { + getSectionDataById(sessionStorage.getItem("sectionId")).then(res => {//获取当前评审室对应标段的标段信息 + if (res?.success) { + if (isBxOneSecond && (res?.data?.evalMethodDict === "eval_method_1")) {//比选一阶段二次 最低价法 1家合格 let count = 0; totalSupplier.forEach((ele: any) => { if ( @@ -93,10 +92,31 @@ const BidPreliminarySummary: React.FC = (props) => { count = count + 1; } }); - onSubmit(count); + if (count == 1) { + onSubmit(1); + } + } else { + //判断采购方式是否符合 + isCheckShow(juryDataParams.assessRoomId).then((res) => { + if (res.code == 200) { + isShowRef.current = res.data; + if (res.data) { + let count = 0; + totalSupplier.forEach((ele: any) => { + if ( + data[data.length - 1].detailList[0].earlyMap[ele.supplierRegisterId].judgesResult == + true + ) { + count = count + 1; + } + }); + onSubmit(count); + } + } + }); } } - }); + }) //调用数据处理方法并初始化表格 InitializeTable(pagingSupplier, data); } diff --git a/src/pages/Evaluation/BidPreliminary/BidPreliminaryReviewLeader/index.tsx b/src/pages/Evaluation/BidPreliminary/BidPreliminaryReviewLeader/index.tsx index 1ed4f68..1ba058e 100644 --- a/src/pages/Evaluation/BidPreliminary/BidPreliminaryReviewLeader/index.tsx +++ b/src/pages/Evaluation/BidPreliminary/BidPreliminaryReviewLeader/index.tsx @@ -400,6 +400,7 @@ const Index: React.FC<{}> = () => { setCurrent(1) if (tabList[key].name == '初审汇总') { setCount(count + 1) + setQualifyNumber(3) } else { if (bidEvalDetailDTOList.length > 0) { tabSaveSorce()