From 626147af938796224b8e81c0a30073a561af5642 Mon Sep 17 00:00:00 2001
From: verou <857149855@qq.com>
Date: 星期二, 25 三月 2025 13:55:39 +0800
Subject: [PATCH] Merge branch 'front' into devlop
---
rsf-admin/src/page/basicInfo/loc/LocList.jsx | 39 ++++++++++++++++++++++++++++++++-------
1 files changed, 32 insertions(+), 7 deletions(-)
diff --git a/rsf-admin/src/page/basicInfo/loc/LocList.jsx b/rsf-admin/src/page/basicInfo/loc/LocList.jsx
index 8acee82..0d2f8e5 100644
--- a/rsf-admin/src/page/basicInfo/loc/LocList.jsx
+++ b/rsf-admin/src/page/basicInfo/loc/LocList.jsx
@@ -33,12 +33,12 @@
DeleteButton,
useRefresh,
Button,
- useList
+ useList,
} from 'react-admin';
import { Box, Typography, Card, Stack } from '@mui/material';
import { styled } from '@mui/material/styles';
import LocCreate from "./LocCreate";
-import MatnrModal from "./MatnrModal";
+import BindModal from "./BindModal";
import EmptyData from "../../components/EmptyData";
import DynamicField from "../../components/DynamicField";
import MyCreateButton from "../../components/MyCreateButton";
@@ -70,14 +70,39 @@
},
'& .RaDatagrid-headerCell': {
textAlign: 'left'
+ },
+ '& .RaDatagrid-rowCell': {
+ textAlign: 'left'
}
}));
const filters = [
<SearchInput source="condition" alwaysOn />,
- <TextInput source="warehouseId$" label="table.field.loc.warehouseId" />,
- <TextInput source="areaId$" label="table.field.loc.areaId" />,
+ <ReferenceInput
+ source="warehouseId"
+ label="table.field.loc.warehouseId"
+ reference="warehouse"
+ alwaysOn
+ >
+ <AutocompleteInput
+ label="table.field.loc.warehouseId"
+ optionText="name"
+ filterToQuery={(val) => ({ name: val })}
+ />
+ </ReferenceInput>,
+ <ReferenceInput
+ source="areaId"
+ label="table.field.loc.areaId"
+ reference="warehouseAreas"
+ alwaysOn
+ >
+ <AutocompleteInput
+ label="table.field.loc.areaId"
+ optionText="name"
+ filterToQuery={(val) => ({ name: val })}
+ />
+ </ReferenceInput>,
<TextInput source="code" label="table.field.loc.code" />,
<TextInput source="type" label="table.field.loc.type" />,
<TextInput source="name" label="table.field.loc.name" />,
@@ -148,7 +173,7 @@
bulkActionButtons={
<>
<BatchButton />
- <MatnrButton />
+ <BindButton />
<SubzoneButton />
<BulkDeleteButton />
</>
@@ -285,7 +310,7 @@
)
}
-const MatnrButton = () => {
+const BindButton = () => {
const record = useRecordContext();
const notify = useNotify();
const refresh = useRefresh();
@@ -299,7 +324,7 @@
<LinkIcon />
</Button>
- <MatnrModal
+ <BindModal
open={createDialog}
setOpen={setCreateDialog}
/>
--
Gitblit v1.9.1