From 5b79a154460d45ad32b0c34b23ae2f77cacb765b Mon Sep 17 00:00:00 2001 From: zjj <3272660260@qq.com> Date: 星期六, 19 七月 2025 14:03:43 +0800 Subject: [PATCH] #盘点pda --- rsf-admin/src/page/orders/check/CheckOrderPub.jsx | 32 +++++++++++++++++++++++--------- 1 files changed, 23 insertions(+), 9 deletions(-) diff --git a/rsf-admin/src/page/orders/check/CheckOrderPub.jsx b/rsf-admin/src/page/orders/check/CheckOrderPub.jsx index 61af609..e9d4ded 100644 --- a/rsf-admin/src/page/orders/check/CheckOrderPub.jsx +++ b/rsf-admin/src/page/orders/check/CheckOrderPub.jsx @@ -25,6 +25,7 @@ import ConfirmButton from '../../components/ConfirmButton'; import { Delete, Edit, Add } from '@mui/icons-material'; import CheckOrderSiteDialog from "./CheckOrderSiteDialog"; +import { map } from "lodash"; const StyledDatagrid = styled(DatagridConfigurable)(({ theme }) => ({ '& .css-1vooibu-MuiSvgIcon-root': { @@ -81,16 +82,15 @@ const ComfirmButton = () => { const { selectedIds, data, onUnselectItems } = useListContext(); const handleRowClick = () => { - const ids = data.filter(item => selectedIds.includes(item.id)).map(item => item.id); + const ids = data.filter(item => selectedIds.includes(item.id)); setRowSelectedIds(ids); const mas = data.filter(item => selectedIds.includes(item.id)).map(item => item.matnrCode); //璁剧疆搴撲綅淇℃伅绛涢�夋潯浠� setSelectedMatnr(mas); - onUnselectItems() + // onUnselectItems() } - return ( - <Button label="toolbar.confirm" size="medium" onClick={handleRowClick} /> + record.exceStatus != 3 ? <><Button label="toolbar.confirm" size="medium" onClick={handleRowClick} /></> : <></> ) }; @@ -222,7 +222,7 @@ </Box> <Box sx={{ textAlign: 'center' }}> <CloseButton setOpen={setOpen} /> - <SubmitButton selectedIds={selectedIds} setSelectedIds={setSelectedIds} gridRef={gridRef} record={record} /> + <SubmitButton selectedIds={selectedIds} setSelectedIds={setSelectedIds} rowSelectedIds={rowSelectedIds} gridRef={gridRef} record={record} /> </Box> </Card> </Grid> @@ -420,23 +420,37 @@ //鎻愪氦鎸夐挳 -const SubmitButton = ({ selectedIds, setSelectedIds, gridRef, record }) => { +const SubmitButton = ({ selectedIds, setSelectedIds, rowSelectedIds, gridRef, record }) => { const notify = useNotify(); const refresh = useRefresh(); + const translate = useTranslate(); const redirect = useRedirect(); const submit = async () => { const items = gridRef.current?.getSortedRows(); - const { data: { code, data, msg } } = await request.post('/outStock/generate/tasks', { items, outId: record?.id }); + let selctRecord = items.filter(item => selectedIds.includes(item?.id)); + if (selctRecord == undefined || selctRecord.length < 1) { + notify(translate('common.msg.locEmpty'), { type: 'error' }); + return + } + + //杩囨护锛屽皢搴撲綅娣诲姞鑷崇洏鐐瑰崟鏄庣粏涓� + const records = rowSelectedIds.map(map => { + return { + ...map, + items: selctRecord.filter(item => item.matnrCode == map.matnrCode) + } + }) + + const { data: { code, data, msg } } = await request.post('/check/generate/tasks', records); if (code == 200) { refresh(); - redirect("/task") } else { notify(msg); } } return ( <ConfirmButton - label="toolbar.allComfirm" + label="toolbar.confirmSelect" variant="contained" size="medium" onConfirm={submit} -- Gitblit v1.9.1