Merge branch 'dev-srm' of 10.0.0.22:lingxi/lingxi-business-paltform into dev-srm

src/pages/transaction/purchaseAbility/confirmOffer/toComparePrices/index.tsx

@@ -107,7 +107,7 @@ const ToComparePrices = () => {
             record.confirmInteriorState === OFFTER_CONFIRMINTERNALSTATE_TYPE.AUDITNOPASS2_TYPE
           ) && <Button type='link'>修改授标结果</Button>
         }
-        <Button type='link' onClick={() => history.push(`/memberCenter/procurementAbility/confirmOffer/preview?id=${record.id}&turn=${record.turn}`)}>查看</Button>
+        <Button type='link' onClick={() => history.push(`/memberCenter/procurementAbility/confirmOffer/toComparePrices/preview?id=${record.id}&turn=${record.turn}`)}>查看</Button>
       </>
 
   }];

src/pages/transaction/purchaseAbility/offter/addOffter/components/offer.tsx

@@ -208,16 +208,20 @@ const OfferInfo: React.FC<IProps> = (props: any) => {
       current: '1',
       pageSize: '100',
     }
-    PublicApi.getPurchaseQuotedPriceMaterielDetailed({ ...params }).then((res: any) => {
-      if (res.code !== 1000) {
-        return
-      }
-      const param = { ...data };
-      param[index] = [...res.data.data];
-      console.log(param, 10086)
+    const param = { ...data };
+    if (name === 'quote') {
+      param[index] = fetchdata.materiels;
       setData({ ...param });
-      setDataSource(res.data.data)
-    })
+    } else {
+      PublicApi.getPurchaseQuotedPriceMaterielDetailed({ ...params }).then((res: any) => {
+        if (res.code !== 1000) {
+          return
+        }
+        param[index] = [...res.data.data];
+        setData({ ...param });
+      })
+    }
+
   }
 
   useEffect(() => {
@@ -259,7 +263,7 @@ const OfferInfo: React.FC<IProps> = (props: any) => {
               productId: item.productId,
               goodsId: item.goodsId,
               productBrand: item.productBrand,
-              productAttributeJson: item.productAttributeJson,
+              productAttributeJson: `${item.productAttributeJson}-${item.customerCategoryName}`,
             })
           })
           resolve({

src/pages/transaction/purchaseAbility/offter/addOffter/modal/crossSellProducts.tsx

@@ -114,6 +114,8 @@ const CrossSellProducts: React.FC<IProps> = (props: any) => {
     setFiles(arr);
   }
 
+  console.log(record, 10086)
+
   return (
     <>
       <Drawer