Merge branch 'fix418' into 'v2-220418'

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)
         }
       ])