From ecdc2cadd4a21b80de4e30e38878fdeb39084e3f Mon Sep 17 00:00:00 2001
From: skyouc
Date: 星期一, 23 六月 2025 17:05:12 +0800
Subject: [PATCH] Merge branch 'devlop' of http://47.97.1.152:5880/r/wms-master into devlop
---
rsf-admin/src/page/orders/wave/WaveItemList.jsx | 33 ++++++++++++++++++++++++++++++---
1 files changed, 30 insertions(+), 3 deletions(-)
diff --git a/rsf-admin/src/page/orders/wave/WaveItemList.jsx b/rsf-admin/src/page/orders/wave/WaveItemList.jsx
index 961de23..c37db35 100644
--- a/rsf-admin/src/page/orders/wave/WaveItemList.jsx
+++ b/rsf-admin/src/page/orders/wave/WaveItemList.jsx
@@ -33,6 +33,7 @@
DeleteButton,
useGetRecordId,
Button,
+ useRefresh,
} from 'react-admin';
import { PAGE_DRAWER_WIDTH, OPERATE_MODE, DEFAULT_PAGE_SIZE } from '@/config/setting';
import PauseCircleOutlineIcon from '@mui/icons-material/PauseCircleOutline';
@@ -151,6 +152,7 @@
<TextField source="memo" label="common.field.memo" sortable={false} />
<WrapperField cellClassName="opt" label="common.field.opt">
<BulkPauseButton />
+ <ContinueButton />
</WrapperField>
</StyledDatagrid>
</List>
@@ -191,6 +193,7 @@
const { data, selectedIds, onUnselectItems } = useListContext();
const waveId = useGetRecordId();
const notify = useNotify();
+ const refresh = useRefresh()
const startClick = async () => {
onUnselectItems();
const { data: { code, data, msg } } = await request.post('/wave/selects/task', { wave: waveId, waveItem: selectedIds });
@@ -200,6 +203,7 @@
} else {
notify(msg);
}
+ refresh()
}
return (
<Button label="toolbar.publicWorking" onClick={startClick} startIcon={<PlayArrowOutlinedIcon />} variant="outlined" />
@@ -208,11 +212,34 @@
const BulkPauseButton = () => {
const { data, selectedIds, onUnselectItems } = useListContext();
+ const notify = useNotify()
const record = useRecordContext();
- const pauseClick = () => {
- onUnselectItems();
+ const pauseClick = async () => {
+ const { data: { code, data, msg } } = await request.post('/waveItem/pause/pub', { wave: waveId, waveItem: selectedIds });
+ if (code === 200) {
+ notify(msg);
+ } else {
+ notify(msg);
+ }
}
return (
- record?.exceStatus == 2 ? <Button label="toolbar.pause" onClick={pauseClick} startIcon={<PauseCircleOutlineIcon />} /> : <></>
+ record?.exceStatus == 1 ? <Button label="toolbar.pause" onClick={pauseClick} startIcon={<PauseCircleOutlineIcon />} /> : <></>
+ )
+}
+
+const ContinueButton = () => {
+ const { data, selectedIds, onUnselectItems } = useListContext();
+ const notify = useNotify()
+ const record = useRecordContext();
+ const continueClick = async () => {
+ const { data: { code, data, msg } } = await request.post('/waveItem/continue/pub', { wave: waveId, waveItem: selectedIds });
+ if (code === 200) {
+ notify(msg);
+ } else {
+ notify(msg);
+ }
+ }
+ return (
+ record?.exceStatus == 4 ? <Button label="toolbar.continuePub" onClick={continueClick} startIcon={<PauseCircleOutlineIcon />} /> : <></>
)
}
\ No newline at end of file
--
Gitblit v1.9.1