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 = (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 && } + {item.macConflictStatus && } ), 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 }