From ae2b0889d677be95535349c389bfb041b18a27ef Mon Sep 17 00:00:00 2001 From: skyouc Date: 星期二, 22 七月 2025 20:09:53 +0800 Subject: [PATCH] 盘点功能优化 --- rsf-admin/src/page/orders/check/CheckOrderPub.jsx | 26 +++++++++++++++++++------- 1 files changed, 19 insertions(+), 7 deletions(-) diff --git a/rsf-admin/src/page/orders/check/CheckOrderPub.jsx b/rsf-admin/src/page/orders/check/CheckOrderPub.jsx index 54babf4..1a0c75a 100644 --- a/rsf-admin/src/page/orders/check/CheckOrderPub.jsx +++ b/rsf-admin/src/page/orders/check/CheckOrderPub.jsx @@ -73,7 +73,11 @@ const getLocs = async (ids) => { const { data: { code, data, msg } } = await request.post('/check/locs/' + ids); if (code === 200) { + console.log('----->'); + console.log(data); setRows(data) + const matnrs = selectedMatnr.filter(item => data.some(bigData => bigData.matnrCode === item)); + // setSelectedMatnr(matnrs) } else { notify(msg); } @@ -87,7 +91,7 @@ const mas = data.filter(item => selectedIds.includes(item.id)).map(item => item.matnrCode); //璁剧疆搴撲綅淇℃伅绛涢�夋潯浠� setSelectedMatnr(mas); - // onUnselectItems() + onUnselectItems() } return ( record.exceStatus != 3 ? <><Button label="toolbar.confirm" size="medium" onClick={handleRowClick} /></> : <></> @@ -222,7 +226,7 @@ </Box> <Box sx={{ textAlign: 'center' }}> <CloseButton setOpen={setOpen} /> - <SubmitButton selectedIds={selectedIds} setSelectedIds={setSelectedIds} rowSelectedIds={rowSelectedIds} gridRef={gridRef} record={record} /> + <SubmitButton selectedIds={selectedIds} setOpen={setOpen} setSelectedIds={setSelectedIds} selectedMatnr={selectedMatnr} rowSelectedIds={rowSelectedIds} gridRef={gridRef} record={record} /> </Box> </Card> </Grid> @@ -420,25 +424,33 @@ //鎻愪氦鎸夐挳 -const SubmitButton = ({ selectedIds, setSelectedIds, rowSelectedIds, gridRef, record }) => { +const SubmitButton = ({ selectedIds, setSelectedIds, rowSelectedIds, gridRef, record, setOpen, selectedMatnr }) => { const notify = useNotify(); const refresh = useRefresh(); + const translate = useTranslate(); const redirect = useRedirect(); const submit = async () => { const items = gridRef.current?.getSortedRows(); 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 =>{ + 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); + + let params = records.filter(record => record?.items.length > 0); + + const { data: { code, data, msg } } = await request.post('/check/generate/tasks', params); if (code == 200) { refresh(); - redirect("/task") + setOpen(false) } else { notify(msg); } -- Gitblit v1.9.1