From f0e887dd32942c7897567261b9de1d26f576dfb6 Mon Sep 17 00:00:00 2001
From: skyouc
Date: 星期三, 23 四月 2025 11:11:56 +0800
Subject: [PATCH] 通过单据创建DO单优化
---
rsf-admin/src/page/orders/delivery/DeliveryCreate.jsx | 3
rsf-admin/src/page/orders/outStock/OutOrderModal.jsx | 176 ++++++++++++++++++++++++----------
rsf-admin/src/page/orders/delivery/DeliveryItemEdit.jsx | 16 +--
rsf-admin/src/page/orders/delivery/DeliveryItemList.jsx | 39 ++-----
rsf-admin/src/page/orders/outStock/OutOrderList.jsx | 10 +
5 files changed, 149 insertions(+), 95 deletions(-)
diff --git a/rsf-admin/src/page/orders/delivery/DeliveryCreate.jsx b/rsf-admin/src/page/orders/delivery/DeliveryCreate.jsx
index 6f78fbe..0a740c4 100644
--- a/rsf-admin/src/page/orders/delivery/DeliveryCreate.jsx
+++ b/rsf-admin/src/page/orders/delivery/DeliveryCreate.jsx
@@ -99,6 +99,8 @@
source="type"
optionValue="value"
parse={v => v}
+ validate={required()}
+
/>
<AutocompleteInput
choices={business}
@@ -106,6 +108,7 @@
label="table.field.asnOrder.wkType"
source="wkType"
optionValue="value"
+ validate={required()}
parse={v => v}
/>
<TextInput
diff --git a/rsf-admin/src/page/orders/delivery/DeliveryItemEdit.jsx b/rsf-admin/src/page/orders/delivery/DeliveryItemEdit.jsx
index 4eb91dc..4bd7cb7 100644
--- a/rsf-admin/src/page/orders/delivery/DeliveryItemEdit.jsx
+++ b/rsf-admin/src/page/orders/delivery/DeliveryItemEdit.jsx
@@ -100,17 +100,19 @@
<Typography variant="h6" gutterBottom>
{translate('common.edit.title.main')}
</Typography>
- <Stack direction='row' gap={2}>
+ <Stack direction='row' gap={2} sx={{ display: 'none' }}>
<NumberInput
label="table.field.deliveryItem.deliveryId"
source="deliveryId"
- autoFocus
+ readOnly
/>
<TextInput
label="table.field.deliveryItem.platItemId"
source="platItemId"
parse={v => v}
/>
+ </Stack>
+ <Stack direction='row' gap={2}>
<TextInput
label="table.field.deliveryItem.matnrCode"
source="matnrCode"
@@ -121,14 +123,13 @@
source="matnrName"
parse={v => v}
/>
- </Stack>
- <Stack direction='row' gap={2}>
<TextInput
label="table.field.deliveryItem.fieldsIndex"
source="fieldsIndex"
parse={v => v}
/>
-
+ </Stack>
+ <Stack direction='row' gap={2}>
<TextInput
label="table.field.deliveryItem.unit"
source="unit"
@@ -142,11 +143,6 @@
<NumberInput
label="table.field.deliveryItem.qty"
source="qty"
- validate={required()}
- />
- <NumberInput
- label="table.field.deliveryItem.nromQty"
- source="nromQty"
validate={required()}
/>
</Stack>
diff --git a/rsf-admin/src/page/orders/delivery/DeliveryItemList.jsx b/rsf-admin/src/page/orders/delivery/DeliveryItemList.jsx
index 3116dd7..ffdd284 100644
--- a/rsf-admin/src/page/orders/delivery/DeliveryItemList.jsx
+++ b/rsf-admin/src/page/orders/delivery/DeliveryItemList.jsx
@@ -33,17 +33,14 @@
DeleteButton,
useGetOne,
useGetRecordId,
+ SimpleForm,
} from 'react-admin';
import { Box, Typography, Card, Stack } from '@mui/material';
import { styled } from '@mui/material/styles';
import DeliveryItemCreate from "./DeliveryItemCreate";
-import EmptyData from "../../components/EmptyData";
import MyCreateButton from "../../components/MyCreateButton";
-import MyExportButton from '../../components/MyExportButton';
import PageDrawer from "../../components/PageDrawer";
-import MyField from "../../components/MyField";
-import { PAGE_DRAWER_WIDTH, OPERATE_MODE, DEFAULT_PAGE_SIZE } from '@/config/setting';
-import * as Common from '@/utils/common';
+import { PAGE_DRAWER_WIDTH, OPERATE_MODE, DEFAULT_ITEM_PAGE_SIZE } from '@/config/setting';
import DeliveryItemEdit from "./DeliveryItemEdit";
const StyledDatagrid = styled(DatagridConfigurable)(({ theme }) => ({
@@ -53,33 +50,21 @@
'& .RaDatagrid-row': {
cursor: 'auto'
},
- '& .column-name': {
- },
'& .opt': {
- width: 200
+ width: 150
},
}));
const filters = [
<SearchInput source="condition" alwaysOn />,
- <DateInput label='common.time.after' source="timeStart" alwaysOn />,
- <DateInput label='common.time.before' source="timeEnd" alwaysOn />,
-
- <NumberInput source="deliveryId" label="table.field.deliveryItem.deliveryId" />,
+ <DateInput label='common.time.after' source="timeStart" />,
+ <DateInput label='common.time.before' source="timeEnd" />,
<TextInput source="platItemId" label="table.field.deliveryItem.platItemId" />,
<TextInput source="matnrCode" label="table.field.deliveryItem.matnrCode" />,
<TextInput source="matnrName" label="table.field.deliveryItem.matnrName" />,
- <TextInput source="fieldsIndex" label="table.field.deliveryItem.fieldsIndex" />,
- <TextInput source="unit" label="table.field.deliveryItem.unit" />,
- <NumberInput source="anfme" label="table.field.deliveryItem.anfme" />,
- <NumberInput source="qty" label="table.field.deliveryItem.qty" />,
- <NumberInput source="nromQty" label="table.field.deliveryItem.nromQty" />,
- <NumberInput source="printQty" label="table.field.deliveryItem.printQty" />,
<TextInput source="splrName" label="table.field.deliveryItem.splrName" />,
<TextInput source="splrCode" label="table.field.deliveryItem.splrCode" />,
<TextInput source="splrBatch" label="table.field.deliveryItem.splrBatch" />,
-
- <TextInput label="common.field.memo" source="memo" />,
<SelectInput
label="common.field.status"
source="status"
@@ -115,17 +100,17 @@
title={"menu.deliveryItem"}
empty={false}
filters={filters}
- filter={{deliveryId: doId}}
+ filter={{ deliveryId: doId }}
sort={{ field: "create_time", order: "desc" }}
actions={(
<TopToolbar>
<FilterButton />
<MyCreateButton onClick={() => { setCreateDialog(true) }} />
<SelectColumnsButton preferenceKey='deliveryItem' />
- <MyExportButton />
+ {/* <MyExportButton /> */}
</TopToolbar>
)}
- perPage={DEFAULT_PAGE_SIZE}
+ perPage={DEFAULT_ITEM_PAGE_SIZE}
>
<StyledDatagrid
preferenceKey='deliveryItem'
@@ -136,7 +121,7 @@
}}
expand={false}
expandSingle={true}
- omit={['id', 'createTime','deliveryId','fieldsIndex','qty', 'printQty', 'nromQty', 'createBy', 'memo']}
+ omit={['id', 'createTime', 'deliveryId', 'fieldsIndex', 'qty', 'printQty', 'nromQty', 'createBy', 'memo']}
>
<NumberField source="id" />
<NumberField source="deliveryId" label="table.field.deliveryItem.deliveryId" />
@@ -152,9 +137,9 @@
<TextField source="splrName" label="table.field.deliveryItem.splrName" />
<TextField source="splrCode" label="table.field.deliveryItem.splrCode" />
<TextField source="splrBatch" label="table.field.deliveryItem.splrBatch" />
- <TextField source="updateBy$" label="common.field.updateBy" />
+ <TextField source="updateBy$" label="common.field.updateBy" />
<DateField source="updateTime" label="common.field.updateTime" showTime />
- <TextField source="createBy$" label="common.field.createBy" />
+ <TextField source="createBy$" label="common.field.createBy" />
<DateField source="createTime" label="common.field.createTime" showTime />
<BooleanField source="statusBool" label="common.field.status" sortable={false} />
<TextField source="memo" label="common.field.memo" sortable={false} />
@@ -163,7 +148,7 @@
</WrapperField>
</StyledDatagrid>
</List>
- <DeliveryItemEdit
+ <DeliveryItemEdit
open={editDialog}
setOpen={setEditDialog}
record={select}
diff --git a/rsf-admin/src/page/orders/outStock/OutOrderList.jsx b/rsf-admin/src/page/orders/outStock/OutOrderList.jsx
index 489b6d2..8c1bb08 100644
--- a/rsf-admin/src/page/orders/outStock/OutOrderList.jsx
+++ b/rsf-admin/src/page/orders/outStock/OutOrderList.jsx
@@ -121,7 +121,6 @@
<Box display="flex">
<List
resource="outStock"
- storeKey='outStock'
sx={{
flexGrow: 1,
transition: (theme) =>
@@ -138,7 +137,7 @@
actions={(
<TopToolbar>
<FilterButton />
- <CreateByOrderButton setCreateDialog={setCreateDialog}/>
+ <CreateByOrderButton setCreateDialog={setCreateDialog} />
<MyCreateButton onClick={() => { setManualDialog(true) }} />
<SelectColumnsButton preferenceKey='outStock' />
<ImportButton value={'asnOrderItem'} />
@@ -183,7 +182,10 @@
</WrapperField>
</StyledDatagrid>
</List>
- <OutOrderCreate open={manualDialog} setOpen={setManualDialog} />
+ <OutOrderCreate
+ open={manualDialog}
+ setOpen={setManualDialog}
+ />
<OutOrderModal
open={createDialog}
setOpen={setCreateDialog}
@@ -219,7 +221,7 @@
)
}
-const CreateByOrderButton = ({setCreateDialog}) => {
+const CreateByOrderButton = ({ setCreateDialog }) => {
const record = useRecordContext();
const notify = useNotify();
const refresh = useRefresh();
diff --git a/rsf-admin/src/page/orders/outStock/OutOrderModal.jsx b/rsf-admin/src/page/orders/outStock/OutOrderModal.jsx
index d793c99..ac8a896 100644
--- a/rsf-admin/src/page/orders/outStock/OutOrderModal.jsx
+++ b/rsf-admin/src/page/orders/outStock/OutOrderModal.jsx
@@ -33,10 +33,17 @@
ReferenceArrayInput,
AutocompleteInput,
DeleteButton,
+ Form,
+ SaveButton,
+ useRefresh,
} 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 SaveIcon from '@mui/icons-material/Save';
+
+
const StyledDatagrid = styled(DatagridConfigurable)(({ theme }) => ({
'& .css-1vooibu-MuiSvgIcon-root': {
height: '.9em'
@@ -79,7 +86,9 @@
const OutOrderModal = (props) => {
const { open, setOpen, record } = props;
const translate = useTranslate();
+ const [params, setParams] = useState({});
const [drawerVal, setDrawerVal] = useState(false);
+ const refresh = useRefresh();
const handleClose = (event, reason) => {
if (reason !== "backdropClick") {
@@ -107,61 +116,120 @@
<DialogCloseButton onClose={handleClose} />
</Box>
</DialogTitle>
- <DialogContent>
- <List
- resource="deliveryItem"
- storeKey='selectDelivery'
- sx={{
- flexGrow: 1,
- transition: (theme) =>
- theme.transitions.create(['all'], {
- duration: theme.transitions.duration.enteringScreen,
- }),
- marginRight: drawerVal ? `${PAGE_DRAWER_WIDTH}px` : 0,
- }}
- title={"menu.delivery"}
- empty={false}
- sort={{ field: "create_time", order: "desc" }}
- actions={(
- <TopToolbar>
- <></>
- </TopToolbar>
- )}
- perPage={DEFAULT_PAGE_SIZE}
- >
- <StyledDatagrid
- preferenceKey='deliveryItem'
- bulkActionButtons={() => <></>}
- rowClick={(id, resource, record) => false}
- expand={false}
- expandSingle={true}
- omit={['id', 'createTime', 'createBy', 'memo', 'workQty', 'startTime', 'endTime', 'updateBy', 'createTime']}
- >
- <NumberField source="id" />
- <TextField source="matnrCode" label="table.field.deliveryItem.matnrCode" />
- <TextField source="matnrName" 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" />
- <TextField source="splrBatch" label="table.field.deliveryItem.splrBatch" />
- <TextField source="updateBy$" label="common.field.updateBy" />
- <DateField source="updateTime" label="common.field.updateTime" showTime />
- <TextField source="createBy$" label="common.field.createBy" />
- <DateField source="createTime" label="common.field.createTime" showTime />
- <BooleanField source="statusBool" label="common.field.status" sortable={false} />
- <TextField source="memo" label="common.field.memo" sortable={false} />
- </StyledDatagrid>
- </List>
- </DialogContent>
- <DialogActions sx={{ position: 'sticky', bottom: 0, backgroundColor: 'background.paper', zIndex: 1000 }}>
- {/* <Toolbar sx={{ width: '100%', justifyContent: 'space-between' }} >
- <Button disabled={disabled} onClick={handleSubmit} variant="contained" startIcon={<SaveIcon />}>
- {translate('toolbar.confirm')}
- </Button>
- </Toolbar> */}
- </DialogActions>
- </Dialog>
+ <Grid container rowSpacing={2} columnSpacing={2}>
+ <DialogContent>
+ <Grid item sx={24}>
+ <List
+ resource="deliveryItem"
+ sx={{
+ flexGrow: 1,
+ transition: (theme) =>
+ theme.transitions.create(['all'], {
+ duration: theme.transitions.duration.enteringScreen,
+ }),
+ marginRight: drawerVal ? `${PAGE_DRAWER_WIDTH}px` : 0,
+ }}
+ storeKey='selectDelivery'
+ queryOptions={params}
+ filters={<CustomFilter />}
+ empty={false}
+ sort={{ field: "create_time", order: "desc" }}
+ actions={(
+ <TopToolbar>
+ <></>
+ </TopToolbar>
+ )}
+ perPage={DEFAULT_PAGE_SIZE}
+ >
+ <StyledDatagrid
+ preferenceKey='deliveryItem'
+ bulkActionButtons={() => <></>}
+ rowClick={(id, resource, record) => false}
+ expand={false}
+ expandSingle={true}
+ omit={['id', 'createTime', 'createBy', 'memo', 'workQty', 'startTime', 'endTime', 'updateBy', 'createTime']}
+ >
+ <NumberField source="id" />
+ <TextField source="matnrCode" label="table.field.deliveryItem.matnrCode" />
+ <TextField source="matnrName" 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" />
+ <TextField source="splrBatch" label="table.field.deliveryItem.splrBatch" />
+ <TextField source="updateBy$" label="common.field.updateBy" />
+ <DateField source="updateTime" label="common.field.updateTime" showTime />
+ <TextField source="createBy$" label="common.field.createBy" />
+ <DateField source="createTime" label="common.field.createTime" showTime />
+ <BooleanField source="statusBool" label="common.field.status" sortable={false} />
+ <TextField source="memo" label="common.field.memo" sortable={false} />
+ </StyledDatagrid>
+ </List>
+ </Grid>
+ </DialogContent>
+ </Grid>
+ </Dialog >
)
}
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);
+ };
+
+ 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>
+ );
+};
--
Gitblit v1.9.1