From 669fe984048785873c20fbd0ce8abb3cd52c1fce Mon Sep 17 00:00:00 2001 From: skyouc Date: 星期二, 29 四月 2025 15:22:24 +0800 Subject: [PATCH] 新增出库单优化 --- rsf-admin/src/page/orders/outStock/OutOrderList.jsx | 15 +++++++++++---- 1 files changed, 11 insertions(+), 4 deletions(-) diff --git a/rsf-admin/src/page/orders/outStock/OutOrderList.jsx b/rsf-admin/src/page/orders/outStock/OutOrderList.jsx index 23ed27e..2b181eb 100644 --- a/rsf-admin/src/page/orders/outStock/OutOrderList.jsx +++ b/rsf-admin/src/page/orders/outStock/OutOrderList.jsx @@ -56,6 +56,7 @@ import AddIcon from '@mui/icons-material/Add'; import OutOrderModal from "./OutOrderModal"; import PublicIcon from '@mui/icons-material/Public'; +import SelectMatnrModal from "./SelectMatnrModal"; const StyledDatagrid = styled(DatagridConfigurable)(({ theme }) => ({ '& .css-1vooibu-MuiSvgIcon-root': { @@ -139,7 +140,7 @@ <TopToolbar> <FilterButton /> <CreateByOrderButton setCreateDialog={setCreateDialog} /> - <MyCreateButton onClick={() => { setManualDialog(true) }} /> + <MyCreateButton onClick={() => { setManualDialog(true); setmodalType(0) }} /> <SelectColumnsButton preferenceKey='outStock' /> <ImportButton value={'asnOrderItem'} /> {/* <MyExportButton /> */} @@ -173,12 +174,19 @@ <BillStatusField cellClassName="status" source="exceStatus" label="table.field.outStock.exceStatus" /> <TextField source="memo" label="common.field.memo" sortable={false} /> <WrapperField cellClassName="opt" label="common.field.opt" > + <MyButton setCreateDialog={setManualDialog} setmodalType={setmodalType} /> <EditButton label="toolbar.detail" icon={(<DetailsIcon />)}></EditButton> <CancelButton /> </WrapperField> </StyledDatagrid> </List> - <OutOrderCreate + {/* <OutOrderCreate + open={manualDialog} + setOpen={setManualDialog} + /> */} + <SelectMatnrModal + asnId={modalType} + billReload={billReload} open={manualDialog} setOpen={setManualDialog} /> @@ -190,8 +198,7 @@ title='AsnOrder Detail' drawerVal={drawerVal} setDrawerVal={setDrawerVal} - > - </PageDrawer> + /> </Box > ) } -- Gitblit v1.9.1