From d7bb8c43b17253b46c6a466cff5545e8b4bcaad3 Mon Sep 17 00:00:00 2001
From: skyouc
Date: 星期二, 10 六月 2025 11:10:46 +0800
Subject: [PATCH] Merge branch 'devlop' of http://47.97.1.152:5880/r/wms-master into devlop
---
rsf-admin/src/page/orders/outStock/OutOrderModal.jsx | 28 ++++++++--------------------
1 files changed, 8 insertions(+), 20 deletions(-)
diff --git a/rsf-admin/src/page/orders/outStock/OutOrderModal.jsx b/rsf-admin/src/page/orders/outStock/OutOrderModal.jsx
index 9adfabe..01283a6 100644
--- a/rsf-admin/src/page/orders/outStock/OutOrderModal.jsx
+++ b/rsf-admin/src/page/orders/outStock/OutOrderModal.jsx
@@ -13,7 +13,6 @@
ExportButton,
BulkDeleteButton,
WrapperField,
- Toolbar,
useRecordContext,
useTranslate,
useNotify,
@@ -45,7 +44,6 @@
import { Grid, margin, Stack, width } from "@mui/system";
import request from '@/utils/request';
import SaveIcon from '@mui/icons-material/Save';
-import debounce from "lodash/debounce";
import CheckCircleIcon from '@mui/icons-material/CheckCircle';
const StyledDatagrid = styled(DatagridConfigurable)(({ theme }) => ({
@@ -104,17 +102,15 @@
}
};
const CustomFilter = () => {
- const { filterValues, setFilters, refetch } = useListContext('deliveryItem');
+ const { filterValues, setFilters, refetch } = useListContext();
const [formValues, setFormValues] = useState(filterValues);
const handleChange = (event) => {
if (event.target == undefined || event.target == null) { return }
setFormValues(formValues => ({
...formValues,
- [event.target.name]: event.target.value
+ [event.target.name]: event.target.value,
}));
};
-
-
const handleSubmit = (event) => {
setParams(formValues)
@@ -135,20 +131,18 @@
<TextInput
source="deliveryCode"
label="table.field.deliveryItem.deliveryCode"
- defaultValue={params?.matnrName}
+ defaultValue={params?.deliveryCode}
onChange={handleChange}
resettable
-
/>
</Stack>
<Stack>
<TextInput
- source="matnrName"
+ source="maktx"
label="table.field.deliveryItem.matnrName"
- defaultValue={params?.matnrName}
+ defaultValue={params?.maktx}
onChange={handleChange}
resettable
-
/>
</Stack>
<Stack>
@@ -201,7 +195,7 @@
<DialogContent>
<Grid item sx={24}>
<List
- resource="deliveryItem"
+ resource="/deliveryItem/filters"
sx={{
flexGrow: 1,
transition: (theme) =>
@@ -223,13 +217,7 @@
>
<Box sx={{ position: 'relative', minHeight: "60vh", }}>
<LinearProgress
- sx={{
- height: "2px",
- position: 'absolute',
- top: 0,
- left: 0,
- right: 0,
- }}
+ sx={{ height: "2px", position: 'absolute', top: 0, left: 0, right: 0, }}
/>
<StyledDatagrid
preferenceKey='deliveryItem'
@@ -242,7 +230,7 @@
<NumberField source="id" />
<TextField source="deliveryCode" label="table.field.deliveryItem.deliveryCode" />
<TextField source="matnrCode" label="table.field.deliveryItem.matnrCode" />
- <TextField source="matnrName" label="table.field.deliveryItem.matnrName" />
+ <TextField source="maktx" label="table.field.deliveryItem.matnrName" />
<TextField source="unit" label="table.field.deliveryItem.unit" />
<NumberField source="anfme" label="table.field.deliveryItem.anfme" />
<TextField source="splrName" label="table.field.deliveryItem.splrName" />
--
Gitblit v1.9.1