From d21beda7b1897612a4013406121ccb93fc784b1f Mon Sep 17 00:00:00 2001 From: skyouc Date: 星期六, 07 六月 2025 17:02:37 +0800 Subject: [PATCH] 出库单下发执行功能完善 --- rsf-admin/src/page/orders/outStock/OutStockPublic.jsx | 25 ++++++++++++++++--------- 1 files changed, 16 insertions(+), 9 deletions(-) diff --git a/rsf-admin/src/page/orders/outStock/OutStockPublic.jsx b/rsf-admin/src/page/orders/outStock/OutStockPublic.jsx index 21b87bf..fac542a 100644 --- a/rsf-admin/src/page/orders/outStock/OutStockPublic.jsx +++ b/rsf-admin/src/page/orders/outStock/OutStockPublic.jsx @@ -36,16 +36,14 @@ SimpleForm, required, Form, - SaveButton, - useRefresh, - useGetList, - useGetOne, } from 'react-admin'; import { PAGE_DRAWER_WIDTH, OPERATE_MODE, DEFAULT_PAGE_SIZE, DEFAULT_ITEM_PAGE_SIZE } from '@/config/setting'; import { styled } from '@mui/material/styles'; import { DataGrid } from '@mui/x-data-grid'; import request from '@/utils/request'; import DictSelect from "../../components/DictSelect"; +import ConfirmationNumberOutlinedIcon from '@mui/icons-material/ConfirmationNumberOutlined'; +import CloseSharpIcon from '@mui/icons-material/CloseSharp'; const StyledDatagrid = styled(DatagridConfigurable)(({ theme }) => ({ '& .css-1vooibu-MuiSvgIcon-root': { @@ -54,16 +52,19 @@ '& .RaDatagrid-row': { cursor: 'auto' }, + '& .column-maktx': { + width: 200 + } })); const OutStockPublic = (props) => { const { record, open } = props; + const notify = useNotify(); + const translate = useTranslate(); const [formData, setFormData] = useState({ orderId: record?.id }); - const translate = useTranslate(); - useEffect(() => { getWaveRule() }, [formData, open]) @@ -72,7 +73,7 @@ if (formData.waveId == null && formData.waveId == undefined) { return } - const res = await request.post('/outStock/order/getOutTaskItems', {...formData}); + const res = await request.post('/outStock/order/getOutTaskItems', { ...formData }); if (res?.data?.code === 200) { setRows(res.data.data.records) } else { @@ -127,7 +128,9 @@ empty={false} filter={{ asnId: record?.id, deleted: 0 }} sort={{ field: "create_time", order: "desc" }} - actions={false} + actions={( + <SelectColumnsButton preferenceKey='outStock' /> + )} perPage={DEFAULT_ITEM_PAGE_SIZE} > <LinearProgress @@ -137,7 +140,7 @@ preferenceKey='outStockItem' bulkActionButtons={false} rowClick={false} - omit={['id', 'splrName', 'qty', 'poCode']} + omit={['id', 'splrName', 'qty', 'poCode', 'workQty']} > <NumberField source="id" /> <TextField source="asnCode" label="table.field.outStockItem.asnCode" /> @@ -170,6 +173,10 @@ disableRowSelectionOnClick /> </Box> + <Box sx={{ textAlign: 'center' }}> + <Button label="toolbar.close" variant="outlined" size="medium" startIcon={<CloseSharpIcon />} sx={{ margin: '3.5em' }} /> + <Button label="toolbar.confirm" variant="contained" size="medium" startIcon={<ConfirmationNumberOutlinedIcon />} /> + </Box> </Card> </Grid> </Grid> -- Gitblit v1.9.1