From 32876c7968257d3a63d31ae898c8c635bda0156b Mon Sep 17 00:00:00 2001
From: skyouc
Date: 星期一, 28 四月 2025 13:23:45 +0800
Subject: [PATCH] Merge branch 'devlop' of http://47.97.1.152:5880/r/wms-master into devlop
---
rsf-admin/src/page/orders/outStock/OutOrderList.jsx | 111 +++++++++++++++++++++++++++----------------------------
1 files changed, 54 insertions(+), 57 deletions(-)
diff --git a/rsf-admin/src/page/orders/outStock/OutOrderList.jsx b/rsf-admin/src/page/orders/outStock/OutOrderList.jsx
index dfff8b0..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';
@@ -47,16 +46,17 @@
import ConfirmButton from '../../components/ConfirmButton';
import PageDrawer from "../../components/PageDrawer";
import { PAGE_DRAWER_WIDTH, OPERATE_MODE, DEFAULT_PAGE_SIZE } from '@/config/setting';
-import ConstructionIcon from "@mui/icons-material/Construction";
import EditIcon from '@mui/icons-material/Edit';
-import TaskIcon from '@mui/icons-material/Task';
-import CloseIcon from '@mui/icons-material/Close';
import request from '@/utils/request';
import DictionarySelect from "../../components/DictionarySelect";
-import ExitToAppIcon from '@mui/icons-material/ExitToApp';
import ImportButton from "../../components/ImportButton";
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'
@@ -112,6 +112,7 @@
const OutOrderList = (props) => {
const translate = useTranslate();
const [createDialog, setCreateDialog] = useState(false);
+ const [manualDialog, setManualDialog] = useState(false);
const [drawerVal, setDrawerVal] = useState(false);
const [modalType, setmodalType] = useState(0);
const [select, setSelect] = useState(0);
@@ -121,7 +122,6 @@
<Box display="flex">
<List
resource="outStock"
- storeKey='outStock'
sx={{
flexGrow: 1,
transition: (theme) =>
@@ -131,17 +131,18 @@
marginRight: drawerVal ? `${PAGE_DRAWER_WIDTH}px` : 0,
}}
title={"menu.outStock"}
- empty={<EmptyData onClick={() => { setCreateDialog(true); setmodalType(0) }} />}
+ empty={false}
filters={filters}
filter={{ deleted: 0, type: 'out' }}
sort={{ field: "create_time", order: "desc" }}
actions={(
<TopToolbar>
<FilterButton />
- <MyCreateButton onClick={() => { setCreateDialog(true); setmodalType(0) }} />
+ <CreateByOrderButton setCreateDialog={setCreateDialog} />
+ <MyCreateButton onClick={() => { setManualDialog(true) }} />
<SelectColumnsButton preferenceKey='outStock' />
<ImportButton value={'asnOrderItem'} />
- <MyExportButton />
+ {/* <MyExportButton /> */}
</TopToolbar>
)}
perPage={DEFAULT_PAGE_SIZE}
@@ -150,12 +151,7 @@
sx={{ width: '100%' }}
preferenceKey='outStock'
bulkActionButtons={
- <>
- <MyExportButton />
- {/* <BtnBulkExport></BtnBulkExport> */}
- <BulkDeleteButton mutationMode={OPERATE_MODE}
- />
- </>}
+ <PublicTaskButton />}
rowClick={false}
expandSingle={true}
omit={['id', 'createTime', 'createBy', 'memo', 'poId', 'rleStatus$']}
@@ -178,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>
- {/* <CompleteButton /> */}
+ <CancelButton />
</WrapperField>
</StyledDatagrid>
</List>
- <AsnOrderModal
+ <OutOrderCreate
+ open={manualDialog}
+ setOpen={setManualDialog}
+ />
+ <OutOrderModal
open={createDialog}
setOpen={setCreateDialog}
- asnId={modalType}
- billReload={billReload}
/>
<PageDrawer
title='AsnOrder Detail'
@@ -201,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) => {
@@ -208,7 +233,6 @@
const id = record.id;
setmodalType(id);
setCreateDialog(true);
-
};
return (
<Button
@@ -222,27 +246,20 @@
)
}
-const CompleteButton = () => {
+const CreateByOrderButton = ({ setCreateDialog }) => {
const record = useRecordContext();
const notify = useNotify();
const refresh = useRefresh();
- const requestComplete = async () => {
- const { data: { code, data, msg } } = await request.post(`/asnOrder/complete/${record.id}`);
- if (code === 200) {
- notify(msg);
- refresh()
- } else {
- notify(msg);
- }
+ const createByOrder = async (event) => {
+ event.stopPropagation();
+ setCreateDialog(true);
}
return (
- record.exceStatus === 1 && (record.anfme === record.qty ? <Button onClick={requestComplete} label={"toolbar.complete"} color="success">
- <TaskIcon />
- </Button> : <ConfirmButton label={"toolbar.complete"} color="success" data={'褰撳墠鏀惰揣鏁伴噺灏忎簬璁″垝鏁伴噺锛屾槸鍚︾‘璁ゅ畬鎴�'} startIcon={<TaskIcon />} onConfirm={requestComplete} />)
-
+ <Button onClick={createByOrder} label={'toolbar.asnCreate'}> <AddIcon /> </Button>
)
+
}
const CancelButton = () => {
@@ -251,7 +268,7 @@
const refresh = useRefresh();
const cancelOrder = async () => {
- const { data: { code, data, msg } } = await request.post(`/outStock/cancel/${record.id}`);
+ const { data: { code, data, msg } } = await request.get(`/outStock/cancel/${record?.id}`);
if (code === 200) {
notify(msg);
refresh()
@@ -261,26 +278,6 @@
}
return (
- <ConfirmButton label={"toolbar.cancel"} startIcon={<CancelIcon />} onConfirm={cancelOrder} />
- )
-}
-
-const CloseButton = () => {
- const record = useRecordContext();
- const notify = useNotify();
- const refresh = useRefresh();
- const requestClose = async () => {
- const { data: { code, data, msg } } = await request.post(`/outStock/close/${record.id}`);
-
- if (code === 200) {
- notify(msg);
- refresh()
- } else {
- notify(msg);
- }
- }
-
- return (
- <ConfirmButton label={"toolbar.close"} color="error" data={'纭鏄惁鍏抽棴锛�'} startIcon={<CloseIcon />} onConfirm={requestClose} />
+ <ConfirmButton label={"toolbar.cancel"} startIcon={<CancelIcon />} onConfirm={cancelOrder} />
)
}
--
Gitblit v1.9.1