From e01c5a713793239e26b2e304fafd551affa4bcfc Mon Sep 17 00:00:00 2001
From: skyouc
Date: 星期二, 29 四月 2025 17:36:18 +0800
Subject: [PATCH] 波次任务下发功能优化
---
rsf-admin/src/page/orders/outStock/OutOrderList.jsx | 47 +++++++++++++++++++++++++----------------------
1 files changed, 25 insertions(+), 22 deletions(-)
diff --git a/rsf-admin/src/page/orders/outStock/OutOrderList.jsx b/rsf-admin/src/page/orders/outStock/OutOrderList.jsx
index 58bb153..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 /> */}
@@ -151,12 +152,7 @@
sx={{ width: '100%' }}
preferenceKey='outStock'
bulkActionButtons={
- <>
- <PublicTaskButton />
- <MyExportButton />
- <BulkDeleteButton mutationMode={OPERATE_MODE}
- />
- </>}
+ <PublicTaskButton />}
rowClick={false}
expandSingle={true}
omit={['id', 'createTime', 'createBy', 'memo', 'poId', 'rleStatus$']}
@@ -178,13 +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>
- {/* <MyButton setCreateDialog={setCreateDialog} setmodalType={setmodalType} /> */}
- <CancelButton></CancelButton>
+ <CancelButton />
</WrapperField>
</StyledDatagrid>
</List>
- <OutOrderCreate
+ {/* <OutOrderCreate
+ open={manualDialog}
+ setOpen={setManualDialog}
+ /> */}
+ <SelectMatnrModal
+ asnId={modalType}
+ billReload={billReload}
open={manualDialog}
setOpen={setManualDialog}
/>
@@ -196,8 +198,7 @@
title='AsnOrder Detail'
drawerVal={drawerVal}
setDrawerVal={setDrawerVal}
- >
- </PageDrawer>
+ />
</Box >
)
}
@@ -207,11 +208,21 @@
const PublicTaskButton = () => {
const record = useRecordContext();
const { selectedIds, onUnselectItems } = useListContext();
+ const notify = useNotify();
+ const refresh = useRefresh();
+ const redirect = useRedirect();
- const pubClick = (event) => {
+ const pubClick = async (event) => {
event.stopPropagation();
onUnselectItems();
-
+ const res = await request.post(`/outStock/generate/wave`, { ids: selectedIds });
+ if (res?.data?.code === 200) {
+ notify(res.data.msg);
+ redirect("/wave")
+ } else {
+ notify(res.data.msg);
+ }
+ refresh();
}
return (
@@ -248,16 +259,8 @@
const refresh = useRefresh();
const createByOrder = async (event) => {
- const {selectedIds, onUnselectItems} = useListContext();
event.stopPropagation();
setCreateDialog(true);
- const res = await request.post(`/outStock/generate/wave`, { ids: selectedIds });
- if (res?.data?.code === 200) {
- notify(res.data.msg);
- } else {
- notify(res.data.msg);
- }
-
}
return (
--
Gitblit v1.9.1