From da20b84fb1dbb266939deff9fd52f9a16f4e32fa Mon Sep 17 00:00:00 2001
From: zjj <3272660260@qq.com>
Date: 星期日, 27 四月 2025 14:59:24 +0800
Subject: [PATCH] #生成入库任务优化
---
rsf-admin/src/page/orders/outStock/OutOrderList.jsx | 77 +++++++++++++++++++++++++++++---------
1 files changed, 59 insertions(+), 18 deletions(-)
diff --git a/rsf-admin/src/page/orders/outStock/OutOrderList.jsx b/rsf-admin/src/page/orders/outStock/OutOrderList.jsx
index f20cf78..23ed27e 100644
--- a/rsf-admin/src/page/orders/outStock/OutOrderList.jsx
+++ b/rsf-admin/src/page/orders/outStock/OutOrderList.jsx
@@ -39,7 +39,6 @@
} from 'react-admin';
import { Box, Typography, Card, Stack } from '@mui/material';
import { styled } from '@mui/material/styles';
-import AsnOrderModal from "./AsnOrderModal";
import EmptyData from "../../components/EmptyData";
import MyCreateButton from "../../components/MyCreateButton";
import MyExportButton from '../../components/MyExportButton';
@@ -54,6 +53,10 @@
import DetailsIcon from '@mui/icons-material/Details';
import CancelIcon from '@mui/icons-material/Cancel';
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': {
height: '.9em'
@@ -119,7 +122,6 @@
<Box display="flex">
<List
resource="outStock"
- storeKey='outStock'
sx={{
flexGrow: 1,
transition: (theme) =>
@@ -136,10 +138,11 @@
actions={(
<TopToolbar>
<FilterButton />
+ <CreateByOrderButton setCreateDialog={setCreateDialog} />
<MyCreateButton onClick={() => { setManualDialog(true) }} />
<SelectColumnsButton preferenceKey='outStock' />
<ImportButton value={'asnOrderItem'} />
- <MyExportButton />
+ {/* <MyExportButton /> */}
</TopToolbar>
)}
perPage={DEFAULT_PAGE_SIZE}
@@ -148,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$']}
@@ -175,17 +174,17 @@
<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>
- <OutOrderCreate open={manualDialog} setOpen={setManualDialog} />
- <AsnOrderModal
+ <OutOrderCreate
+ open={manualDialog}
+ setOpen={setManualDialog}
+ />
+ <OutOrderModal
open={createDialog}
setOpen={setCreateDialog}
- asnId={modalType}
- billReload={billReload}
/>
<PageDrawer
title='AsnOrder Detail'
@@ -198,6 +197,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();
const handleEditClick = (btn) => {
@@ -205,7 +233,6 @@
const id = record.id;
setmodalType(id);
setCreateDialog(true);
-
};
return (
<Button
@@ -219,14 +246,28 @@
)
}
+const CreateByOrderButton = ({ setCreateDialog }) => {
+ const record = useRecordContext();
+ const notify = useNotify();
+ const refresh = useRefresh();
+
+ const createByOrder = async (event) => {
+ event.stopPropagation();
+ setCreateDialog(true);
+ }
+
+ return (
+ <Button onClick={createByOrder} label={'toolbar.asnCreate'}> <AddIcon /> </Button>
+ )
+
+}
+
const CancelButton = () => {
const record = useRecordContext();
const notify = useNotify();
const refresh = useRefresh();
- console.log(record);
-
+
const cancelOrder = async () => {
- console.log(event);
const { data: { code, data, msg } } = await request.get(`/outStock/cancel/${record?.id}`);
if (code === 200) {
notify(msg);
--
Gitblit v1.9.1