From 2db2c1328008ae399d8d7af56c9c6dc67a47bce8 Mon Sep 17 00:00:00 2001
From: zc <zyzc>
Date: 星期六, 01 十一月 2025 11:22:58 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/devlop_whxrwms' into devlop_whxrwms
---
rsf-admin/src/page/orders/asnOrder/AsnWareModal.jsx | 38 ++++++++++++++++++++++++++++++--------
1 files changed, 30 insertions(+), 8 deletions(-)
diff --git a/rsf-admin/src/page/orders/asnOrder/AsnWareModal.jsx b/rsf-admin/src/page/orders/asnOrder/AsnWareModal.jsx
index 7667817..ce2e90b 100644
--- a/rsf-admin/src/page/orders/asnOrder/AsnWareModal.jsx
+++ b/rsf-admin/src/page/orders/asnOrder/AsnWareModal.jsx
@@ -12,6 +12,7 @@
Paper,
styled
} from '@mui/material';
+import { EDIT_MODE, DEFAULT_START_PAGE, DEFAULT_PAGE_SIZE, REFERENCE_INPUT_PAGESIZE } from '@/config/setting';
import DialogCloseButton from "../../components/DialogCloseButton";
import { useTranslate, useNotify, useRefresh } from 'react-admin';
import request from '@/utils/request';
@@ -28,7 +29,9 @@
setOpen(false);
}
};
-
+ const [page, setPage] = useState({ page: DEFAULT_START_PAGE, pageSize: DEFAULT_PAGE_SIZE });
+ const [rowCount, setRowCount] = useState(0);
+ const [isLoading, setIsLoading] = useState(false);
const [formData, setFormData] = useState({});
const [tableData, setTableData] = useState([]);
const [dyFields, setDyFields] = useState([]);
@@ -43,9 +46,9 @@
const reset = () => {
setFormData({
- name: '',
- code: '',
- groupId: 0
+ name: null,
+ code: null,
+ groupId: null
})
}
@@ -73,22 +76,26 @@
};
const getData = async () => {
+ setIsLoading(true)
const res = await request.post(`/matnr/page`, {
...formData,
- current: 1,
- pageSize: 100,
+ current: page?.page,
+ pageSize: page?.pageSize,
orderBy: "create_time desc"
});
if (res?.data?.code === 200) {
setTableData(res.data.data.records);
+ console.log(res.data);
+ setRowCount(res.data?.data.total)
} else {
notify(res.data.msg);
}
+ setIsLoading(false)
};
useEffect(() => {
getData();
- }, [open]);
+ }, [open, page]);
const handleSearch = () => {
getData()
@@ -156,6 +163,10 @@
<AsnWareModalTable
tableData={tableData}
setTableData={setTableData}
+ page={page}
+ rowCount={rowCount}
+ setPage={setPage}
+ isLoading={isLoading}
dyFields={dyFields}
setDyFields={setDyFields}
selectedRows={selectedRows}
@@ -175,7 +186,7 @@
};
export default AsnWareModal;
-const AsnWareModalTable = ({ tableData, setTableData, selectedRows, setSelectedRows, dyFields, setDyFields }) => {
+const AsnWareModalTable = ({ tableData, isLoading, page, setPage, rowCount, setTableData, selectedRows, setSelectedRows, dyFields, setDyFields }) => {
const translate = useTranslate();
const notify = useNotify();
const [columns, setColumns] = useState([
@@ -236,6 +247,17 @@
disableColumnMenu={true}
disableColumnSorting
disableMultipleColumnsSorting
+ rowCount={rowCount}
+ paginationMode="server"
+ paginationModel={page}
+ onPaginationModelChange={setPage}
+ loading={isLoading}
+ slotProps={{
+ loadingOverlay: {
+ variant: 'linear-progress',
+ noRowsVariant: 'linear-progress',
+ },
+ }}
/>
</div>
);
--
Gitblit v1.9.1