From 32876c7968257d3a63d31ae898c8c635bda0156b Mon Sep 17 00:00:00 2001
From: skyouc
Date: 星期一, 28 四月 2025 13:23:45 +0800
Subject: [PATCH] Merge branch 'devlop' of http://47.97.1.152:5880/r/wms-master into devlop
---
rsf-admin/src/page/orders/outStock/OutOrderList.jsx | 32 ++++++++++++++------------------
1 files changed, 14 insertions(+), 18 deletions(-)
diff --git a/rsf-admin/src/page/orders/outStock/OutOrderList.jsx b/rsf-admin/src/page/orders/outStock/OutOrderList.jsx
index 58bb153..23ed27e 100644
--- a/rsf-admin/src/page/orders/outStock/OutOrderList.jsx
+++ b/rsf-admin/src/page/orders/outStock/OutOrderList.jsx
@@ -151,12 +151,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$']}
@@ -179,8 +174,7 @@
<TextField source="memo" label="common.field.memo" sortable={false} />
<WrapperField cellClassName="opt" label="common.field.opt" >
<EditButton label="toolbar.detail" icon={(<DetailsIcon />)}></EditButton>
- {/* <MyButton setCreateDialog={setCreateDialog} setmodalType={setmodalType} /> */}
- <CancelButton></CancelButton>
+ <CancelButton />
</WrapperField>
</StyledDatagrid>
</List>
@@ -207,11 +201,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 +252,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