fix: 暂存到待新增现货采购订单的按钮配置

src/pages/transaction/purchaseOrder/addPurchaseReceiveOrder/index.tsx

@@ -17,6 +17,7 @@ import { FormDetailContext } from '@/formSchema/context'
 import { useFormDetail } from '@/formSchema/effects/useFormDetail'
 import { postPurchaseRequisitionCreate, postPurchaseRequisitionUpdate } from '@/services/PurchaseV2Api'
 import { getOrderBuyerReceiveDetail } from '@/services/OrderNewV2Api'
+import AuthButton from '@/components/AuthButton'
 
 const addSchemaAction = createFormActions()
 
@@ -101,9 +102,11 @@ const AddPurchaseReceiveOrder: React.FC<{}> = () => {
         title={renderTitle()}
         schema={increaseSchema}
         extraRight={[
-          <Button key="1" onClick={() => addSchemaAction.submit()} loading={btnLoading} type="primary" icon={<SaveOutlined />}>
-            {intl.formatMessage({ id: 'purchaseOrder.baocun', defaultMessage: '保存' })}
-          </Button>,
+          <AuthButton btnCode="addPurchaseReceiveOrder.baocun">
+            <Button key="1" onClick={() => addSchemaAction.submit()} loading={btnLoading} type="primary" icon={<SaveOutlined />}>
+              {intl.formatMessage({ id: 'purchaseOrder.baocun', defaultMessage: '保存' })}
+            </Button>
+          </AuthButton>,
         ]}
       />
         <FormDetailWrapper>

src/pages/transaction/purchaseOrder/constant/index.tsx

@@ -3,8 +3,9 @@ import { formatTimeString } from '@/utils'
 import StatusColors from '../components/statusColors'
 import EyePreview from '@/components/EyePreview'
 import { ORDER_TYPE_CHANNEL_POINTS, ORDER_TYPE_POINTS } from '@/constants/order'
+import { AuthUrl } from '@/components/AuthButton/AuthUrl'
 
-export const baseOrderListColumns: any = () => {
+export const baseOrderListColumns: any = (authCode?: string) => {
   const intl = useIntl()
 
   return [
@@ -15,7 +16,10 @@ export const baseOrderListColumns: any = () => {
       key: 'orderNo',
       render: (text, record) => {
         return (
-          <EyePreview url={`${history.location.pathname}/preview?id=${record.orderId}`}>
+          <EyePreview
+            type={AuthUrl(authCode) ? 'link' : 'button'}
+            url={`${history.location.pathname}/preview?id=${record.orderId}`}
+          >
             {text}
           </EyePreview>
         )

src/pages/transaction/purchaseOrder/readyAddCashOrder/index.tsx

@@ -14,6 +14,7 @@ import { useHttpRequest } from '@/hooks/useHttpRequest'
 import DateRangePickerUnix from '@/components/NiceForm/components/DateRangePickerUnix'
 import '../index.less'
 import { getOrderBuyerCreatePurchasePage, postOrderBuyerCreateDeleteBatch, postOrderBuyerCreateSubmitBatch } from '@/services/OrderNewV2Api'
+import AuthButton from '@/components/AuthButton';
 
 /**
  * 待新增现货采购订单
@@ -103,21 +104,27 @@ const ReadyAddCashOrder:React.FC<ReadyAddCashOrderProps> = () => {
         }}
         formilyChilds={{
           children: <Space>
-            <Button
-              icon={<PlusCircleOutlined/>}
-              type='primary'
-              onClick={clickAdd}
-            >
-              {intl.formatMessage({id: 'purchaseOrder.readyAddOrder.button1'})}
-            </Button>
-            <Button onClick={handleBitchPush} loading={submitLoading}>
-            {intl.formatMessage({id: 'purchaseOrder.readyAddOrder.button2'})}
-            </Button>
+            <AuthButton btnCode="readyAddCashOrder.xinzeng">
+              <Button
+                icon={<PlusCircleOutlined/>}
+                type='primary'
+                onClick={clickAdd}
+              >
+                {intl.formatMessage({id: 'purchaseOrder.readyAddOrder.button1'})}
+              </Button>
+            </AuthButton>
+            <AuthButton btnCode="readyAddCashOrder.piliangtijiao">
+              <Button onClick={handleBitchPush} loading={submitLoading}>
+              {intl.formatMessage({id: 'purchaseOrder.readyAddOrder.button2'})}
+              </Button>
+            </AuthButton>
             <DropDeleteDown>
               <Menu onClick={(e) => handleMenuClick(e)}>
-                <Menu.Item key="1" icon={<DeleteOutlined />}>
-                {intl.formatMessage({id: 'purchaseOrder.readyAddOrder.button3'})}
-                </Menu.Item>
+                <AuthButton btnCode="readyAddCashOrder.piliangshanchu">
+                  <Menu.Item key="1" icon={<DeleteOutlined />}>
+                  {intl.formatMessage({id: 'purchaseOrder.readyAddOrder.button3'})}
+                  </Menu.Item>
+                </AuthButton>
               </Menu>
             </DropDeleteDown>
           </Space>,

src/pages/transaction/purchaseOrder/readyAddCashOrder/model/useReadyAddOrder.tsx

@@ -27,6 +27,12 @@ export const useSelfTable = () => {
 
    /** 参照后台数据生成 */
    const renderOptionButton = (record: any) => {
+    const buttonPermissionsMap = {
+      [intl.formatMessage({id: 'purchaseOrder.readyAddOrder.useSelfTableOpeartion1'})]: 'readyAddCashOrder.tijiao',
+      [intl.formatMessage({id: 'purchaseOrder.readyAddOrder.useSelfTableOpeartion2'})]: 'readyAddCashOrder.xiugai',
+      [intl.formatMessage({id: 'purchaseOrder.readyAddOrder.useSelfTableOpeartion3'})]: 'readyAddCashOrder.shanchu',
+    }
+
     const buttonGroup = {
       [intl.formatMessage({id: 'purchaseOrder.readyAddOrder.useSelfTableOpeartion1'})]: true,
       [intl.formatMessage({id: 'purchaseOrder.readyAddOrder.useSelfTableOpeartion2'})]: record.showUpdate,
@@ -43,6 +49,7 @@ export const useSelfTable = () => {
       <TableOperation
         buttonTextFieldMap={buttonGroup}
         operationHandler={operationHandler}
+        buttonPermissionsMap={buttonPermissionsMap}
       />
     )
   }

src/pages/transaction/purchaseOrder/readyAddPurchaseReceiveOrder/model/useSelfTable.tsx

@@ -7,12 +7,18 @@ import StatusColors from '@/pages/transaction/components/statusColors'
 import { FieldTimeOutlined } from '@ant-design/icons'
 import TableOperation from '@/components/TableOperation'
 import { postOrderBuyerValidateReceive } from '@/services/OrderNewV2Api'
+import { AuthUrl } from '@/components/AuthButton/AuthUrl'
 
 export const useSelfTable = () => {
   const ref = useRef<any>({})
   const intl = useIntl()
   /** 参照后台数据生成 */
   const renderOptionButton = (record: any) => {
+    const buttonPermissionsMap = {
+      [intl.formatMessage({ id: 'purchaseOrder.shenhe', defaultMessage: '审核' })]: 'ReadyAddPurchaseReceiveOrder.shenhe',
+      [intl.formatMessage({ id: 'purchaseOrder.xinzengcaigoushouhuodan', defaultMessage: '新增采购收货单' })]: 'ReadyAddPurchaseReceiveOrder.xinzeng',
+    }
+
     const buttonGroup = {
       [intl.formatMessage({ id: 'purchaseOrder.shenhe', defaultMessage: '审核' })]: true,
       [intl.formatMessage({ id: 'purchaseOrder.xinzengcaigoushouhuodan', defaultMessage: '新增采购收货单' })]: true,
@@ -26,6 +32,7 @@ export const useSelfTable = () => {
       <TableOperation
         buttonTextFieldMap={buttonGroup}
         operationHandler={operationHandler}
+        buttonPermissionsMap={buttonPermissionsMap}
       />
     )
   }
@@ -38,7 +45,7 @@ export const useSelfTable = () => {
       key: 'orderNo',
       render: (text, record) => {
         return (
-          <EyePreview url={`/memberCenter/tranactionAbility/purchaseOrder/orderList/preview?id=${record.orderId}`}>
+          <EyePreview type={AuthUrl('ReadyAddPurchaseReceiveOrder.chakan') ? 'link' : 'button'} url={`/memberCenter/tranactionAbility/purchaseOrder/orderList/preview?id=${record.orderId}`}>
             {text}
           </EyePreview>
         )

src/pages/transaction/purchaseOrder/readyDistributionOrder/index.tsx

@@ -12,6 +12,7 @@ import { useHttpRequest } from '@/hooks/useHttpRequest'
 import '../index.less'
 import { getOrderBuyerTakePage, postOrderBuyerTakeBatch } from '@/services/OrderNewV2Api'
 import { useIntl } from 'umi'
+import AuthButton from '@/components/AuthButton';
 
 // 待分配订单
 
@@ -81,7 +82,9 @@ const ReadyDistributionOrder:React.FC<ReadyDistributionOrderProps> = (props) =>
         }}
         formilyChilds={{
           children: <Space>
-            <Button onClick={handleBitchPush} loading={loading}>{intl.formatMessage({ id: 'purchaseOrder.pilianglingqu', defaultMessage: '批量领取' })}</Button>
+            <AuthButton btnCode="readyDistributionOrder.pilianglingqu">
+              <Button onClick={handleBitchPush} loading={loading}>{intl.formatMessage({ id: 'purchaseOrder.pilianglingqu', defaultMessage: '批量领取' })}</Button>
+            </AuthButton>
           </Space>,
           layouts: {
             span: 8

src/pages/transaction/purchaseOrder/readyDistributionOrder/model/useSelfTable.tsx

@@ -4,6 +4,7 @@ import { baseOrderListColumns } from '../../constant'
 import { useIntl } from 'umi'
 import { useRowSelectionTable } from '@/hooks/useRowSelectionTable'
 import { postOrderBuyerTake } from '@/services/OrderNewV2Api'
+import AuthButton from '@/components/AuthButton'
 
 export const useSelfTable = () => {
   const ref = useRef<any>({})
@@ -28,7 +29,7 @@ export const useSelfTable = () => {
   // ])
 
   const secondColumns = () => {
-    const alreadyColumns = baseOrderListColumns()
+    const alreadyColumns = baseOrderListColumns('readyDistributionOrder.chakan')
     if(alreadyColumns) {
       alreadyColumns.splice(6, 0, {
         title: intl.formatMessage({ id: 'saleOrder.songhuodizhi', defaultMessage: '送货地址' }),
@@ -43,7 +44,9 @@ export const useSelfTable = () => {
           align: 'center',
           dataIndex: 'ctl',
           key: 'ctl',
-          render: (text, record) => <Button type='link' onClick={() => handleSubmit(record.orderId)}>{intl.formatMessage({ id: 'purchaseOrder.lingqu', defaultMessage: '领取' })}</Button>
+          render: (text, record) => <AuthButton btnCode="readyDistributionOrder.lingqu">
+            <Button type='link' onClick={() => handleSubmit(record.orderId)}>{intl.formatMessage({ id: 'purchaseOrder.lingqu', defaultMessage: '领取' })}</Button>
+          </AuthButton>
         }
       ])
     }

src/pages/transaction/purchaseOrder/readyPayOrder/detail/index.tsx

@@ -9,6 +9,7 @@ import { useOrderDetail } from '../../../_public/order/effects/useOrderDetail';
 import OrderDetailSection from '../../../components/orderDetailSection';
 import OrderPayModal from '@/pages/transaction/components/orderPayModal';
 import { ENTERPRISE_CENTER_URL } from '@/constants';
+import AuthButton from '@/components/AuthButton';
 
 const ReadyConfirmContract: React.FC = () => {
   const { formContext, id, detailList } = useOrderDetail({type: 'p_readyPayOrder'})
@@ -55,9 +56,11 @@ const ReadyConfirmContract: React.FC = () => {
       <OrderDetailContext.Provider value={formContext}>
         <OrderDetailHeader detailList={detailList} detailData={formContext.data} extraRight={
           <>
-            <Button type='primary' onClick={handleClick}>
-              {intl.formatMessage({ id: 'purchaseOrder.quzhifu', defaultMessage: '去支付' })}
-            </Button>
+            <AuthButton btnCode="readyPayOrderDtail.quzhifu">
+              <Button type='primary' onClick={handleClick}>
+                {intl.formatMessage({ id: 'purchaseOrder.quzhifu', defaultMessage: '去支付' })}
+              </Button>
+            </AuthButton>
             <div style={{ textAlign: 'right' }}>
               <p style={{ marginTop: 12, fontSize: 12, color: '#6B778C' }}>{intl.formatMessage({ id: 'purchaseOrder.bencixuzhifu', defaultMessage: '本次需支付' })}</p>
               { formContext.data && <p>{intl.formatMessage({ id: 'commodity.products.directChannel.columns.currency'})}{ renderPayPrice() }</p> }

src/pages/transaction/purchaseOrder/readyPayOrder/model/useSelfTable.tsx

@@ -14,6 +14,8 @@ import {
 } from 'bizcharts';
 // import Interval from 'bizcharts/lib/geometry/Interval'
 import DataSet from "@antv/data-set";
+import { AuthUrl } from '@/components/AuthButton/AuthUrl'
+import AuthButton from '@/components/AuthButton'
 
 // 圆形环状金额显示
 const CircleChart = props => {
@@ -61,7 +63,7 @@ export const useSelfTable = () => {
       key: 'orderNo',
       render: (text, record) => {
         return (
-          <EyePreview url={`/memberCenter/tranactionAbility/purchaseOrder/readyPayOrder/preview?id=${record.orderId}`}>
+          <EyePreview type={AuthUrl('readyPayOrder.chakan') ? 'link' : 'button'} url={`/memberCenter/tranactionAbility/purchaseOrder/readyPayOrder/preview?id=${record.orderId}`}>
             {text}
           </EyePreview>
         )
@@ -138,7 +140,9 @@ export const useSelfTable = () => {
       align: 'center',
       dataIndex: 'ctl',
       key: 'ctl',
-      render: (text, record) => <Link to={`/memberCenter/tranactionAbility/purchaseOrder/readyPayOrder/detail?id=${record.orderId}`}>{intl.formatMessage({ id: 'purchaseOrder.quzhifu', defaultMessage: '去支付' })}</Link>
+      render: (text, record) => <AuthButton btnCode="readyPayOrder.quzhifu">
+        <Link to={`/memberCenter/tranactionAbility/purchaseOrder/readyPayOrder/detail?id=${record.orderId}`}>{intl.formatMessage({ id: 'purchaseOrder.quzhifu', defaultMessage: '去支付' })}</Link>
+      </AuthButton>
     }
   ]
 

src/pages/transaction/purchaseOrder/readyReceiveOrder/detail/index.tsx

@@ -10,6 +10,7 @@ import { PurchaseOrderInsideWorkState, DeliverySideState } from '@/constants/ord
 import OrderHandReceivedModal from '@/pages/transaction/components/orderHandReceivedModal';
 import { usePageStatus } from '@/hooks/usePageStatus';
 import { useIntl } from 'umi';
+import AuthButton from '@/components/AuthButton';
 
 const ReadyReceiveOrderDetail: React.FC = () => {
   const { formContext, id, detailList } = useOrderDetail({type: 'p_readyReceiveOrder'})
@@ -44,9 +45,9 @@ const ReadyReceiveOrderDetail: React.FC = () => {
     <div>
       <OrderDetailContext.Provider value={formContext}>
         <OrderDetailHeader detailList={detailList} detailData={formContext.data} extraRight={
-          formContext.data && !formContext.data.receiveDone && <Button type='primary' onClick={handleClick}>
+          formContext.data && !formContext.data.receiveDone && <AuthButton btnCode="readyReceiveOrderDetail.ququerenshouhuo"><Button type='primary' onClick={handleClick}>
             {isHeadReceipt ? intl.formatMessage({ id: 'purchaseOrder.shougongshouhuo', defaultMessage: '手工收货' }) : intl.formatMessage({ id: 'purchaseOrder.ququerenshouhuo', defaultMessage: '去确认收货' })}
-          </Button>
+          </Button></AuthButton>
         } />
 
         <OrderDetailWrapper>

src/pages/transaction/purchaseOrder/readyReceiveOrder/model/useSelfTable.tsx

@@ -6,6 +6,8 @@ import { formatTimeString } from '@/utils'
 import StatusColors from '@/pages/transaction/components/statusColors'
 import { FieldTimeOutlined } from '@ant-design/icons'
 import { ORDER_TYPE_CHANNEL_POINTS, ORDER_TYPE_POINTS } from '@/constants/order'
+import { AuthUrl } from '@/components/AuthButton/AuthUrl'
+import AuthButton from '@/components/AuthButton'
 
 // 业务hooks
 export const useSelfTable = () => {
@@ -20,7 +22,10 @@ export const useSelfTable = () => {
       key: 'orderNo',
       render: (text, record) => {
         return (
-          <EyePreview url={`/memberCenter/tranactionAbility/purchaseOrder/readyReceiveOrder/preview?id=${record.orderId}`}>
+          <EyePreview
+            type={AuthUrl('readyReceiveOrder.chakan') ? 'link' : 'button'}
+            url={`/memberCenter/tranactionAbility/purchaseOrder/readyReceiveOrder/preview?id=${record.orderId}`}
+          >
             {text}
           </EyePreview>
         )
@@ -89,7 +94,7 @@ export const useSelfTable = () => {
       align: 'center',
       dataIndex: 'ctl',
       key: 'ctl',
-      render: (text, record) => <Button type='link' onClick={() => handleConfirm(record)}>{intl.formatMessage({ id: 'purchaseOrder.querenshouhuo', defaultMessage: '确认收货' })}</Button>
+      render: (text, record) => <AuthButton btnCode="readyReceiveOrder.querenshouhuo"><Button type='link' onClick={() => handleConfirm(record)}>{intl.formatMessage({ id: 'purchaseOrder.querenshouhuo', defaultMessage: '确认收货' })}</Button></AuthButton>
     }
   ]