From 7579c43453923476e0234bf1b27e9ab716bf7a75 Mon Sep 17 00:00:00 2001
From: jl-zhoujl2 <jl-zhoujl2@chinaunicom.cn>
Date: Tue, 17 May 2022 10:02:33 +0800
Subject: [PATCH] =?UTF-8?q?5.17=20=E6=8F=90=E4=BA=A4=E6=B1=87=E6=80=BB?=
 =?UTF-8?q?=E6=A0=A1=E9=AA=8Cmac=E5=9C=B0=E5=9D=80=E5=BC=BA=E6=8E=A7?=
 =?UTF-8?q?=EF=BC=8C=E7=BB=84=E9=95=BFmac=E5=9C=B0=E5=9D=80=E6=A0=A1?=
 =?UTF-8?q?=E9=AA=8C?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../components/BidPreliminarySummary.tsx       |  6 ++++++
 .../BidPreliminaryReviewLeader/index.tsx       | 18 +++++++++---------
 2 files changed, 15 insertions(+), 9 deletions(-)

diff --git a/src/pages/Evaluation/BidPreliminary/BidPreliminaryReviewLeader/components/BidPreliminarySummary.tsx b/src/pages/Evaluation/BidPreliminary/BidPreliminaryReviewLeader/components/BidPreliminarySummary.tsx
index 2992537..dab1065 100644
--- a/src/pages/Evaluation/BidPreliminary/BidPreliminaryReviewLeader/components/BidPreliminarySummary.tsx
+++ b/src/pages/Evaluation/BidPreliminary/BidPreliminaryReviewLeader/components/BidPreliminarySummary.tsx
@@ -141,6 +141,12 @@ const BidPreliminarySummary: React.FC<BidPreliminarySummaryProps> = (props) => {
           for (const key in inner.earlyMap) {
             if (Object.prototype.hasOwnProperty.call(inner.earlyMap, key)) {
               const element = inner.earlyMap[key];
+              for (const ite of totalSupplier) {
+                if (key == ite.supplierRegisterId) {
+                  element['macConflictStatus'] = ite.macConflictStatus;
+                  break;
+                }
+              }
               element['originalResult'] = element.judgesResult;
             }
           }
diff --git a/src/pages/Evaluation/BidPreliminary/BidPreliminaryReviewLeader/index.tsx b/src/pages/Evaluation/BidPreliminary/BidPreliminaryReviewLeader/index.tsx
index 5530d09..8cad81d 100644
--- a/src/pages/Evaluation/BidPreliminary/BidPreliminaryReviewLeader/index.tsx
+++ b/src/pages/Evaluation/BidPreliminary/BidPreliminaryReviewLeader/index.tsx
@@ -448,7 +448,7 @@ const Index: React.FC<{}> = () => {
         title: (
           <>
             {item.supplierRegisterName}
-            {item.macConflictStatus && <MACAddressPrompt type='other' companyName={item.supplierRegisterName} />}
+            {item.macConflictStatus && <MACAddressPrompt type='score' />}
           </>
         ),
         dataIndex: item.supplierRegisterId,
@@ -743,16 +743,20 @@ const Index: React.FC<{}> = () => {
   }
   //处理汇总表返回的数据
   const getRemarkList = (data: any) => {
+    console.log('data', data);
     const List: any[] = []
-    const Error: any[] = []
-    totalSupplierColumns.forEach((item: any) => {
+    for (const item of totalSupplierColumns) {
       const obj = data[data.length - 1][item?.supplierRegisterId]
       if (obj.judgesResult == false) {//判断为不合格情况
         if (isEmpty(obj.remarks)) {
-          Error.push(item?.supplierRegisterName)
-          return
+          message.info(`请填写【${item?.supplierRegisterName}】的不合格原因说明`)
+          return false;
         }
       }
+      if (obj.macConflictStatus && obj.judgesResult) {//mac地址重复供应商选为合格
+        message.info(`${item?.supplierRegisterName}与其他供应商MAC地址重复，不可选为初审合格`);
+        return false;
+      }
       List.push({
         supplierRegisterId: item?.supplierRegisterId,
         qualifiedStatus: obj?.judgesResult ? '1' : '2',
@@ -760,10 +764,6 @@ const Index: React.FC<{}> = () => {
         originalResult: obj?.originalResult ? '1' : '2',
         modifyResultStatus: obj?.judgesResult != obj?.originalResult,
       })
-    });
-    if (Error.length > 0) {
-      message.info(`请填写【${Error[0]}】的不合格原因说明`)
-      return false
     }
     return List
   }