Merge branch 'v2-220418' of…

src/components/BaseInfo/BaseInfo.tsx

@@ -8,6 +8,7 @@ interface BaseInfoPorps {
   cols?: number,
   id?: string
   subtitle?: string | React.ReactNode
+  style?: any
 }
 
 /**
@@ -15,12 +16,12 @@ interface BaseInfoPorps {
  * @param param0
  * @returns
  */
-function BaseInfo({ title, subtitle, className, children, cols = 2, id }: BaseInfoPorps) {
+function BaseInfo({ title, subtitle, className, children, cols = 2, id, style }: BaseInfoPorps) {
   return (
     <Card
       id={id}
       title={
-        <div style={{ display: 'flex', justifyContent: 'space-between' }}>
+        <div style={{ display: 'flex', justifyContent: 'space-between', ...style }}>
           <div>{title}</div>
           <div>{subtitle}</div>
         </div>

src/components/RoleSelect/RoleSelect.tsx

-import { Button, Col, Drawer, Form, Input, message, Pagination, Radio, Row, Table } from "antd"
+import { Button, Col, Drawer, Form, Input, message, Pagination, Radio, Row, Space, Table } from "antd"
 import { useCallback, useEffect, useState } from "react"
 import { TableMemberColumn } from "./columns"
 import { LinkOutlined } from "@ant-design/icons"
@@ -101,7 +101,7 @@ function RoleSelect(props: RoleSelectProps) {
       <RowStyleLayout>
         <Input.Group compact>
           <Input value={value?.name} disabled />
-          { !localDisabled && <Button type='primary' icon={<LinkOutlined />} disabled={localDisabled} onClick={showDrawer}></Button> }
+          {!localDisabled && <Button type='primary' icon={<LinkOutlined />} disabled={localDisabled} onClick={showDrawer}></Button>}
         </Input.Group>
       </RowStyleLayout>
 
@@ -111,14 +111,14 @@ function RoleSelect(props: RoleSelectProps) {
         onClose={closeDrawer}
         width="50vw"
         footer={
-          <Button.Group>
+          <Space style={{ width: '100%', justifyContent: 'flex-end' }}>
             <Button type="primary" onClick={handleSubmit}>
               确定
             </Button>
             <Button onClick={closeDrawer}>
               取消
             </Button>
-          </Button.Group>
+          </Space>
         }
       >
         <Form form={form}>
@@ -149,7 +149,7 @@ function RoleSelect(props: RoleSelectProps) {
             columns={TableMemberColumn}
             dataSource={dataSource}
             pagination={{
-              position: ['bottomCenter'],
+              position: ['bottomRight'],
               total,
               pageSize,
               current,
@@ -164,7 +164,7 @@ function RoleSelect(props: RoleSelectProps) {
             }}
           />
         </Radio.Group>
-
+        
       </Drawer>
     </>
   );

src/layouts/BasicLayout.tsx

@@ -191,6 +191,7 @@ const BasicLayout: React.FC<BasicLayoutProps> = (props) => {
       {...settings}
     >
       {children}
+      {defaultFooterDom}
     </ProLayout>
       );
 };

src/pages/order/constants/page-table-column.tsx

@@ -128,9 +128,9 @@ export const DeliveryGoodsTableColumn: any = [
 
 //  送货计划管理，协同  B2B通用 column
 export const columnB2B = [
-  { ...CommodityNoColumn, dataIndex: 'skuId', width: 80, ellipsis: true, },
-  { ...TradeNameColumn, dataIndex: 'productName', width: 192, ellipsis: true, },
-  { ...ClassColumn, dataIndex: 'category', width: 96, ellipsis: true, },
+  { ...CommodityNoColumn, dataIndex: 'skuId', width: 80, ellipsis: true, fixed: 'left' },
+  { ...TradeNameColumn, dataIndex: 'productName', width: 192, ellipsis: true, fixed: 'left' },
+  { ...ClassColumn, dataIndex: 'category', width: 128, ellipsis: true, fixed: 'left' },
   { ...BrandColumn, dataIndex: 'brand', width: 96, ellipsis: true, },
   { ...UntilColumn, dataIndex: 'unit', width: 64, ellipsis: true, },
   { ...OrderNumColumn, dataIndex: 'purchaseCountSum', width: 96, ellipsis: true, },
@@ -141,27 +141,27 @@ export const columnB2B = [
 ]
 //  送货计划管理，协同  SRM通用 column
 export const columnSRM = [
-  { ...MaterialNoColumn, dataIndex: 'skuId', width: 80, ellipsis: true, },
-  { ...MaterialNameColumn, dataIndex: 'productName', width: 192, ellipsis: true, },
-  { ...MaterialModelColumn, dataIndex: 'spec', width: 128, ellipsis: true, },
-  { ...ClassColumn, dataIndex: 'category', width: 96, ellipsis: true, },
-  { ...BrandColumn, dataIndex: 'brand', width: 96, ellipsis: true, },
-  { ...UntilColumn, dataIndex: 'unit', width: 64, ellipsis: true, },
-  { ...OrderNumColumn, dataIndex: 'purchaseCountSum', width: 96, ellipsis: true, },
+  { ...MaterialNoColumn, dataIndex: 'skuId', width: 80, ellipsis: true,  fixed: 'left' },
+  { ...MaterialNameColumn, dataIndex: 'productName', width: 192, ellipsis: true,  fixed: 'left' },
+  { ...MaterialModelColumn, dataIndex: 'spec', width: 128, ellipsis: true,  fixed: 'left' },
+  { ...ClassColumn, dataIndex: 'category', width: 96, ellipsis: true,  fixed: 'left' },
+  { ...BrandColumn, dataIndex: 'brand', width: 96, ellipsis: true, fixed: 'left' },
+  { ...UntilColumn, dataIndex: 'unit', width: 64, ellipsis: true, fixed: 'left' },
+  { ...OrderNumColumn, dataIndex: 'purchaseCountSum', width: 96, ellipsis: true, fixed: 'left' },
   { ...ConsigneeNumColumn, dataIndex: 'receiveCountSum', width: 96, ellipsis: true, },
   { ...TransitNumColumn, dataIndex: 'transitCountSum', width: 96, ellipsis: true, },
   { ...DeliveredNumColumn, dataIndex: 'leftCountSum', width: 96, ellipsis: true, },
-  { ...PlannedDeliveryNumColumn, dataIndex: 'planCountSum', width: 128, ellipsis: true, },
+  { ...PlannedDeliveryNumColumn, dataIndex: 'planCountSum', width: 96, ellipsis: true, },
 ]
 
 //  送货计划管理，协同 SRM，B2B 嵌套表格通用 column - 不带地址
 export const initExpandIconColumn = [
-  { ...OrderNoColumn, dataIndex: 'orderNo', width: 80, ellipsis: true, },
-  { ...OrderSummaryColumn, dataIndex: 'orderDigest', width: 90, ellipsis: true, },
-  { ...OrderCreatedAtColumn, dataIndex: 'createTime', width: 120, ellipsis: true, },
-  { ...OrderNumColumn, dataIndex: 'purchaseCount', width: 96, ellipsis: true, },
+  { ...OrderNoColumn, dataIndex: 'orderNo', width: 108, ellipsis: true, fixed: 'left' },
+  { ...OrderSummaryColumn, dataIndex: 'orderDigest', width: 400, ellipsis: true, fixed: 'left'  },
+  { ...OrderCreatedAtColumn, dataIndex: 'createTime', width: 180, ellipsis: true, fixed: 'left'  },
+  { ...OrderNumColumn, dataIndex: 'purchaseCount', width: 96, ellipsis: true, fixed: 'left'  },
   { ...ConsigneeNumColumn, dataIndex: 'receiveCount', width: 96, ellipsis: true, },
   { ...TransitNumColumn, dataIndex: 'transitCount', width: 96, ellipsis: true, },
   { ...DeliveredNumColumn, dataIndex: 'leftCount', width: 96, ellipsis: true, },
-  { ...PlannedDeliveryNumColumn, dataIndex: 'planCount', width: 128, ellipsis: true, },
+  { ...PlannedDeliveryNumColumn, dataIndex: 'planCount', width: 96, ellipsis: true, },
 ]

src/pages/order/deliveryNotice/receivingNoteQuery/details.tsx

@@ -9,7 +9,7 @@ import {
   BillsInfo, BuyerLabel, ConsigneeLabel, ConsigneeTimeLabel, DeliveryAbstractLabel, DeliveryAddrLabel,
   DeliveryDateLabel, DeliveryGood, DeliveryInfo, DeliveryNameLabel, DeliveryNoLabel,
   DeliveryPhoneLabel, DeliverySlefAddrLabel, DeliveryTimeLabel, DeliveryTypeLabel,
-  Distribution, ExternalRoamRecord, Harvest, LogisticsCarNoLabel, LogisticsCompanyLabel,
+  Distribution, ExternalRoamRecord, Harvest, HarvestMaterial, LogisticsCarNoLabel, LogisticsCompanyLabel,
   LogisticsInfo, LogisticsNoLabel, Material, NoteLabel, OutStatusLabel, ReceiptAbstractLabel, ReceivingAddress, ReceivingTime, ReNoLabel
 } from '../../constants'
 import { BaseInfo as ContentBox } from '@/components/BaseInfo'
@@ -63,9 +63,9 @@ const DeliveryNoticeManageSRMDetails: React.FC = () => {
             name: `${DeliveryGood.name}(${res?.data?.length})`
           }
         } : {
-          ...Material,
+          ...HarvestMaterial,
           ...{
-            name: `${Material.name}(${res?.data?.length})`
+            name: `${HarvestMaterial.name}(${res?.data?.length})`
           }
         },
       ]);
@@ -197,8 +197,8 @@ const DeliveryNoticeManageSRMDetails: React.FC = () => {
       </ContentBox>
 
 
-      <ContentBox title={info?.type ? DeliveryGood.name : Material.name}
-        id={info?.type ? DeliveryGood.key : Material.key} cols={1}>
+      <ContentBox title={info?.type ? DeliveryGood.name : HarvestMaterial.name}
+        id={info?.type ? DeliveryGood.key : HarvestMaterial.key} cols={1}>
 
         <Table
           columns={

src/pages/order/deliveryPlanCollaboration/deliveryPlanAwait/details.tsx

@@ -157,7 +157,7 @@ const DeliveryPlanCollaborationAwaitDetails: React.FC = () => {
       <BaseInfo className='mt-16' title={base_Info.name} id={base_Info.key}>
         <BaseInfo.BaseInfoItem label={PlanNumber}> {details?.planNo} </BaseInfo.BaseInfoItem>
 
-        <BaseInfo.BaseInfoItem label={BuyerLabel}> {details?.vendorMemberName} </BaseInfo.BaseInfoItem>
+        <BaseInfo.BaseInfoItem label={BuyerLabel}> {details?.buyerMemberName} </BaseInfo.BaseInfoItem>
 
         <BaseInfo.BaseInfoItem label={PlanSummary}> {details?.digest} </BaseInfo.BaseInfoItem>
 

src/pages/order/deliveryPlanCollaboration/deliveryPlanQuery/details.tsx

@@ -245,7 +245,7 @@ const DeliveryPlanCollaborationDetails: React.FC = () => {
         <BaseInfo className='mt-16' title={base_Info.name} id={base_Info.key}>
           <BaseInfo.BaseInfoItem label={PlanNumber}> {details?.planNo} </BaseInfo.BaseInfoItem>
 
-          <BaseInfo.BaseInfoItem label={BuyerLabel}> {details?.vendorMemberName} </BaseInfo.BaseInfoItem>
+          <BaseInfo.BaseInfoItem label={BuyerLabel}> {details?.buyerMemberName} </BaseInfo.BaseInfoItem>
 
           <BaseInfo.BaseInfoItem label={PlanSummary}> {details?.digest} </BaseInfo.BaseInfoItem>
 

src/pages/order/deliveryPlanManagement/deliveryPlanAwaitB2B/create.tsx

@@ -6,7 +6,7 @@
 import React, { useEffect, useRef, useState } from 'react'
 import AnchorPage, { AnchorsItem } from '@/components/AnchorPage'
 import { history } from 'umi'
-import { Circulation, ConfirmDeliveryPlan, Purchaser, SubmitDeliveryPlan, BaseInfo as base_Info, Supplier, PlanningCycle, SupplyMembersLabel, PlanSummary, Remarks, PlannedDelivery, DeliveryPlanText, DeliveryPlanRemark, CreateDeliveryPlanTitleB2B } from '../../constants'
+import { BaseInfo as base_Info, PlanningCycle, SupplyMembersLabel, PlanSummary, Remarks, PlannedDelivery, DeliveryPlanText, DeliveryPlanRemark, CreateDeliveryPlanTitleB2B } from '../../constants'
 import { Button, DatePicker, Form, Input, InputNumber, message, Space, Spin, Steps, Table } from 'antd'
 import { CaretDownOutlined, CaretRightOutlined, SaveOutlined } from '@ant-design/icons'
 import BaseInfo from '@/components/BaseInfo/BaseInfo'
@@ -51,7 +51,7 @@ const DeliveryPlanAwaitB2BCreate: React.FC = () => {
 
   const expandedRowRender = (record, index) => {
     return <div>
-      <Table rowKey={'orderProductId'} columns={expandIconColumn} dataSource={record.orders} pagination={false} tableLayout="fixed" />
+      <Table rowKey={'orderProductId'} columns={expandIconColumn} dataSource={record.orders} pagination={false} tableLayout="fixed" scroll={{ x: '100%' }}/>
     </div>
   }
 
@@ -124,7 +124,7 @@ const DeliveryPlanAwaitB2BCreate: React.FC = () => {
       const dates = getDayAll(startDate, endDate)
       datesRef.current = dates
       setSelectedDate([startDate, endDate])
-      const datesColumn = dates.map((item, i) => ({ title: item.substr(1), dataIndex: item, key: item, width: 120, align: 'center', }))
+      const datesColumn = dates.map((item, i) => ({ title: item.substr(1), dataIndex: item, key: item, width: 90, align: 'center', }))
       const datesExpandIconColumn = dates.map((item, i) => ({
         title: item.substr(1),
         dataIndex: item,
@@ -215,12 +215,6 @@ const DeliveryPlanAwaitB2BCreate: React.FC = () => {
           labelAlign='left'
           form={form}
         >
-          {/* <BaseInfo className='mt-0' title={Circulation.name} id={Circulation.key} cols={1}>
-            <Steps progressDot current={0}>
-              <Steps.Step title={Purchaser} description={SubmitDeliveryPlan} />
-              <Steps.Step title={Supplier} description={ConfirmDeliveryPlan} />
-            </Steps>
-          </BaseInfo> */}
           <BaseInfo className='mt-0' title={base_Info.name} id={base_Info.key}>
             <Form.Item
               {...formItemLayout}

src/pages/order/deliveryPlanManagement/deliveryPlanAwaitB2B/details.tsx

@@ -128,8 +128,8 @@ const DeliveryPlanAwaitB2BDetails: React.FC = () => {
         }
       >
         <Steps progressDot current={details?.outerStatus - 1}>
-          <Steps.Step title={Purchaser} description={SubmitDeliveryPlan} />
-          <Steps.Step title={Supplier} description={ConfirmDeliveryPlan} />
+          <Steps.Step title={SubmitDeliveryPlan} description={Purchaser} />
+          <Steps.Step title={ConfirmDeliveryPlan} description={Supplier} />
         </Steps>
       </BaseInfo>
       <BaseInfo className='mt-16' title={base_Info.name} id={base_Info.key}>

src/pages/order/deliveryPlanManagement/deliveryPlanAwaitB2B/update.tsx

@@ -199,8 +199,8 @@ const DeliveryPlanAwaitB2BUpdate: React.FC = () => {
             }
           >
             <Steps progressDot current={0}>
-              <Steps.Step title={Purchaser} description={SubmitDeliveryPlan} />
-              <Steps.Step title={Supplier} description={ConfirmDeliveryPlan} />
+              <Steps.Step title={SubmitDeliveryPlan} description={Purchaser} />
+              <Steps.Step title={ConfirmDeliveryPlan} description={Supplier} />
             </Steps>
           </BaseInfo>
           <BaseInfo className='mt-16' title={base_Info.name} id={base_Info.key}>

src/pages/order/deliveryPlanManagement/deliveryPlanAwaitSRM/create.tsx

@@ -51,7 +51,7 @@ const DeliveryPlanAwaitSRMCreate: React.FC = () => {
 
   const expandedRowRender = (record) => {
     return <div>
-      <Table rowKey={'orderProductId'} columns={expandIconColumn} dataSource={record.orders} pagination={false} tableLayout="fixed" />
+      <Table id='child' rowKey={'orderProductId'} columns={expandIconColumn} dataSource={record.orders} pagination={false} tableLayout="fixed" scroll={{ x: '100%' }}/>
     </div>
   }
 
@@ -126,7 +126,7 @@ const DeliveryPlanAwaitSRMCreate: React.FC = () => {
       const dates = getDayAll(startDate, endDate)
       datesRef.current = dates
       setSelectedDate([startDate, endDate])
-      const datesColumn = dates.map((item, i) => ({ title: item.substr(1), dataIndex: item, key: item, width: 120, align: 'center', }))
+      const datesColumn = dates.map((item, i) => ({ title: item.substr(1), dataIndex: item, key: item, width: 80, align: 'center', }))
       const datesExpandIconColumn = dates.map((item, i) => ({
         title: item.substr(1),
         dataIndex: item,
@@ -200,6 +200,16 @@ const DeliveryPlanAwaitSRMCreate: React.FC = () => {
     }
   }, [selectedDate, selectedMember])
 
+  useEffect(() => {
+    const parent = document.querySelector('#parent .ant-table-content')
+    parent?.addEventListener('scroll', () => {
+      const child = document.querySelector('#child .ant-table-content')
+      if (child) {
+        child.scrollLeft = parent.scrollLeft
+      }
+    })
+  },[])
+
   return (
     <Spin spinning={spinning}>
       <AnchorPage
@@ -256,6 +266,7 @@ const DeliveryPlanAwaitSRMCreate: React.FC = () => {
           </BaseInfo>
           <BaseInfo className='mt-16' title={PlanMaterial.name} id={PlanMaterial.key} cols={1}>
             <Table
+              id='parent'
               // defaultExpandAllRows
               rowKey={'planProductId'}
               columns={materialTableColumn}

src/pages/order/deliveryPlanManagement/deliveryPlanAwaitSRM/details.tsx

@@ -123,8 +123,8 @@ const DeliveryPlanAwaitSRMDetails: React.FC = () => {
         }
       >
         <Steps progressDot current={details?.outerStatus - 1}>
-          <Steps.Step title={Purchaser} description={SubmitDeliveryPlan} />
-          <Steps.Step title={Supplier} description={ConfirmDeliveryPlan} />
+          <Steps.Step title={SubmitDeliveryPlan} description={Purchaser} />
+          <Steps.Step title={ConfirmDeliveryPlan} description={Supplier} />
         </Steps>
       </BaseInfo>
       <BaseInfo className='mt-16' title={base_Info.name} id={base_Info.key}>

src/pages/order/deliveryPlanManagement/deliveryPlanAwaitSRM/update.tsx

@@ -200,8 +200,8 @@ const DeliveryPlanAwaitSRMUpdate: React.FC = () => {
             }
           >
             <Steps progressDot current={0}>
-              <Steps.Step title={Purchaser} description={SubmitDeliveryPlan} />
-              <Steps.Step title={Supplier} description={ConfirmDeliveryPlan} />
+              <Steps.Step title={SubmitDeliveryPlan} description={Purchaser} />
+              <Steps.Step title={ConfirmDeliveryPlan} description={Supplier} />
             </Steps>
           </BaseInfo>
           <BaseInfo className='mt-16' title={base_Info.name} id={base_Info.key}>

src/pages/order/deliveryPlanManagement/deliveryPlanQuery/update.tsx

@@ -202,8 +202,8 @@ const DeliveryPlanManagementUpdate: React.FC = () => {
             }
           >
             <Steps progressDot current={details?.status === 4 ? 1 : 0}>
-              <Steps.Step title={Purchaser} description={SubmitDeliveryPlan} />
-              <Steps.Step title={Supplier} description={ConfirmDeliveryPlan} />
+              <Steps.Step title={SubmitDeliveryPlan} description={Purchaser} />
+              <Steps.Step title={ConfirmDeliveryPlan} description={Supplier} />
             </Steps>
           </BaseInfo>
           <BaseInfo className='mt-16' title={base_Info.name} id={base_Info.key}>

src/pages/order/receivingNote/deliveryNoteQuery/details.tsx

@@ -6,7 +6,7 @@
 import React, { useEffect, useState } from 'react'
 import AnchorPage from '@/components/AnchorPage'
 import { BaseInfo as ListInfo } from '@/components/BaseInfo'
-import { BillsInfo, DeliveryInfo, DeliveryNoteQuery, LogisticsInfo, Material, Distribution, BaseInfo, ExternalRoamRecord } from '../../constants'
+import { BillsInfo, DeliveryInfo, DeliveryNoteQuery, LogisticsInfo, Material, Distribution, BaseInfo, ExternalRoamRecord, HarvestMaterial } from '../../constants'
 import { Table, Tag } from 'antd'
 import ReceiveNoteFacotry from '../../assets/handles/ReceiveNotePage'
 import { useLocation } from 'umi'
@@ -43,9 +43,9 @@ const DeliveryNoteDetails: React.FC = () => {
       setAnchors([
         ...anchors,
         {
-          ...Material,
+          ...HarvestMaterial,
           ...{
-            name: `${Material.name}(${values[1].totalCount})`
+            name: `${HarvestMaterial.name}(${values[1].totalCount})`
           }
         },
         {
@@ -67,7 +67,7 @@ const DeliveryNoteDetails: React.FC = () => {
       anchors={anchors}
     >
 
-      <ListInfo className='mt-15' title={BillsInfo.name} id={BillsInfo.key}>
+      <ListInfo className='mt-15' title={BillsInfo.name} id={BillsInfo.key} style={{ lineHeight: 3 }}>
         <ListInfoItem label='送货单编号'>
           {info?.deliveryNo}
         </ListInfoItem>
@@ -89,7 +89,7 @@ const DeliveryNoteDetails: React.FC = () => {
         </ListInfoItem>
       </ListInfo>
 
-      <ListInfo className='mt-15' title={Distribution.name} id={Distribution.key}>
+      <ListInfo className='mt-15' title={Distribution.name} id={Distribution.key} style={{ lineHeight: 3 }}>
         <ListInfoItem label='送货日期'>
           {info?.deliveryTime}
         </ListInfoItem>
@@ -107,7 +107,7 @@ const DeliveryNoteDetails: React.FC = () => {
         </ListInfoItem>
       </ListInfo>
 
-      <ListInfo className='mt-15' title={DeliveryInfo.name} id={DeliveryInfo.key}>
+      <ListInfo className='mt-15' title={DeliveryInfo.name} id={DeliveryInfo.key} style={{ lineHeight: 3 }}>
         <ListInfoItem label='发货时间'>
           {info?.sendTime}
         </ListInfoItem>
@@ -134,7 +134,7 @@ const DeliveryNoteDetails: React.FC = () => {
 
       </ListInfo>
 
-      <ListInfo className='mt-15' title={LogisticsInfo.name} id={LogisticsInfo.key}>
+      <ListInfo className='mt-15' title={LogisticsInfo.name} id={LogisticsInfo.key} style={{ lineHeight: 3 }}>
 
         <ListInfoItem label='配送方式'>
           {info?.deliveryType === 1 ? '物流' : '自提'}
@@ -153,7 +153,7 @@ const DeliveryNoteDetails: React.FC = () => {
         </ListInfoItem>
       </ListInfo>
 
-      <ListInfo className='mt-15' title={Material.name} id={Material.key} cols={1}>
+      <ListInfo className='mt-15' title={HarvestMaterial.name} id={HarvestMaterial.key} cols={1} >
         <Table
           rowKey={row => row.orderNo}
           columns={

src/pages/transaction/components/orderPayModal/index.less

@@ -90,15 +90,15 @@
       height: 48px;
       position: absolute;
       outline: none;
-      // color: transparent;
-      color: '#000';
+      color: transparent !important;
       caret-color: #EBECF0;
       font-size: 28px;
-      padding: 0 14px;
+      padding: 0 16px;
       letter-spacing: 48px;
       width: 336px;
       border: none;
       background: none;
+      background-color: transparent !important;
       -webkit-appearance: none;
       &:focus {
         border: none!important;

src/pages/transaction/purchaseRequisition/firstApprovedBill/index.tsx

@@ -73,6 +73,11 @@ const FirstApprovedBill: React.FC<FirstApprovedBillProps> = () => {
             }}
           />
         }
+        tableProps={{
+          scroll: {
+            x: '100%'
+          }
+        }}
       />
     </Card>
   </PageHeaderWrapper>

src/pages/transaction/purchaseRequisition/firstApprovedBill/model/useSelfTable.tsx

@@ -137,6 +137,7 @@ export const useSelfTable = () => {
           dataIndex: 'ctl',
           key: 'ctl',
           width: 128,
+          fixed: 'right',
           render: (text: any, record: any) => renderOptionButton(record)
         }
       ])

src/pages/transaction/purchaseRequisition/index.tsx

@@ -140,6 +140,8 @@ const RequestBill: React.FC<RequestBillProps> = () => {
           align: 'center',
           dataIndex: 'ctl',
           key: 'ctl',
+          width: 128,
+          fixed: 'right',
           render: (text, record) => renderOptionButton(record),
         },
       ]);
@@ -192,7 +194,9 @@ const RequestBill: React.FC<RequestBillProps> = () => {
             />
           }
           tableProps={{
-            scroll: 'y'
+            scroll: {
+              x: '100%'
+            }
           }}
         />
       </Card>

src/pages/transaction/purchaseRequisition/readyAddBill/index.tsx

@@ -98,6 +98,11 @@ const ReadyAddBill: React.FC<ReadyAddBillProps> = () => {
             }}
           />
         }
+        tableProps={{
+          scroll: {
+            x: '100%'
+          }
+        }}
       />
     </Card>
   </PageHeaderWrapper>

src/pages/transaction/purchaseRequisition/readyAddBill/model/useReadyAddBill.tsx

@@ -163,6 +163,7 @@ export const useSelfTable = () => {
           dataIndex: 'ctl',
           key: 'ctl',
           width: 128,
+          fixed: 'right',
           render: (text: any, record: any) => renderOptionButton(record)
         }
       ])

src/pages/transaction/purchaseRequisition/readySubmitBill/index.tsx

@@ -71,6 +71,11 @@ const ReadySubmitBill: React.FC<ReadySubmitBillProps> = () => {
             }}
           />
         }
+        tableProps={{
+          scroll: {
+            x: '100%'
+          }
+        }}
       />
 
     </Card>

src/pages/transaction/purchaseRequisition/readySubmitBill/model/useSelfTable.tsx

@@ -139,6 +139,7 @@ export const useSelfTable = () => {
           dataIndex: 'ctl',
           key: 'ctl',
           width: 128,
+          fixed: 'right',
           render: (text: any, record: any) => renderOptionButton(record)
         }
       ])

src/pages/transaction/purchaseRequisition/requisitionOrder/index.tsx

@@ -76,6 +76,11 @@ const RequisitionOrder: React.FC<RequisitionOrderProps> = () => {
             }}
           />
         }
+        tableProps={{
+          scroll: {
+            x: '100%'
+          }
+        }}
       />
       {/* <StandardTable
         fetchTableData={params => fetchTableData(params)}

src/pages/transaction/purchaseRequisition/requisitionOrder/model/useRequisitionOrder.tsx

@@ -139,6 +139,7 @@ export const useSelfTable = () => {
           dataIndex: 'ctl',
           key: 'ctl',
           width: 128,
+          fixed: 'right',
           render: (text: any, record: any) => renderOptionButton(record)
         }
       ])

src/pages/transaction/purchaseRequisition/secondApprovedBill/index.tsx

@@ -71,6 +71,11 @@ const SecondApprovedBill: React.FC<SecondApprovedBillProps> = () => {
             }}
           />
         }
+        tableProps={{
+          scroll: {
+            x: '100%'
+          }
+        }}
       />
     </Card>
   </PageHeaderWrapper>

src/pages/transaction/purchaseRequisition/secondApprovedBill/model/useSelfTable.tsx

@@ -138,6 +138,7 @@ export const useSelfTable = () => {
           dataIndex: 'ctl',
           key: 'ctl',
           width: 128,
+          fixed: 'right',
           render: (text: any, record: any) => renderOptionButton(record)
         }
       ])