From d086af5559dba52095d23e425be87d8f11f24814 Mon Sep 17 00:00:00 2001
From: zjj <3272660260@qq.com>
Date: 星期四, 17 七月 2025 16:32:47 +0800
Subject: [PATCH] #菜单、po单
---
rsf-admin/src/page/orders/outStock/OutStockPublic.jsx | 59 ++++++++++++++++++++++++++++++-----------------------------
1 files changed, 30 insertions(+), 29 deletions(-)
diff --git a/rsf-admin/src/page/orders/outStock/OutStockPublic.jsx b/rsf-admin/src/page/orders/outStock/OutStockPublic.jsx
index b5748f6..2ad0ae0 100644
--- a/rsf-admin/src/page/orders/outStock/OutStockPublic.jsx
+++ b/rsf-admin/src/page/orders/outStock/OutStockPublic.jsx
@@ -58,14 +58,16 @@
'& .column-maktx': {
width: 200
},
- '& .RaBulkActionsToolbar-toolbar': {
- display: 'none'
- }
+
+ mt: '60px'
+ // '& .RaBulkActionsToolbar-toolbar': {
+ // display: 'none'
+ // }
}));
const OutStockPublic = (props) => {
- const { record, open, setOpen } = props;
+ const { record, open, setOpen, setManualDialog } = props;
const notify = useNotify();
const gridRef = useGridApiRef();
const [rows, setRows] = useState([]);
@@ -88,19 +90,19 @@
}, [selectedMatnr])
- const handleRowClick = (id, resource, record) => {
- setRowSelectedIds(prev =>
- prev.includes(id)
- ? prev.filter(item => item !== id) // 鍙栨秷閫夋嫨
- : [...prev, id] // 娣诲姞閫夋嫨
- );
+ const ComfirmButton = () => {
+ const { selectedIds, data } = useListContext();
+ const handleRowClick = () => {
+ const ids = data.filter(item => selectedIds.includes(item.id)).map(item => item.id);
+ setRowSelectedIds(ids);
+ const mas = data.filter(item => selectedIds.includes(item.id)).map(item => item.matnrCode);
+ //璁剧疆搴撲綅淇℃伅绛涢�夋潯浠�
+ setSelectedMatnr(mas);
+ }
- //璁剧疆搴撲綅淇℃伅绛涢�夋潯浠�
- setSelectedMatnr(prev =>
- prev.includes(record?.matnrCode)
- ? prev.filter(item => item !== record?.matnrCode) // 鍙栨秷閫夋嫨
- : [...prev, record?.matnrCode] // 娣诲姞閫夋嫨
- );
+ return (
+ <Button label="toolbar.confirm" size="medium" onClick={handleRowClick} />
+ )
};
const handleClickOpen = () => {
@@ -130,10 +132,8 @@
};
useEffect(() => {
- if (open) {
- getWaveRule()
- }
- }, [open, formData])
+ getWaveRule()
+ }, [open])
const getWaveRule = async () => {
if (formData.waveId == null && formData.waveId == undefined) {
@@ -141,7 +141,7 @@
}
const { data: { code, data, msg } } = await request.post('/outStock/order/getOutTaskItems', { ...formData });
if (code === 200) {
- setRows(data)
+ // setRows(data)
setFetchRows(data)
} else {
notify(msg);
@@ -188,9 +188,10 @@
}}
title={"menu.outStockItem"}
empty={false}
- filter={{ asnId: record?.id, deleted: 0 }}
+ filter={{ orderId: record?.id, deleted: 0 }}
sort={{ field: "create_time", order: "desc" }}
actions={false}
+ pagination={false}
perPage={DEFAULT_ITEM_PAGE_SIZE}
>
<LinearProgress
@@ -199,10 +200,10 @@
<StyledDatagrid
storeKey={"outStockPublic"}
preferenceKey='outStockItem'
- bulkActionButtons={<></>}
- rowClick={handleRowClick}
- selectedIds={rowSelectedIds}
- omit={['id', 'splrName', 'qty', 'poCode', 'workQty']}
+ bulkActionButtons={<>
+ <ComfirmButton />
+ </>}
+ omit={['id', 'splrName', 'qty', 'poCode',]}
>
<NumberField source="id" />
<TextField source="asnCode" label="table.field.outStockItem.asnCode" />
@@ -269,7 +270,8 @@
{ field: 'batch', headerName: '鎵规', width: 90 },
{ field: 'unit', headerName: '鍗曚綅', width: 60 },
{ field: 'outQty', headerName: '鍑哄簱鏁伴噺', width: 110, },
- { field: 'anfme', headerName: '搴撳瓨鏁伴噺', width: 110,
+ {
+ field: 'anfme', headerName: '搴撳瓨鏁伴噺', width: 110,
renderCell: (params) => (
<OutStockAnfme value={params.value} />
)
@@ -449,11 +451,10 @@
}
return (
<ConfirmButton
- label="toolbar.confirm"
+ label="toolbar.allComfirm"
variant="contained"
size="medium"
onConfirm={submit}
- startIcon={<ConfirmationNumberOutlinedIcon />}
/>
)
}
--
Gitblit v1.9.1