From 40d9cd510741a098bd52cbe22a5f9e5528f45abc Mon Sep 17 00:00:00 2001 From: skyouc Date: 星期三, 23 四月 2025 17:09:01 +0800 Subject: [PATCH] # 新增 1. 通过单据新增出库单功能 2. 新增生成出库单接口 --- rsf-admin/src/page/orders/outStock/OutOrderModal.jsx | 196 +++++++++++++++++++++++++++++++++++------------- 1 files changed, 142 insertions(+), 54 deletions(-) diff --git a/rsf-admin/src/page/orders/outStock/OutOrderModal.jsx b/rsf-admin/src/page/orders/outStock/OutOrderModal.jsx index d793c99..95b48a6 100644 --- a/rsf-admin/src/page/orders/outStock/OutOrderModal.jsx +++ b/rsf-admin/src/page/orders/outStock/OutOrderModal.jsx @@ -33,10 +33,20 @@ ReferenceArrayInput, AutocompleteInput, DeleteButton, + 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, 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': { height: '.9em' @@ -79,12 +89,70 @@ 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") { setOpen(false); } + }; + const CustomFilter = () => { + const { filterValues, setFilters, refetch } = useListContext('deliveryItem'); + const [formValues, setFormValues] = useState(filterValues); + const handleChange = (event) => { + 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="matnrName" + label="table.field.deliveryItem.matnrName" + defaultValue={params?.matnrName} + onChange={handleChange} + /> + </Stack> + <Stack> + <TextInput + source="matnrCode" + label="table.field.deliveryItem.matnrCode" + defaultValue={params?.matnrCode} + onChange={handleChange} /> + </Stack> + <Stack> + <TextInput + source="splrName" + label="table.field.deliveryItem.splrName" + defaultValue={params?.splrName} + onChange={handleChange} /> + </Stack> + </Grid> + <DialogActions> + <Toolbar sx={{ width: '100%', justifyContent: 'end' }} > + <SaveButton onClick={handleSubmit} label={"toolbar.query"} /> + </Toolbar> + </DialogActions> + </Form> + ); }; return ( <Dialog @@ -107,61 +175,81 @@ <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, + }} + filters={<CustomFilter />} + queryOptions={{ meta: { ...params } }} + empty={false} + sort={{ field: "create_time", order: "desc" }} + actions={( + <TopToolbar> + <></> + </TopToolbar> + )} + perPage={DEFAULT_PAGE_SIZE} + > + <StyledDatagrid + preferenceKey='deliveryItem' + 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="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 AddOutStockButton = (props) => { + const { setOpen } = props; + const { selectedIds, onUnselectItems } = useListContext(); + const notify = useNotify(); + const confirm = async (event) => { + console.log(selectedIds); + 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 ( + <Button label={"toolbar.confirmSelect"} onClick={confirm}> + <CheckCircleIcon /> + </Button> + ) +} \ No newline at end of file -- Gitblit v1.9.1