From 253e5ad5ec600ea04cc8636dacec1afd895e08fc Mon Sep 17 00:00:00 2001
From: skyouc
Date: 星期五, 13 六月 2025 13:21:21 +0800
Subject: [PATCH] 出库顺序优化 代码优化
---
rsf-admin/src/page/orders/outStock/OutOrderList.jsx | 23 +++++++++++++++--------
1 files changed, 15 insertions(+), 8 deletions(-)
diff --git a/rsf-admin/src/page/orders/outStock/OutOrderList.jsx b/rsf-admin/src/page/orders/outStock/OutOrderList.jsx
index 20fd2e0..955b074 100644
--- a/rsf-admin/src/page/orders/outStock/OutOrderList.jsx
+++ b/rsf-admin/src/page/orders/outStock/OutOrderList.jsx
@@ -5,6 +5,7 @@
DatagridConfigurable,
SearchInput,
TopToolbar,
+ Toolbar,
SelectColumnsButton,
EditButton,
FilterButton,
@@ -36,6 +37,7 @@
Button,
useRedirect,
useUnselectAll,
+ useRecordSelection,
} from 'react-admin';
import { Box, Typography, Card, Stack, Drawer } from '@mui/material';
import { styled } from '@mui/material/styles';
@@ -49,13 +51,14 @@
import ImportButton from "../../components/ImportButton";
import DetailsIcon from '@mui/icons-material/Details';
import CancelOutlinedIcon from '@mui/icons-material/CancelOutlined';
-import OutOrderCreate from "./OutOrderCreate";
import AddIcon from '@mui/icons-material/Add';
import OutOrderModal from "./OutOrderModal";
import PublicIcon from '@mui/icons-material/Public';
import SelectMatnrModal from "./SelectMatnrModal";
import AddTaskIcon from '@mui/icons-material/AddTask';
import PageEditDrawer from "../../components/PageEditDrawer";
+import OutStockPublic from "./OutStockPublic";
+import OutOrderPreview from "./OutOrderPreview";
const StyledDatagrid = styled(DatagridConfigurable)(({ theme }) => ({
'& .css-1vooibu-MuiSvgIcon-root': {
@@ -113,6 +116,7 @@
const translate = useTranslate();
const [createDialog, setCreateDialog] = useState(false);
const [manualDialog, setManualDialog] = useState(false);
+ const [preview, setPreview] = useState(false);
const [drawerVal, setDrawerVal] = useState(false);
const [modalType, setmodalType] = useState(0);
const [select, setSelect] = useState(0);
@@ -140,8 +144,7 @@
<CreateByOrderButton setCreateDialog={setCreateDialog} />
<MyCreateButton onClick={() => { setManualDialog(true); setmodalType(0) }} />
<SelectColumnsButton preferenceKey='outStock' />
- <ImportButton value={'outStock'} />
- {/* <MyExportButton /> */}
+ <ImportButton value={'outStockItem'} />
</TopToolbar>
)}
perPage={DEFAULT_PAGE_SIZE}
@@ -156,6 +159,7 @@
>
<NumberField source="id" />
<TextField source="code" label="table.field.outStock.code" />
+ <TextField source="poCode" label="table.field.outStock.poCode" />
<TextField source="type$" label="table.field.outStock.type" />
<TextField cellClassName="wkType" source="wkType$" label="table.field.outStock.wkType" />
<NumberField source="anfme" label="table.field.outStock.anfme" />
@@ -173,7 +177,7 @@
<MyButton setCreateDialog={setManualDialog} setmodalType={setmodalType} />
<EditButton label="toolbar.detail" icon={(<DetailsIcon />)}></EditButton>
<CancelButton />
- <PublicButton setDrawerVal={setDrawerVal} drawerVal={drawerVal} />
+ <PublicButton setDrawerVal={setDrawerVal} drawerVal={drawerVal} setSelect={setSelect} />
</WrapperField>
</StyledDatagrid>
</List>
@@ -190,13 +194,16 @@
<OutOrderModal
open={createDialog}
setOpen={setCreateDialog}
+ preview={preview}
+ setPreview={setPreview}
/>
+ <OutOrderPreview open={preview} setOpen={setPreview} />
<PageEditDrawer
title={"toolbar.publicWorking"}
drawerVal={drawerVal}
setDrawerVal={setDrawerVal}
>
-
+ <OutStockPublic record={select} open={drawerVal} setOpen={setDrawerVal} />
</PageEditDrawer>
</Box >
)
@@ -256,7 +263,6 @@
const record = useRecordContext();
const notify = useNotify();
const refresh = useRefresh();
-
const createByOrder = async (event) => {
event.stopPropagation();
setCreateDialog(true);
@@ -287,15 +293,16 @@
}
//涓嬪彂鎵ц
-const PublicButton = ({ setDrawerVal }) => {
+const PublicButton = ({ setDrawerVal, setSelect }) => {
const record = useRecordContext();
const refresh = useRefresh();
const taskEvent = () => {
setDrawerVal(true)
+ setSelect(record)
refresh();
}
return (
- <ConfirmButton label={"toolbar.publicWorking"} startIcon={<AddTaskIcon />} onConfirm={taskEvent} size={"small"} />
+ record.workQty < record.anfme ? <Button label={"toolbar.publicWorking"} startIcon={<AddTaskIcon />} onClick={taskEvent} size={"small"} /> : <></>
)
}
--
Gitblit v1.9.1