From 1e01cb4da6055dd19c720a7012301ec34bee982a Mon Sep 17 00:00:00 2001
From: skyouc
Date: 星期一, 30 六月 2025 16:41:04 +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 | 97 ++++++++++++++++++++++++++++++------------------
1 files changed, 60 insertions(+), 37 deletions(-)
diff --git a/rsf-admin/src/page/orders/wave/WaveItemList.jsx b/rsf-admin/src/page/orders/wave/WaveItemList.jsx
index 99ee024..b9649a9 100644
--- a/rsf-admin/src/page/orders/wave/WaveItemList.jsx
+++ b/rsf-admin/src/page/orders/wave/WaveItemList.jsx
@@ -6,48 +6,35 @@
SearchInput,
TopToolbar,
SelectColumnsButton,
- EditButton,
FilterButton,
- CreateButton,
- ExportButton,
- BulkDeleteButton,
WrapperField,
useRecordContext,
useTranslate,
useNotify,
useListContext,
- FunctionField,
TextField,
NumberField,
DateField,
- BooleanField,
- ReferenceField,
TextInput,
- DateTimeInput,
DateInput,
SelectInput,
NumberInput,
- ReferenceInput,
- ReferenceArrayInput,
- AutocompleteInput,
- 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';
+import StopCircleOutlinedIcon from '@mui/icons-material/StopCircleOutlined';
+import PlayArrowOutlinedIcon from '@mui/icons-material/PlayArrowOutlined';
import { Box, Typography, Card, Stack } from '@mui/material';
+import ContentCreate from '@mui/icons-material/Create';
+import PageDrawer from "../../components/PageDrawer";
import { styled } from '@mui/material/styles';
import WaveItemCreate from "./WaveItemCreate";
-import EmptyData from "../../components/EmptyData";
-import MyCreateButton from "../../components/MyCreateButton";
-import MyExportButton from '../../components/MyExportButton';
-import PageDrawer from "../../components/PageDrawer";
import WaveItemEdit from "./WaveItemEdit";
-import MyField from "../../components/MyField";
-import { PAGE_DRAWER_WIDTH, OPERATE_MODE, DEFAULT_PAGE_SIZE } from '@/config/setting';
-import * as Common from '@/utils/common';
-import ContentCreate from '@mui/icons-material/Create';
-import PlayArrowOutlinedIcon from '@mui/icons-material/PlayArrowOutlined';
-import PauseCircleOutlineIcon from '@mui/icons-material/PauseCircleOutline';
+import request from '@/utils/request';
+
const StyledDatagrid = styled(DatagridConfigurable)(({ theme }) => ({
'& .css-1vooibu-MuiSvgIcon-root': {
height: '.9em'
@@ -58,7 +45,7 @@
'& .column-name': {
},
'& .opt': {
- width: 200
+ width: 140
},
}));
@@ -126,7 +113,6 @@
bulkActionButtons={
<>
<BulkStartButton />
- <BulkPauseButton />
</>
}
rowClick={(id, resource, record) => false}
@@ -146,13 +132,16 @@
<TextField source="fieldsIndex" label="table.field.waveItem.fieldsIndex" />
<NumberField source="workQty" label="table.field.waveItem.workQty" />
<TextField source="unit" label="table.field.waveItem.unit" />
- <TextField source="exceStatus" label="table.field.waveItem.exceStatus" />
<TextField source="updateBy$" label="common.field.updateBy" />
<DateField source="updateTime" label="common.field.updateTime" showTime />
<TextField source="createBy$" label="common.field.createBy" />
<DateField source="createTime" label="common.field.createTime" showTime />
- <BooleanField source="statusBool" label="common.field.status" sortable={false} />
<TextField source="memo" label="common.field.memo" sortable={false} />
+ <TextField source="exceStatus$" label="table.field.waveItem.exceStatus" />
+ <WrapperField cellClassName="opt" label="common.field.opt">
+ <PauseButton />
+ <ContinueButton />
+ </WrapperField>
</StyledDatagrid>
</List>
<WaveItemEdit
@@ -185,28 +174,62 @@
return (
<Button label="ra.action.edit" onClick={editClick} startIcon={<ContentCreate />} />
)
-
}
const BulkStartButton = () => {
const { data, selectedIds, onUnselectItems } = useListContext();
-
- const startClick = () => {
- onUnselectItems()
+ 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 });
+ if (code === 200) {
+ notify(msg);
+ setAutoExce(false)
+ } else {
+ notify(msg);
+ }
+ refresh()
}
return (
- <Button label="toolbar.start" onClick={startClick} startIcon={<PlayArrowOutlinedIcon />} variant="outlined" />
+ <Button label="toolbar.publicWorking" onClick={startClick} startIcon={<PlayArrowOutlinedIcon />} variant="outlined" />
)
}
-const BulkPauseButton = () => {
- const { data, selectedIds, onUnselectItems } = useListContext();
-
- const pauseClick = () => {
- onUnselectItems()
+const PauseButton = () => {
+ const notify = useNotify()
+ const refresh = useRefresh();
+ const record = useRecordContext();
+ const pauseClick = async () => {
+ const { data: { code, data, msg } } = await request.post('/waveItem/pause/pub/' + record?.id);
+ if (code === 200) {
+ notify(msg);
+ } else {
+ notify(msg);
+ }
+ refresh()
}
return (
- <Button label="toolbar.pause" onClick={pauseClick} startIcon={<PauseCircleOutlineIcon />} variant="outlined" />
+ record?.exceStatus == 1 ? <Button label="toolbar.pause" onClick={pauseClick} startIcon={<StopCircleOutlinedIcon />} /> : <></>
+ )
+}
+
+const ContinueButton = () => {
+ const notify = useNotify()
+ const refresh = useRefresh();
+ const record = useRecordContext();
+ const continueClick = async () => {
+ const { data: { code, data, msg } } = await request.post('/waveItem/continue/pub/' + record?.id);
+ if (code === 200) {
+ notify(msg);
+ } else {
+ notify(msg);
+ }
+ refresh()
+ }
+ return (
+ record?.exceStatus == 2 ? <Button label="toolbar.continuePub" onClick={continueClick} startIcon={<PauseCircleOutlineIcon />} /> : <></>
)
}
\ No newline at end of file
--
Gitblit v1.9.1