Merge branch 'fix418' into 'v2-220418'

src/pages/commodity/products/checkProduct.tsx

@@ -13,13 +13,14 @@ import { FORM_FILTER_PATH } from '@/formSchema/const'
 import { createFormActions, FormEffectHooks } from '@formily/antd'
 import { searchBrandOptionEffect, searchCustomerCategoryOptionEffect } from './effect'
 import { getProductCommodityGetUnCheckCommodityList } from '@/services/ProductV2Api'
+import AuthButton from '@/components/AuthButton'
+import { AuthUrl } from '@/components/AuthButton/AuthUrl'
 
 const formActions = createFormActions();
 
 const CheckProduct: React.FC<{}> = () => {
   const intl = useIntl()
   const ref = useRef<any>({})
-  const MENU_NODE = 'commodity.productWillCheck'
   const columns: ColumnType<any>[] = [
     {
       title: 'ID',
@@ -31,7 +32,7 @@ const CheckProduct: React.FC<{}> = () => {
       dataIndex: 'name',
       key: 'name',
       className: 'commonPickColor',
-      render: (text, record) => <EyePreview
+      render: (text, record) => <EyePreview type={AuthUrl('checkProduct.chakan') ? 'link' : 'button'}
         url={`/memberCenter/commodityAbility/commodity/checkProduct/detail?id=${record.id}&preview=1`}
       >
         {text}
@@ -133,9 +134,9 @@ const CheckProduct: React.FC<{}> = () => {
       render: (text, record) => {
         return (
           <>
-            {/* <AuthButton menuCode={MENU_NODE} btnCode="DevTest"> */}
-            <Button type='link' onClick={() => history.push(`/memberCenter/commodityAbility/commodity/checkProduct/detail?id=${record.id}`)}>{intl.formatMessage({ id: 'commodity.checkProduct.check' })}</Button>
-            {/* </AuthButton> */}
+            <AuthButton btnCode="checkProduct.shenhe">
+              <Button type='link' onClick={() => history.push(`/memberCenter/commodityAbility/commodity/checkProduct/detail?id=${record.id}`)}>{intl.formatMessage({ id: 'commodity.checkProduct.check' })}</Button>
+            </AuthButton>
           </>
         )
       }

src/pages/commodity/products/checkProductDetail.tsx

@@ -20,6 +20,7 @@ import {
   postProductCommodityCheckCommodity
 } from '@/services/ProductV2Api'
 import { getLogisticsCompanyGet, getLogisticsFreightTemplateGet, getLogisticsShipperAddressGet } from '@/services/LogisticsV2Api'
+import AuthButton from '@/components/AuthButton'
 
 interface IColumn {
   title: string;
@@ -445,15 +446,17 @@ const CheckProductDetail: React.FC<{}> = () => {
       backIcon={<ReutrnEle logoSrc={productDetail?.unitPriceAndPicList[0]?.commodityPic[0]} />}
       content={content}
       extra={!preview && [
-        <Button
-          icon={<CheckSquareOutlined />}
-          key="1"
-          type="primary"
-          onClick={handleApplyCheck}
-          disabled={disableCheck}
-        >
-          {intl.formatMessage({ id: 'commodity.checkProductDetail.shangpinshenhe' })}
-        </Button>
+        <AuthButton btnCode="checkProductDetail.shenhe">
+          <Button
+            icon={<CheckSquareOutlined />}
+            key="1"
+            type="primary"
+            onClick={handleApplyCheck}
+            disabled={disableCheck}
+          >
+            {intl.formatMessage({ id: 'commodity.checkProductDetail.shangpinshenhe' })}
+          </Button>
+        </AuthButton>
       ]}
     >
       <Space direction="vertical" style={{ width: '100%' }}>

src/pages/transaction/dealAbility/confirmOffer/offerSearch/index.tsx

@@ -76,7 +76,7 @@ const OfferSearch = () => {
       dataIndex: 'operate',
       render: (_, record) => record.isShowPurchaseOrder &&
         <AuthButton btnCode='waitAuditOfferOne.chuangjiancaigoudingdan' >
-          <Button type='link' onClick={() => history.push(`/memberCenter/tranactionAbility/purchaseOrder/readyAddB2bOrder/add?modelType=3&quotationId=${record.id}`)}>{intl.formatMessage({ id: 'dealAbility.chuangjiancaigoudingdan' })}</Button>
+          <Button type='link' onClick={() => history.push(`/memberCenter/order/purchaseOrder/readyAddB2bOrder/add?modelType=3&quotationId=${record.id}`)}>{intl.formatMessage({ id: 'dealAbility.chuangjiancaigoudingdan' })}</Button>
         </AuthButton>
 
     }