From c0a87b9244e1521c76b8a0dc70b922f6fc3e30a1 Mon Sep 17 00:00:00 2001
From: skyouc
Date: 星期四, 17 七月 2025 16:35:23 +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 | 10 ++++------
1 files changed, 4 insertions(+), 6 deletions(-)
diff --git a/rsf-admin/src/page/orders/outStock/OutOrderList.jsx b/rsf-admin/src/page/orders/outStock/OutOrderList.jsx
index bf9b7dc..47f94a0 100644
--- a/rsf-admin/src/page/orders/outStock/OutOrderList.jsx
+++ b/rsf-admin/src/page/orders/outStock/OutOrderList.jsx
@@ -115,6 +115,7 @@
const OutOrderList = (props) => {
const translate = useTranslate();
const refresh = useRefresh();
+ const notify = useNotify();
const [createDialog, setCreateDialog] = useState(false);
const [manualDialog, setManualDialog] = useState(false);
@@ -130,16 +131,13 @@
//鑾峰彇娉㈡瑙勫垯
const closeDialog = async (value) => {
setWaveRule(false)
- refresh()
- console.log('=====>');
- console.log(value);
- console.log(selectIds);
const res = await request.post(`/outStock/generate/wave`, { ids: selectIds, waveRuleId: value.id });
if (res?.data?.code === 200) {
notify(res.data.msg);
} else {
notify(res.data.msg);
}
+ refresh()
}
return (
@@ -175,7 +173,7 @@
bulkActionButtons={<PublicTaskButton setWaveRule={setWaveRule} setSelectIds={setSelectIds} />}
rowClick={false}
expandSingle={true}
- omit={['id', 'createTime', 'createBy', 'memo', 'rleStatus$']}
+ omit={['id', 'createTime', 'createBy$', 'memo', 'rleStatus$']}
>
<NumberField source="id" />
<TextField source="code" label="table.field.outStock.code" />
@@ -224,7 +222,7 @@
drawerVal={drawerVal}
setDrawerVal={setDrawerVal}
>
- <OutStockPublic record={select} open={drawerVal} setOpen={setDrawerVal} />
+ <OutStockPublic record={select} open={drawerVal} setOpen={setDrawerVal} />
</PageEditDrawer>
</Box >
)
--
Gitblit v1.9.1