Merge branch '0518' into 'jinfa-0518'

src/pages/transaction/purchaseRequisition/increaseRequisition/components/viewInventory/index.tsx

 import React, { useEffect, useRef, useState } from 'react';
 import { useIntl } from 'umi'
-import { Button, Tabs, Drawer } from 'antd';
+import { Button, Drawer, Table } from 'antd';
 import { ISchemaFormActions, ISchemaFormAsyncActions } from '@formily/antd';
-import TableLayout from './table';
-import { fetchOrderApi } from '../../apis';
 import { ColumnType } from 'antd/lib/table/interface';
 import moment from 'moment';
+import { getProductStockGetStock } from '@/services/ProductV2Api';
 
 export interface MemberModalTableProps {
   schemaAction?: ISchemaFormActions | ISchemaFormAsyncActions,
@@ -37,7 +36,7 @@ const ViewInventory: React.FC<MemberModalTableProps> = (props: MemberModalTableP
   const { schemaAction, currentRef, confirmModal, productRef, setLik, record } = props;
   const ref = useRef<any>({})
   const [visible, setVisible] = useState<boolean>(false);
-
+  const [dataSource, setDataSource] = useState<any[]>([])
   const format = (text, fmt?: string) => {
     return <>{moment(text).format(fmt || "YYYY-MM-DD HH:mm:ss")}</>
   }
@@ -151,6 +150,21 @@ const ViewInventory: React.FC<MemberModalTableProps> = (props: MemberModalTableP
     },
   ]
 
+  const fetchData = () => {
+    getProductStockGetStock({ matnr: record?.code || record?.productNo, werks: record?.factory, productGlobalId: record?.globalMQID }).then(res => {
+      if (res.code !== 1000) {
+        return
+      }
+      setDataSource(res.data)
+    })
+  }
+
+  useEffect(() => {
+    if (visible) {
+      fetchData()
+    }
+  }, [visible])
+
   return (
     <Drawer
       destroyOnClose
@@ -160,16 +174,12 @@ const ViewInventory: React.FC<MemberModalTableProps> = (props: MemberModalTableP
       onClose={() => setVisible(false)}
       width={900}
     >
-      <TableLayout
-        currRef={ref}
-        customKey='memberId'
-        effects='name'
+      <Table
         columns={columns}
-        schema={{}}
+        dataSource={dataSource}
         scroll={{
           x: '100vw'
         }}
-        fetchdata={(params) => fetchOrderApi.getProductStock({ ...params, matnr: record?.code || record?.productNo, werks: record?.factory, productGlobalId: record?.globalMQID })}
       />
     </Drawer>
   )