From c2e6fd5492f27d9c3a9786905036bb89518c7c4a Mon Sep 17 00:00:00 2001
From: skyouc
Date: 星期二, 25 三月 2025 10:45:16 +0800
Subject: [PATCH] Merge branch 'front' into devlop
---
rsf-admin/src/page/basicInfo/locAreaMat/LocAreaMatPanel.jsx | 29 ++++++++++++++++++-----------
1 files changed, 18 insertions(+), 11 deletions(-)
diff --git a/rsf-admin/src/page/basicInfo/locAreaMat/LocAreaMatPanel.jsx b/rsf-admin/src/page/basicInfo/locAreaMat/LocAreaMatPanel.jsx
index 6ca9111..18268bf 100644
--- a/rsf-admin/src/page/basicInfo/locAreaMat/LocAreaMatPanel.jsx
+++ b/rsf-admin/src/page/basicInfo/locAreaMat/LocAreaMatPanel.jsx
@@ -25,10 +25,10 @@
const columns = [
{ field: 'id', headerName: 'ID', width: 100 },
{ field: 'areaId$', headerName: translate('table.field.locAreaMatRela.areaId'), width: 100 },
+ { field: 'locId$', headerName: translate('table.field.locAreaMatRela.locId'), width: 100 },
+ { field: 'locTypeId$', headerName: translate('table.field.locAreaMatRela.locTypeId'), width: 100 },
{ field: 'matnrId$', headerName: translate('table.field.locAreaMatRela.matnrId'), width: 100 },
{ field: 'groupId$', headerName: translate('table.field.locAreaMatRela.groupId'), width: 100 },
- { field: 'locTypeId$', headerName: translate('table.field.locAreaMatRela.locTypeId'), width: 100 },
- { field: 'locId$', headerName: translate('table.field.locAreaMatRela.locId'), width: 100 },
{
field: 'action',
headerName: '鎿嶄綔',
@@ -60,6 +60,8 @@
const [parmas, setParmas] = useState({
areaMatId: record.id,
+ locTypeId: '',
+ groupId: '',
});
const [tableData, setTableData] = useState([]);
@@ -111,12 +113,12 @@
<Grid container spacing={2}>
{/* 鐗╂枡鍒嗙粍 */}
<Grid item xs={2}>
- <MatnrTree matnrTree={matnrTree} setParmas={setParmas} reload={reload} />
+ <MatnrTree matnrTree={matnrTree} parmas={parmas} setParmas={setParmas} reload={reload} />
</Grid>
{/* 搴撲綅绫诲瀷 */}
<Grid item xs={2}>
- <LocTree locTree={locTree} setParmas={setParmas} reload={reload} />
+ <LocTree locTree={locTree} parmas={parmas} setParmas={setParmas} reload={reload} />
</Grid>
{/* 鍏朵粬鍐呭 */}
@@ -139,7 +141,7 @@
export default LocAreaMatPanel;
-const MatnrTree = ({ matnrTree, setParmas, reload }) => {
+const MatnrTree = ({ matnrTree, parmas, setParmas, reload }) => {
const record = useRecordContext();
const notify = useNotify();
@@ -214,7 +216,7 @@
groupId: selectedItems
}
- const res = await request.post(`/locAreaMatRela/group/remove/`, parmas);
+ const res = await request.post(`/locAreaMatRela/group/remove`, parmas);
if (res?.data?.code === 200) {
reload()
notify(res.data.msg);
@@ -231,7 +233,10 @@
};
const handleNodeSelect = (event, nodeId) => {
- event.stopPropagation()
+ event.stopPropagation();
+ parmas.groupId = nodeId;
+ setParmas(parmas)
+ reload()
};
return (
@@ -251,10 +256,10 @@
multiSelect
items={matnrTree}
apiRef={apiRef}
- selectedItems={selectedItems}
getItemId={(item) => item.id}
getItemLabel={(item) => item.name}
defaultExpandedItems={['grid']}
+ selectedItems={selectedItems}
onSelectedItemsChange={handleSelectedItemsChange}
onItemSelectionToggle={handleItemSelectionToggle}
onItemClick={handleNodeSelect}
@@ -276,7 +281,7 @@
)
}
-const LocTree = ({ locTree, setParmas, reload }) => {
+const LocTree = ({ locTree, setParmas, parmas, reload }) => {
const record = useRecordContext();
const notify = useNotify();
@@ -364,8 +369,10 @@
};
const handleNodeSelect = (event, nodeId) => {
- // event.preventDefault();
- console.log(nodeId)
+ event.stopPropagation();
+ parmas.locTypeId = nodeId;
+ setParmas(parmas)
+ reload()
};
return (
--
Gitblit v1.9.1