From 273f2e5d3941b0e720e5eabd7dba9cfc042c3267 Mon Sep 17 00:00:00 2001
From: skyouc
Date: 星期二, 17 六月 2025 17:04:53 +0800
Subject: [PATCH] 出库单生成波次功能开发
---
rsf-admin/src/page/orders/wave/WaveList.jsx | 63 ++++++++++++-------------------
1 files changed, 24 insertions(+), 39 deletions(-)
diff --git a/rsf-admin/src/page/orders/wave/WaveList.jsx b/rsf-admin/src/page/orders/wave/WaveList.jsx
index 73596e2..a0fb5a4 100644
--- a/rsf-admin/src/page/orders/wave/WaveList.jsx
+++ b/rsf-admin/src/page/orders/wave/WaveList.jsx
@@ -35,19 +35,15 @@
useRedirect,
Button,
} from 'react-admin';
-import { Box, Typography, Card, Stack } from '@mui/material';
-import { styled } from '@mui/material/styles';
-import WaveCreate from "./WaveCreate";
-import WavePanel from "./WavePanel";
-import EmptyData from "../../components/EmptyData";
-import MyCreateButton from "../../components/MyCreateButton";
-import MyExportButton from '../../components/MyExportButton';
-import PageDrawer from "../../components/PageDrawer";
-import MyField from "../../components/MyField";
-import request from '@/utils/request';
import { PAGE_DRAWER_WIDTH, OPERATE_MODE, DEFAULT_PAGE_SIZE } from '@/config/setting';
-import * as Common from '@/utils/common';
+import { Box, Typography, Card, Stack } from '@mui/material';
+import ConfirmButton from "../../components/ConfirmButton";
+import PageDrawer from "../../components/PageDrawer";
import PublicIcon from '@mui/icons-material/Public';
+import ItemToTaskModal from "./ItemToTaskModal";
+import { styled } from '@mui/material/styles';
+import request from '@/utils/request';
+import WaveCreate from "./WaveCreate";
const StyledDatagrid = styled(DatagridConfigurable)(({ theme }) => ({
@@ -60,7 +56,7 @@
'& .column-name': {
},
'& .opt': {
- width: 200
+ width: 260
},
}));
@@ -68,7 +64,6 @@
<SearchInput source="condition" alwaysOn />,
<DateInput label='common.time.after' source="timeStart" alwaysOn />,
<DateInput label='common.time.before' source="timeEnd" alwaysOn />,
-
<TextInput source="code" label="table.field.wave.code" />,
<SelectInput source="type" label="table.field.wave.type"
choices={[
@@ -87,7 +82,6 @@
<NumberInput source="anfme" label="table.field.wave.anfme" />,
<NumberInput source="qty" label="table.field.wave.qty" />,
<NumberInput source="orderNum" label="table.field.wave.orderNum" />,
-
<TextInput label="common.field.memo" source="memo" />,
<SelectInput
label="common.field.status"
@@ -103,6 +97,8 @@
const WaveList = () => {
const translate = useTranslate();
const [createDialog, setCreateDialog] = useState(false);
+ const [detailDialog, setDetailDialog] = useState(false);
+ const [select, setSelectIds] = useState({});
const [drawerVal, setDrawerVal] = useState(false);
return (
@@ -130,9 +126,7 @@
>
<StyledDatagrid
preferenceKey='wave'
- bulkActionButtons={
- <PublicTaskButton />
- }
+ bulkActionButtons={false}
rowClick={(id, resource, record) => false}
expand={false}
expandSingle={false}
@@ -143,6 +137,7 @@
<TextField source="type$" label="table.field.wave.type" sortable={false} />
<TextField source="exceStatus$" label="table.field.wave.exceStatus" sortable={false} />
<NumberField source="anfme" label="table.field.wave.anfme" />
+ <NumberField source="groupQty" label="table.field.wave.groupQty" />
<NumberField source="qty" label="table.field.wave.qty" />
<NumberField source="orderNum" label="table.field.wave.orderNum" />
<TextField source="updateBy$" label="common.field.updateBy" />
@@ -152,11 +147,16 @@
<BooleanField source="statusBool" label="common.field.status" sortable={false} />
<TextField source="memo" label="common.field.memo" sortable={false} />
<WrapperField cellClassName="opt" label="common.field.opt">
- <EditButton sx={{ padding: '1px', fontSize: '.75rem' }} />
- <DeleteButton sx={{ padding: '1px', fontSize: '.75rem' }} mutationMode={OPERATE_MODE} />
+ <PublicTaskButton setSelectIds={setSelectIds} setDetailDialog={setDetailDialog} />
+ <EditButton label="toolbar.detail" sx={{ padding: '1px', fontSize: '.75rem' }} />
</WrapperField>
</StyledDatagrid>
</List>
+ <ItemToTaskModal
+ open={detailDialog}
+ record={select}
+ setOpen={setDetailDialog}
+ />
<WaveCreate
open={createDialog}
setOpen={setCreateDialog}
@@ -173,32 +173,17 @@
export default WaveList;
-const PublicTaskButton = () => {
+const PublicTaskButton = ({ setSelectIds, setDetailDialog }) => {
const record = useRecordContext();
- const { selectedIds, onUnselectItems } = useListContext();
const notify = useNotify();
const refresh = useRefresh();
const redirect = useRedirect();
const pubClick = async (event) => {
- event.stopPropagation();
- console.log('=========>');
-
- onUnselectItems();
- const res = await request.post(`/wave/public/task`, { ids: selectedIds });
- if (res?.data?.code === 200) {
- notify(res.data.msg);
- redirect("/task")
- } else {
- notify(res.data.msg);
- }
- refresh();
+ setSelectIds(record);
+ setDetailDialog(true);
}
-
return (
- <Button
- onClick={pubClick}
- label={"toolbar.createTask"}
- startIcon={<PublicIcon />}
- />);
+ record?.exceStatus == 0 ? <ConfirmButton label={"toolbar.createTask"} startIcon={<PublicIcon />} onConfirm={pubClick} size='small' /> : <></>
+ );
}
\ No newline at end of file
--
Gitblit v1.9.1