From f0e887dd32942c7897567261b9de1d26f576dfb6 Mon Sep 17 00:00:00 2001
From: skyouc
Date: 星期三, 23 四月 2025 11:11:56 +0800
Subject: [PATCH] 通过单据创建DO单优化
---
rsf-admin/src/page/orders/outStock/OutOrderList.jsx | 40 +++++++++++++++++++++++++++++-----------
1 files changed, 29 insertions(+), 11 deletions(-)
diff --git a/rsf-admin/src/page/orders/outStock/OutOrderList.jsx b/rsf-admin/src/page/orders/outStock/OutOrderList.jsx
index 2ec290e..8c1bb08 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,9 @@
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";
+
const StyledDatagrid = styled(DatagridConfigurable)(({ theme }) => ({
'& .css-1vooibu-MuiSvgIcon-root': {
height: '.9em'
@@ -119,7 +121,6 @@
<Box display="flex">
<List
resource="outStock"
- storeKey='outStock'
sx={{
flexGrow: 1,
transition: (theme) =>
@@ -136,6 +137,7 @@
actions={(
<TopToolbar>
<FilterButton />
+ <CreateByOrderButton setCreateDialog={setCreateDialog} />
<MyCreateButton onClick={() => { setManualDialog(true) }} />
<SelectColumnsButton preferenceKey='outStock' />
<ImportButton value={'asnOrderItem'} />
@@ -175,17 +177,18 @@
<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} />
+ {/* <MyButton setCreateDialog={setCreateDialog} setmodalType={setmodalType} /> */}
<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'
@@ -205,7 +208,6 @@
const id = record.id;
setmodalType(id);
setCreateDialog(true);
-
};
return (
<Button
@@ -219,14 +221,30 @@
)
}
-const CancelButton = () => {
+const CreateByOrderButton = ({ setCreateDialog }) => {
const record = useRecordContext();
const notify = useNotify();
const refresh = useRefresh();
- const cancelOrder = async (event) => {
+ const createByOrder = async (event) => {
event.stopPropagation();
- const { data: { code, data, msg } } = await request.get(`/outStock/cancel/${record.id}`);
+ 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 () => {
+ const { data: { code, data, msg } } = await request.get(`/outStock/cancel/${record?.id}`);
if (code === 200) {
notify(msg);
refresh()
--
Gitblit v1.9.1