From e9365986c7adc1eb233a6ca6ead7a91899290e75 Mon Sep 17 00:00:00 2001
From: skyouc
Date: 星期三, 28 五月 2025 12:56:13 +0800
Subject: [PATCH] 组托历史档优化
---
rsf-admin/src/page/orders/outStock/OutOrderModal.jsx | 172 +++++++++++++++++++++++++++++++++------------------------
1 files changed, 100 insertions(+), 72 deletions(-)
diff --git a/rsf-admin/src/page/orders/outStock/OutOrderModal.jsx b/rsf-admin/src/page/orders/outStock/OutOrderModal.jsx
index ac8a896..5bc8cc3 100644
--- a/rsf-admin/src/page/orders/outStock/OutOrderModal.jsx
+++ b/rsf-admin/src/page/orders/outStock/OutOrderModal.jsx
@@ -36,13 +36,16 @@
Form,
SaveButton,
useRefresh,
+ useGetList,
} from 'react-admin';
import DialogCloseButton from "../../components/DialogCloseButton";
import { styled } from '@mui/material/styles';
import { PAGE_DRAWER_WIDTH, OPERATE_MODE, DEFAULT_PAGE_SIZE } from '@/config/setting';
-import { Grid, Stack } from "@mui/system";
+import { Grid, 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 }) => ({
'& .css-1vooibu-MuiSvgIcon-root': {
@@ -50,14 +53,6 @@
},
'& .RaDatagrid-row': {
cursor: 'auto'
- },
- '& .column-name': {
- },
- '& .opt': {
- width: 220
- },
- '& .wkType': {
- width: 110
},
'& .status': {
width: 90
@@ -95,6 +90,77 @@
setOpen(false);
}
};
+ const CustomFilter = () => {
+ 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
+ }));
+ };
+
+ const handleSubmit = (event) => {
+ setParams(formValues)
+ };
+
+ return (
+ <Form>
+ <Grid container rowSpacing={2} columnSpacing={2} >
+ <Stack>
+ <TextInput
+ source="condition"
+ label="common.action.search"
+ resettable
+ defaultValue={params?.condition}
+ onChange={handleChange} />
+ </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>
+ <TextInput
+ source="matnrCode"
+ label="table.field.deliveryItem.matnrCode"
+ defaultValue={params?.matnrCode}
+ resettable
+ onChange={handleChange} />
+ </Stack>
+ <Stack>
+ <TextInput
+ source="splrName"
+ label="table.field.deliveryItem.splrName"
+ defaultValue={params?.splrName}
+ resettable
+ onChange={handleChange} />
+ </Stack>
+ </Grid>
+ <DialogActions>
+ <Toolbar sx={{ width: '100%', justifyContent: 'end' }} >
+ <SaveButton onClick={handleSubmit} label={"toolbar.query"} />
+ </Toolbar>
+ </DialogActions>
+ </Form>
+ );
+ };
return (
<Dialog
open={open}
@@ -103,7 +169,7 @@
aria-hidden
fullWidth
disableRestoreFocus
- maxWidth="lg"
+ maxWidth="xl"
>
<DialogTitle id="form-dialog-title" sx={{
position: 'sticky',
@@ -129,9 +195,8 @@
}),
marginRight: drawerVal ? `${PAGE_DRAWER_WIDTH}px` : 0,
}}
- storeKey='selectDelivery'
- queryOptions={params}
filters={<CustomFilter />}
+ queryOptions={{ meta: { ...params } }}
empty={false}
sort={{ field: "create_time", order: "desc" }}
actions={(
@@ -142,14 +207,16 @@
perPage={DEFAULT_PAGE_SIZE}
>
<StyledDatagrid
+ sx={{ height: '400' }}
preferenceKey='deliveryItem'
- bulkActionButtons={() => <></>}
+ 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" />
@@ -173,63 +240,24 @@
export default OutOrderModal;
-const CustomFilter = () => {
- const { filterValues, setFilters } = useListContext('deliveryItem');
- const [formValues, setFormValues] = useState(filterValues);
-
- const handleChange = (event) => {
- setFormValues(formValues => ({
- ...formValues,
- [event.target.name]: event.target.value
- }));
- };
-
- const handleSubmit = (event) => {
- console.log('---------->');
- console.log(formValues);
- event.preventDefault();
- setFilters(formValues, null, true);
- };
+const AddOutStockButton = (props) => {
+ const { setOpen } = props;
+ const { selectedIds, onUnselectItems } = useListContext();
+ const notify = useNotify();
+ const confirm = async (event) => {
+ const res = await request.post(`/outStock/generate/orders`, { ids: selectedIds });
+ if (res?.data?.code === 200) {
+ notify(res.data.msg);
+ } else {
+ notify(res.data.msg);
+ }
+ onUnselectItems();
+ setOpen(false);
+ }
return (
- <Form>
- <Grid container rowSpacing={2} columnSpacing={2} >
- <Stack>
- <TextInput
- source="matnrName"
- label="table.field.deliveryItem.matnrName"
- resettable
- onChange={handleChange}
- />
- </Stack>
- <Stack>
- <TextInput
- source="matnrCode"
- label="table.field.deliveryItem.matnrCode"
- resettable
- onChange={handleChange} />
- </Stack>
- <Stack>
- <TextInput
- source="splrName"
- label="table.field.deliveryItem.splrName"
- resettable
- onChange={handleChange} />
- </Stack>
- <Stack>
- <TextInput
- source="splrName"
- label="table.field.deliveryItem.splrName"
- resettable
- onChange={handleChange} />
- </Stack>
- </Grid>
- <DialogActions>
- <Toolbar sx={{ width: '100%', justifyContent: 'end' }} >
- <SaveButton onClick={handleSubmit}/>
- {/* <Button variant="contained" label="toolbar.confirm" startIcon={<SaveIcon />} onClick={handleSubmit} /> */}
- </Toolbar>
- </DialogActions>
- </Form>
- );
-};
+ <Button label={"toolbar.confirmSelect"} onClick={confirm}>
+ <CheckCircleIcon />
+ </Button>
+ )
+}
\ No newline at end of file
--
Gitblit v1.9.1