From 7301a8e7a2a97f3bb7532056601a70ea1f2c9e30 Mon Sep 17 00:00:00 2001 From: jl-zhoujl2 Date: Sun, 25 Jun 2023 15:49:00 +0800 Subject: [PATCH 1/3] =?UTF-8?q?6.25=20=E2=80=9C=E5=85=AC=E5=BC=80=E6=AF=94?= =?UTF-8?q?=E9=80=89=E4=B8=80=E9=98=B6=E6=AE=B5=E4=BA=8C=E6=AC=A1=E9=A1=B9?= =?UTF-8?q?=E7=9B=AE=EF=BC=8C=E4=BE=9B=E5=BA=94=E5=95=86=E4=B8=BA=E4=B8=80?= =?UTF-8?q?=E5=AE=B6=E6=97=B6=E5=A2=9E=E5=8A=A0=E5=8F=AF=E9=80=89=E6=B5=81?= =?UTF-8?q?=E7=A8=8B=E5=92=8C=E5=A1=AB=E5=86=99=E8=AF=B4=E6=98=8E=E2=80=9D?= =?UTF-8?q?=EF=BC=8C=E6=9C=80=E4=BD=8E=E4=BB=B7=E6=B3=95=E5=A2=9E=E5=8A=A0?= =?UTF-8?q?=E8=AF=A5=E6=B5=81=E7=A8=8B?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../components/BidPreliminarySummary.tsx | 34 +++++++++++++++---- 1 file changed, 27 insertions(+), 7 deletions(-) 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); } From 23ad232fa37e3edc2d899f674a09bb2022be4c13 Mon Sep 17 00:00:00 2001 From: jl-zhoujl2 Date: Sun, 25 Jun 2023 16:30:42 +0800 Subject: [PATCH 2/3] =?UTF-8?q?6.25=20=E5=88=9D=E5=AE=A1=E6=B1=87=E6=80=BB?= =?UTF-8?q?=E5=88=87=E6=8D=A2=E6=98=BE=E7=A4=BA=E9=97=AE=E9=A2=98=E4=BF=AE?= =?UTF-8?q?=E5=A4=8D?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../BidPreliminary/BidPreliminaryReviewLeader/index.tsx | 1 + 1 file changed, 1 insertion(+) 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() From 5389d97a7d09bc009127c2f84bab7499fbb57a6d Mon Sep 17 00:00:00 2001 From: jl-zhoujl2 Date: Mon, 26 Jun 2023 16:47:17 +0800 Subject: [PATCH 3/3] =?UTF-8?q?6.26=20=E4=BF=AE=E5=A4=8D=E4=BB=A3=E7=90=86?= =?UTF-8?q?=E8=AF=84=E5=AE=A1=E6=B1=87=E6=80=BB=E8=A1=A8=E6=96=87=E5=AD=97?= =?UTF-8?q?=E6=8F=90=E7=A4=BA?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../components/PreliminarySummary.tsx | 15 +++++++++++++-- 1 file changed, 13 insertions(+), 2 deletions(-) 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 ? '合格供应商仅一家，是否继续进行' : '合格供应商不足三家，是否继续进行详审'}： 是，继续进行 否，终止评审