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 | 42 +++++++++++++++++++++++++++++++++---------
1 files changed, 33 insertions(+), 9 deletions(-)
diff --git a/rsf-admin/src/page/orders/outStock/OutOrderList.jsx b/rsf-admin/src/page/orders/outStock/OutOrderList.jsx
index 8c1bb08..23ed27e 100644
--- a/rsf-admin/src/page/orders/outStock/OutOrderList.jsx
+++ b/rsf-admin/src/page/orders/outStock/OutOrderList.jsx
@@ -55,6 +55,7 @@
import OutOrderCreate from "./OutOrderCreate";
import AddIcon from '@mui/icons-material/Add';
import OutOrderModal from "./OutOrderModal";
+import PublicIcon from '@mui/icons-material/Public';
const StyledDatagrid = styled(DatagridConfigurable)(({ theme }) => ({
'& .css-1vooibu-MuiSvgIcon-root': {
@@ -141,7 +142,7 @@
<MyCreateButton onClick={() => { setManualDialog(true) }} />
<SelectColumnsButton preferenceKey='outStock' />
<ImportButton value={'asnOrderItem'} />
- <MyExportButton />
+ {/* <MyExportButton /> */}
</TopToolbar>
)}
perPage={DEFAULT_PAGE_SIZE}
@@ -150,11 +151,7 @@
sx={{ width: '100%' }}
preferenceKey='outStock'
bulkActionButtons={
- <>
- <MyExportButton />
- <BulkDeleteButton mutationMode={OPERATE_MODE}
- />
- </>}
+ <PublicTaskButton />}
rowClick={false}
expandSingle={true}
omit={['id', 'createTime', 'createBy', 'memo', 'poId', 'rleStatus$']}
@@ -177,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>
@@ -200,6 +196,35 @@
)
}
export default OutOrderList;
+
+
+const PublicTaskButton = () => {
+ const record = useRecordContext();
+ const { selectedIds, onUnselectItems } = useListContext();
+ const notify = useNotify();
+ const refresh = useRefresh();
+ const redirect = useRedirect();
+
+ 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 (
+ <Button
+ onClick={pubClick}
+ label={"toolbar.createWave"}
+ startIcon={<PublicIcon />}
+ />);
+}
const MyButton = ({ setCreateDialog, setmodalType }) => {
const record = useRecordContext();
@@ -241,7 +266,6 @@
const record = useRecordContext();
const notify = useNotify();
const refresh = useRefresh();
- console.log(record);
const cancelOrder = async () => {
const { data: { code, data, msg } } = await request.get(`/outStock/cancel/${record?.id}`);
--
Gitblit v1.9.1