From 028ef9e952135505871d7a05d9c3af3a8fbcce79 Mon Sep 17 00:00:00 2001
From: skyouc
Date: 星期日, 11 五月 2025 15:18:59 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/devlop' into devlop
---
rsf-admin/src/page/orders/outStock/OutOrderModal.jsx | 34 +++++++++++++++++++++-------------
1 files changed, 21 insertions(+), 13 deletions(-)
diff --git a/rsf-admin/src/page/orders/outStock/OutOrderModal.jsx b/rsf-admin/src/page/orders/outStock/OutOrderModal.jsx
index 95b48a6..5bc8cc3 100644
--- a/rsf-admin/src/page/orders/outStock/OutOrderModal.jsx
+++ b/rsf-admin/src/page/orders/outStock/OutOrderModal.jsx
@@ -54,14 +54,6 @@
'& .RaDatagrid-row': {
cursor: 'auto'
},
- '& .column-name': {
- },
- '& .opt': {
- width: 220
- },
- '& .wkType': {
- width: 110
- },
'& .status': {
width: 90
},
@@ -102,9 +94,10 @@
const { filterValues, setFilters, refetch } = useListContext('deliveryItem');
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
}));
};
@@ -125,10 +118,22 @@
</Stack>
<Stack>
<TextInput
+ source="deliveryCode"
+ label="table.field.deliveryItem.deliveryCode"
+ defaultValue={params?.matnrName}
+ onChange={handleChange}
+ resettable
+
+ />
+ </Stack>
+ <Stack>
+ <TextInput
source="matnrName"
label="table.field.deliveryItem.matnrName"
defaultValue={params?.matnrName}
onChange={handleChange}
+ resettable
+
/>
</Stack>
<Stack>
@@ -136,6 +141,7 @@
source="matnrCode"
label="table.field.deliveryItem.matnrCode"
defaultValue={params?.matnrCode}
+ resettable
onChange={handleChange} />
</Stack>
<Stack>
@@ -143,6 +149,7 @@
source="splrName"
label="table.field.deliveryItem.splrName"
defaultValue={params?.splrName}
+ resettable
onChange={handleChange} />
</Stack>
</Grid>
@@ -162,7 +169,7 @@
aria-hidden
fullWidth
disableRestoreFocus
- maxWidth="lg"
+ maxWidth="xl"
>
<DialogTitle id="form-dialog-title" sx={{
position: 'sticky',
@@ -200,14 +207,16 @@
perPage={DEFAULT_PAGE_SIZE}
>
<StyledDatagrid
+ sx={{ height: '400' }}
preferenceKey='deliveryItem'
- bulkActionButtons={<AddOutStockButton setOpen={setOpen}/>}
+ bulkActionButtons={<AddOutStockButton setOpen={setOpen} />}
rowClick={(id, resource, record) => false}
expand={false}
expandSingle={true}
omit={['id', 'createTime', 'createBy', 'memo', 'workQty', 'startTime', 'endTime', 'updateBy', 'createTime']}
>
<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="unit" label="table.field.deliveryItem.unit" />
@@ -236,8 +245,7 @@
const { selectedIds, onUnselectItems } = useListContext();
const notify = useNotify();
const confirm = async (event) => {
- console.log(selectedIds);
- const res = await request.post(`/outStock/generate/orders`, {ids: selectedIds});
+ const res = await request.post(`/outStock/generate/orders`, { ids: selectedIds });
if (res?.data?.code === 200) {
notify(res.data.msg);
} else {
--
Gitblit v1.9.1