Merge branch '20230625-“公开比选一阶段二次项目，供应商为一家时增加可选流程和填写说明”，最低价法增加该流程' into 'release_20230714'

7.14 “公开比选一阶段二次项目，供应商为一家时增加可选流程和填写说明”，最低价法增加该流程

See merge request eshop/fe_service_ebtp_frontend!301

src/pages/Evaluation/BidPreliminary/BidPreliminaryManager/components/PreliminarySummary.tsx

@@ -36,6 +36,8 @@ const PreliminarySummary: React.FC<BidPreliminarySummaryProps> = (props) => {
   const [processValue, setProcessValue] = useState<number>();
   //是否公开比选一阶段二次项目
   const [isBxOneSecond, setIsBxOneSecond] = useState<boolean>(false);
+  //合格供应商数量
+  const [qualifyNumber, setQualifyNumber] = useState<number>(3);
   //每页显示数量常量
   const pageSize = 3;
   const { TextArea } = Input;
@@ -238,11 +240,11 @@ const PreliminarySummary: React.FC<BidPreliminarySummaryProps> = (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<BidPreliminarySummaryProps> = (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<BidPreliminarySummaryProps> = (props) => {
       {isShowFoot ? (
         <div>
           <div style={{ margin: '8px 0px' }}>
-            <span style={{ color: '#b30000' }}>{(isBxOneSecond && isNotEmpty(processValue)) ? '合格供应商仅一家，是否继续进行' : '合格供应商不足三家，是否继续进行详审'}：</span>
+            <span style={{ color: '#b30000' }}>{qualifyNumber == 1 && isBxOneSecond ? '合格供应商仅一家，是否继续进行' : '合格供应商不足三家，是否继续进行详审'}：</span>
             <Radio.Group onChange={radioOnChange} value={radioValue} disabled>
               <Radio value={1}>是，继续进行</Radio>
               <Radio value={0}>否，终止评审</Radio>

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<BidPreliminarySummaryProps> = (props) => {
       }).then((response) => {
         if (response?.code == 200) {
           const data = response?.data;
-          //判断采购方式是否符合
+          getSectionDataById(sessionStorage.getItem("sectionId")).then(res => {//获取当前评审室对应标段的标段信息
-          isCheckShow(juryDataParams.assessRoomId).then((res) => {
+            if (res?.success) {
-            if (res.code == 200) {
+              if (isBxOneSecond && (res?.data?.evalMethodDict === "eval_method_1")) {//比选一阶段二次 最低价法 1家合格
-              isShowRef.current = res.data;
-              if (res.data) {
                 let count = 0;
                 totalSupplier.forEach((ele: any) => {
                   if (
@@ -93,10 +92,31 @@ const BidPreliminarySummary: React.FC<BidPreliminarySummaryProps> = (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);
         }

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()