From 44297fc1d907b33e6fb7c61ae7de93bf7a376ac4 Mon Sep 17 00:00:00 2001 From: jl-zhoujl2 Date: Mon, 27 Mar 2023 10:09:58 +0800 Subject: [PATCH 1/5] =?UTF-8?q?3.27=20=E6=AF=94=E9=80=89=E4=BA=8C=E6=AC=A1?= =?UTF-8?q?=E9=A1=B9=E7=9B=AE=EF=BC=8C=E9=80=89=E6=8B=A9=E7=BB=93=E6=9D=9F?= =?UTF-8?q?=E8=AF=84=E5=AE=A1=E5=A2=9E=E5=8A=A0=E5=8F=82=E6=95=B0?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../BidPreliminaryReviewLeader/index.tsx | 67 ++++++++++--------- 1 file changed, 36 insertions(+), 31 deletions(-) diff --git a/src/pages/Evaluation/BidPreliminary/BidPreliminaryReviewLeader/index.tsx b/src/pages/Evaluation/BidPreliminary/BidPreliminaryReviewLeader/index.tsx index 4010ac0..057ec19 100644 --- a/src/pages/Evaluation/BidPreliminary/BidPreliminaryReviewLeader/index.tsx +++ b/src/pages/Evaluation/BidPreliminary/BidPreliminaryReviewLeader/index.tsx @@ -840,6 +840,11 @@ const Index: React.FC<{}> = () => { } else { data["operationType"] = 0 } + } else if (radioValue == 0) { + if (isBxOneSecond) {//比选一阶段二次项目 + data["operationType"] = 1 + data["customizeFlowStatus"] = 0 + } } const remarkList = getRemarkList(ref.current) if (remarkList) { @@ -904,30 +909,30 @@ const Index: React.FC<{}> = () => { }) }, [count]); -/** - * 风控中心校验 - * @param params - */ - const verificationRiskControl = () => { - const remarkList = getRemarkList(ref.current); - console.log(remarkList); - let submitData = { - reviewStatus: '2', - reviewTurnId: getURLInformation("turnId"), - reviewType: '1', - remarkList: remarkList, - } - beforeRiskControl(submitData).then(res => { - if (res?.code == 200) { - if (res?.data.length > 0) { - setRiskData(res?.data); - setRiskVisible(true); - } else { - finalSubmit(); - } + /** + * 风控中心校验 + * @param params + */ + const verificationRiskControl = () => { + const remarkList = getRemarkList(ref.current); + console.log(remarkList); + let submitData = { + reviewStatus: '2', + reviewTurnId: getURLInformation("turnId"), + reviewType: '1', + remarkList: remarkList, } - }) -} + beforeRiskControl(submitData).then(res => { + if (res?.code == 200) { + if (res?.data.length > 0) { + setRiskData(res?.data); + setRiskVisible(true); + } else { + finalSubmit(); + } + } + }) + } return ( <> @@ -1126,14 +1131,14 @@ const Index: React.FC<{}> = () => { {/**风控组件 */} {riskVisible && { - setRiskVisible(false); - setRiskData([]); - }} - onSubmit={() => finalSubmit()} - data={riskData} - />} + modalVisible={riskVisible} + onCancel={() => { + setRiskVisible(false); + setRiskData([]); + }} + onSubmit={() => finalSubmit()} + data={riskData} + />} ) From 7bd9d8bf7242826a52c7121f5a0fe76c7939f4e3 Mon Sep 17 00:00:00 2001 From: jl-zhoujl2 Date: Mon, 27 Mar 2023 10:13:42 +0800 Subject: [PATCH 2/5] =?UTF-8?q?3.27=20=E5=A4=84=E7=90=86?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../BidPreliminary/BidPreliminaryReviewLeader/index.tsx | 1 - 1 file changed, 1 deletion(-) diff --git a/src/pages/Evaluation/BidPreliminary/BidPreliminaryReviewLeader/index.tsx b/src/pages/Evaluation/BidPreliminary/BidPreliminaryReviewLeader/index.tsx index 057ec19..1de7f84 100644 --- a/src/pages/Evaluation/BidPreliminary/BidPreliminaryReviewLeader/index.tsx +++ b/src/pages/Evaluation/BidPreliminary/BidPreliminaryReviewLeader/index.tsx @@ -915,7 +915,6 @@ const Index: React.FC<{}> = () => { */ const verificationRiskControl = () => { const remarkList = getRemarkList(ref.current); - console.log(remarkList); let submitData = { reviewStatus: '2', reviewTurnId: getURLInformation("turnId"), From 3162262821cef6318bf14b31ff04d79ab7ca2800 Mon Sep 17 00:00:00 2001 From: jl-zhoujl2 Date: Mon, 27 Mar 2023 10:17:09 +0800 Subject: [PATCH 3/5] =?UTF-8?q?3.27=20=E4=BF=AE=E6=94=B9?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../BidPreliminary/BidPreliminaryReviewLeader/index.tsx | 5 ++--- 1 file changed, 2 insertions(+), 3 deletions(-) diff --git a/src/pages/Evaluation/BidPreliminary/BidPreliminaryReviewLeader/index.tsx b/src/pages/Evaluation/BidPreliminary/BidPreliminaryReviewLeader/index.tsx index 1de7f84..bb46357 100644 --- a/src/pages/Evaluation/BidPreliminary/BidPreliminaryReviewLeader/index.tsx +++ b/src/pages/Evaluation/BidPreliminary/BidPreliminaryReviewLeader/index.tsx @@ -910,9 +910,8 @@ const Index: React.FC<{}> = () => { }, [count]); /** - * 风控中心校验 - * @param params - */ + * 风控中心校验 + */ const verificationRiskControl = () => { const remarkList = getRemarkList(ref.current); let submitData = { From 3751dde545a4998824b53d22227992da55763200 Mon Sep 17 00:00:00 2001 From: jl-zhoujl2 Date: Mon, 27 Mar 2023 10:18:56 +0800 Subject: [PATCH 4/5] =?UTF-8?q?3.27=20=E4=BF=AE=E6=94=B9?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../BidPreliminaryReviewLeader/index.tsx | 36 ++++++++++--------- 1 file changed, 19 insertions(+), 17 deletions(-) diff --git a/src/pages/Evaluation/BidPreliminary/BidPreliminaryReviewLeader/index.tsx b/src/pages/Evaluation/BidPreliminary/BidPreliminaryReviewLeader/index.tsx index bb46357..6f5598e 100644 --- a/src/pages/Evaluation/BidPreliminary/BidPreliminaryReviewLeader/index.tsx +++ b/src/pages/Evaluation/BidPreliminary/BidPreliminaryReviewLeader/index.tsx @@ -910,26 +910,28 @@ const Index: React.FC<{}> = () => { }, [count]); /** - * 风控中心校验 - */ + * 风控中心校验 + */ const verificationRiskControl = () => { const remarkList = getRemarkList(ref.current); - let submitData = { - reviewStatus: '2', - reviewTurnId: getURLInformation("turnId"), - reviewType: '1', - remarkList: remarkList, - } - beforeRiskControl(submitData).then(res => { - if (res?.code == 200) { - if (res?.data.length > 0) { - setRiskData(res?.data); - setRiskVisible(true); - } else { - finalSubmit(); - } + if (remarkList) { + let submitData = { + reviewStatus: '2', + reviewTurnId: getURLInformation("turnId"), + reviewType: '1', + remarkList: remarkList, } - }) + beforeRiskControl(submitData).then(res => { + if (res?.code == 200) { + if (res?.data.length > 0) { + setRiskData(res?.data); + setRiskVisible(true); + } else { + finalSubmit(); + } + } + }) + } } return ( From e4785c89caae4d2c1638939fdbe34a9af4df557e Mon Sep 17 00:00:00 2001 From: jl-zhoujl2 Date: Thu, 30 Mar 2023 10:45:27 +0800 Subject: [PATCH 5/5] =?UTF-8?q?3.30=20=E4=B8=8D=E6=BB=A1=E8=B6=B3=E4=B8=89?= =?UTF-8?q?=E5=AE=B6=E9=9C=80=E8=A6=81=E5=A1=AB=E5=86=99=E5=8E=9F=E5=9B=A0?= =?UTF-8?q?=E7=9A=84=E8=A6=86=E7=9B=96=E8=8C=83=E5=9B=B4=E9=94=99=E8=AF=AF?= =?UTF-8?q?=E7=BA=A0=E6=AD=A3?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../components/PreliminarySummary.tsx | 2 +- .../components/BidPreliminarySummary.tsx | 22 ++++++++++--------- 2 files changed, 13 insertions(+), 11 deletions(-) diff --git a/src/pages/Evaluation/BidPreliminary/BidPreliminaryManager/components/PreliminarySummary.tsx b/src/pages/Evaluation/BidPreliminary/BidPreliminaryManager/components/PreliminarySummary.tsx index 1846bb3..b098eea 100644 --- a/src/pages/Evaluation/BidPreliminary/BidPreliminaryManager/components/PreliminarySummary.tsx +++ b/src/pages/Evaluation/BidPreliminary/BidPreliminaryManager/components/PreliminarySummary.tsx @@ -236,7 +236,7 @@ const PreliminarySummary: React.FC = (props) => { const getFooterData = () => { checkShowData(getRoomId(), getURLInformation('nodeId')).then(response => { if (response?.code == 200) { - if (response?.data == undefined) { } else { + if (response?.data == undefined || response?.data?.id == null) { } else { setIsShowFoot(true) setRadioValue(response.data?.continueStatus) if (response.data?.continueStatus == 1) { diff --git a/src/pages/Evaluation/BidPreliminary/BidPreliminaryReviewLeader/components/BidPreliminarySummary.tsx b/src/pages/Evaluation/BidPreliminary/BidPreliminaryReviewLeader/components/BidPreliminarySummary.tsx index 2742d06..2a8db9c 100644 --- a/src/pages/Evaluation/BidPreliminary/BidPreliminaryReviewLeader/components/BidPreliminarySummary.tsx +++ b/src/pages/Evaluation/BidPreliminary/BidPreliminaryReviewLeader/components/BidPreliminarySummary.tsx @@ -83,16 +83,18 @@ const BidPreliminarySummary: React.FC = (props) => { isCheckShow(juryDataParams.assessRoomId).then((res) => { if (res.code == 200) { isShowRef.current = 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); + 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); + } } }); //调用数据处理方法并初始化表格