From 6d6a1b26fcdad0ae743a6e99c8f321969bd2345f Mon Sep 17 00:00:00 2001
From: skyouc
Date: 星期一, 12 五月 2025 16:26:16 +0800
Subject: [PATCH] Merge branch 'devlop' of http://47.97.1.152:5880/r/wms-master into devlop
---
rsf-admin/src/page/basicInfo/locAreaMat/LocAreaMatPanel.jsx | 33 +++++++++++++++++++++++----------
1 files changed, 23 insertions(+), 10 deletions(-)
diff --git a/rsf-admin/src/page/basicInfo/locAreaMat/LocAreaMatPanel.jsx b/rsf-admin/src/page/basicInfo/locAreaMat/LocAreaMatPanel.jsx
index 330640d..977bfab 100644
--- a/rsf-admin/src/page/basicInfo/locAreaMat/LocAreaMatPanel.jsx
+++ b/rsf-admin/src/page/basicInfo/locAreaMat/LocAreaMatPanel.jsx
@@ -15,6 +15,8 @@
import ConfirmModal from "@/page/components/ConfirmModal";
import { DataGrid } from '@mui/x-data-grid';
import request from '@/utils/request';
+import { haveChildren } from '@/utils/common';
+
const LocAreaMatPanel = () => {
const record = useRecordContext();
@@ -59,6 +61,8 @@
}
const [parmas, setParmas] = useState({
+ current: 1,
+ pageSize: 99,
areaMatId: record.id,
locTypeId: '',
groupId: '',
@@ -92,7 +96,7 @@
const { data: { code, data, msg } } = await request.get(`/locAreaMatRela/groups/${record.id}`);
if (code === 200) {
- setMatnrTree(data || [])
+ setMatnrTree(haveChildren(data) || [])
} else {
notify(msg);
}
@@ -102,7 +106,7 @@
const { data: { code, data, msg } } = await request.get(`/locAreaMatRela/locType/${record.id}`);
if (code === 200) {
- setLocTree(data || [])
+ setLocTree(haveChildren(data) || [])
} else {
notify(msg);
}
@@ -131,7 +135,14 @@
disableColumnMenu={true}
disableColumnSorting
disableMultipleColumnsSorting
- columnBufferPx={100}
+ initialState={{
+ pagination: {
+ paginationModel: {
+ pageSize: 10,
+ },
+ },
+ }}
+ pageSizeOptions={[10]}
/>
</Grid>
</Grid>
@@ -235,6 +246,7 @@
const handleNodeSelect = (event, nodeId) => {
event.stopPropagation();
parmas.groupId = nodeId;
+ parmas.locTypeId = '';
setParmas(parmas)
reload()
};
@@ -252,8 +264,8 @@
<RichTreeView
expansionTrigger="iconContainer"
- checkboxSelection
- multiSelect
+ // checkboxSelection
+ // multiSelect
items={matnrTree}
apiRef={apiRef}
getItemId={(item) => item.id}
@@ -371,6 +383,7 @@
const handleNodeSelect = (event, nodeId) => {
event.stopPropagation();
parmas.locTypeId = nodeId;
+ parmas.groupId = '';
setParmas(parmas)
reload()
};
@@ -388,17 +401,17 @@
<RichTreeView
expansionTrigger="iconContainer"
- checkboxSelection
- multiSelect
items={locTree}
apiRef={apiRef}
- selectedItems={selectedItems}
getItemId={(item) => item.id}
getItemLabel={(item) => item.name}
defaultExpandedItems={['grid']}
- onSelectedItemsChange={handleSelectedItemsChange}
- onItemSelectionToggle={handleItemSelectionToggle}
onItemClick={handleNodeSelect}
+ onItemSelectionToggle={handleItemSelectionToggle}
+ // checkboxSelection
+ // multiSelect
+ selectedItems={selectedItems}
+ onSelectedItemsChange={handleSelectedItemsChange}
/>
<BindLocModal
--
Gitblit v1.9.1