From c0a87b9244e1521c76b8a0dc70b922f6fc3e30a1 Mon Sep 17 00:00:00 2001
From: skyouc
Date: 星期四, 17 七月 2025 16:35:23 +0800
Subject: [PATCH] Merge branch 'devlop' of http://47.97.1.152:5880/r/wms-master into devlop
---
rsf-admin/src/page/orders/outStock/OutOrderModal.jsx | 57 +++++++++++++++++++++++----------------------------------
1 files changed, 23 insertions(+), 34 deletions(-)
diff --git a/rsf-admin/src/page/orders/outStock/OutOrderModal.jsx b/rsf-admin/src/page/orders/outStock/OutOrderModal.jsx
index 9adfabe..6bea1bd 100644
--- a/rsf-admin/src/page/orders/outStock/OutOrderModal.jsx
+++ b/rsf-admin/src/page/orders/outStock/OutOrderModal.jsx
@@ -5,6 +5,7 @@
DatagridConfigurable,
SearchInput,
TopToolbar,
+ Toolbar,
Button,
SelectColumnsButton,
EditButton,
@@ -13,7 +14,6 @@
ExportButton,
BulkDeleteButton,
WrapperField,
- Toolbar,
useRecordContext,
useTranslate,
useNotify,
@@ -45,8 +45,9 @@
import { Grid, margin, Stack, width } from "@mui/system";
import request from '@/utils/request';
import SaveIcon from '@mui/icons-material/Save';
-import debounce from "lodash/debounce";
import CheckCircleIcon from '@mui/icons-material/CheckCircle';
+import EditableTextField from "../../components/EditableTextField";
+import OutOrderPreview from "./OutOrderPreview";
const StyledDatagrid = styled(DatagridConfigurable)(({ theme }) => ({
'& .css-1vooibu-MuiSvgIcon-root': {
@@ -91,30 +92,27 @@
]
const OutOrderModal = (props) => {
- const { open, setOpen, record } = props;
+ const { open, setOpen, preview, setPreview, record } = props;
const translate = useTranslate();
const [params, setParams] = useState({});
+ const [select, setSelect] = useState([]);
const [drawerVal, setDrawerVal] = useState(false);
const refresh = useRefresh();
-
-
const handleClose = (event, reason) => {
if (reason !== "backdropClick") {
setOpen(false);
}
};
const CustomFilter = () => {
- const { filterValues, setFilters, refetch } = useListContext('deliveryItem');
+ const { filterValues, setFilters, refetch } = useListContext();
const [formValues, setFormValues] = useState(filterValues);
const handleChange = (event) => {
if (event.target == undefined || event.target == null) { return }
setFormValues(formValues => ({
...formValues,
- [event.target.name]: event.target.value
+ [event.target.name]: event.target.value,
}));
};
-
-
const handleSubmit = (event) => {
setParams(formValues)
@@ -135,20 +133,18 @@
<TextInput
source="deliveryCode"
label="table.field.deliveryItem.deliveryCode"
- defaultValue={params?.matnrName}
+ defaultValue={params?.deliveryCode}
onChange={handleChange}
resettable
-
/>
</Stack>
<Stack>
<TextInput
- source="matnrName"
+ source="maktx"
label="table.field.deliveryItem.matnrName"
- defaultValue={params?.matnrName}
+ defaultValue={params?.maktx}
onChange={handleChange}
resettable
-
/>
</Stack>
<Stack>
@@ -201,7 +197,7 @@
<DialogContent>
<Grid item sx={24}>
<List
- resource="deliveryItem"
+ resource="/deliveryItem/filters"
sx={{
flexGrow: 1,
transition: (theme) =>
@@ -223,28 +219,23 @@
>
<Box sx={{ position: 'relative', minHeight: "60vh", }}>
<LinearProgress
- sx={{
- height: "2px",
- position: 'absolute',
- top: 0,
- left: 0,
- right: 0,
- }}
+ sx={{ height: "2px", position: 'absolute', top: 0, left: 0, right: 0, }}
/>
<StyledDatagrid
preferenceKey='deliveryItem'
- bulkActionButtons={<AddOutStockButton setOpen={setOpen} />}
+ bulkActionButtons={<AddOutStockButton setOpen={setOpen} setPreview={setPreview} setSelect={setSelect} />}
rowClick={(id, resource, record) => false}
expand={false}
expandSingle={true}
- omit={['id', 'createTime', 'createBy', 'memo', 'workQty', 'startTime', 'endTime', 'updateBy', 'createTime']}
+ omit={['id', 'createTime', 'createBy', 'memo', 'startTime', 'endTime', 'updateBy', 'createTime']}
>
<NumberField source="id" />
<TextField source="deliveryCode" label="table.field.deliveryItem.deliveryCode" />
<TextField source="matnrCode" label="table.field.deliveryItem.matnrCode" />
- <TextField source="matnrName" label="table.field.deliveryItem.matnrName" />
+ <TextField source="maktx" label="table.field.deliveryItem.matnrName" />
<TextField source="unit" label="table.field.deliveryItem.unit" />
<NumberField source="anfme" label="table.field.deliveryItem.anfme" />
+ <NumberField source="workQty" label="table.field.outStockItem.workQty" />
<TextField source="splrName" label="table.field.deliveryItem.splrName" />
<TextField source="splrBatch" label="table.field.deliveryItem.splrBatch" />
<TextField source="updateBy$" label="common.field.updateBy" />
@@ -259,6 +250,9 @@
</Grid>
</DialogContent>
</Grid>
+ <Grid>
+ <OutOrderPreview open={preview} setOpen={setPreview} selectedIds={select} setCloseParent={setOpen} />
+ </Grid>
</Dialog >
)
}
@@ -266,20 +260,15 @@
export default OutOrderModal;
const AddOutStockButton = (props) => {
- const { setOpen } = props;
+ const { setOpen, setPreview, setSelect } = props;
const { selectedIds, onUnselectItems } = useListContext();
const notify = useNotify();
const refresh = useRefresh();
const confirm = async (event) => {
- const res = await request.post(`/outStock/generate/orders`, { ids: selectedIds });
- if (res?.data?.code === 200) {
- notify(res.data.msg);
- } else {
- notify(res.data.msg);
- }
- refresh();
+ setPreview(true)
+ setSelect(selectedIds);
onUnselectItems();
- setOpen(false);
+ // refresh();
}
return (
--
Gitblit v1.9.1