From b0409a8bac61d91d6db8755b15d4e2b9c4e3973c Mon Sep 17 00:00:00 2001
From: skyouc
Date: 星期四, 05 六月 2025 15:56:11 +0800
Subject: [PATCH] 出库单取消功能优化
---
rsf-admin/src/page/orders/outStock/OutOrderModal.jsx | 109 +++++++++++++++++++++++++++++++++++-------------------
1 files changed, 71 insertions(+), 38 deletions(-)
diff --git a/rsf-admin/src/page/orders/outStock/OutOrderModal.jsx b/rsf-admin/src/page/orders/outStock/OutOrderModal.jsx
index 95b48a6..c3b530c 100644
--- a/rsf-admin/src/page/orders/outStock/OutOrderModal.jsx
+++ b/rsf-admin/src/page/orders/outStock/OutOrderModal.jsx
@@ -1,4 +1,4 @@
-import { Dialog, DialogActions, DialogContent, DialogTitle, Box } from "@mui/material";
+import { Dialog, DialogActions, DialogContent, DialogTitle, Box, LinearProgress } from "@mui/material";
import React, { useState, useRef, useEffect, useMemo } from "react";
import {
List,
@@ -33,6 +33,7 @@
ReferenceArrayInput,
AutocompleteInput,
DeleteButton,
+ SimpleForm,
Form,
SaveButton,
useRefresh,
@@ -41,7 +42,7 @@
import DialogCloseButton from "../../components/DialogCloseButton";
import { styled } from '@mui/material/styles';
import { PAGE_DRAWER_WIDTH, OPERATE_MODE, DEFAULT_PAGE_SIZE } from '@/config/setting';
-import { Grid, Stack, width } from "@mui/system";
+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";
@@ -54,18 +55,21 @@
'& .RaDatagrid-row': {
cursor: 'auto'
},
- '& .column-name': {
- },
- '& .opt': {
- width: 220
- },
- '& .wkType': {
- width: 110
- },
'& .status': {
width: 90
},
}));
+
+const StyledForm = styled(Form)(({ theme }) => ({
+ width: '100%',
+ marginBottom: '45px',
+
+ '& .MuiGrid-root': {
+ margin: '0 10px'
+ }
+}));
+
+
const filters = [
<SearchInput source="condition" alwaysOn />,
<DateInput label='common.time.after' source="timeStart" />,
@@ -93,6 +97,7 @@
const [drawerVal, setDrawerVal] = useState(false);
const refresh = useRefresh();
+
const handleClose = (event, reason) => {
if (reason !== "backdropClick") {
setOpen(false);
@@ -102,19 +107,22 @@
const { filterValues, setFilters, refetch } = useListContext('deliveryItem');
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
}));
};
+
+
const handleSubmit = (event) => {
setParams(formValues)
};
return (
- <Form>
- <Grid container rowSpacing={2} columnSpacing={2} >
+ <StyledForm>
+ <Grid container rowSpacing={3} columnSpacing={3} >
<Stack>
<TextInput
source="condition"
@@ -125,10 +133,22 @@
</Stack>
<Stack>
<TextInput
+ source="deliveryCode"
+ label="table.field.deliveryItem.deliveryCode"
+ defaultValue={params?.matnrName}
+ onChange={handleChange}
+ resettable
+
+ />
+ </Stack>
+ <Stack>
+ <TextInput
source="matnrName"
label="table.field.deliveryItem.matnrName"
defaultValue={params?.matnrName}
onChange={handleChange}
+ resettable
+
/>
</Stack>
<Stack>
@@ -136,6 +156,7 @@
source="matnrCode"
label="table.field.deliveryItem.matnrCode"
defaultValue={params?.matnrCode}
+ resettable
onChange={handleChange} />
</Stack>
<Stack>
@@ -143,6 +164,7 @@
source="splrName"
label="table.field.deliveryItem.splrName"
defaultValue={params?.splrName}
+ resettable
onChange={handleChange} />
</Stack>
</Grid>
@@ -151,7 +173,7 @@
<SaveButton onClick={handleSubmit} label={"toolbar.query"} />
</Toolbar>
</DialogActions>
- </Form>
+ </StyledForm>
);
};
return (
@@ -162,7 +184,7 @@
aria-hidden
fullWidth
disableRestoreFocus
- maxWidth="lg"
+ maxWidth="xl"
>
<DialogTitle id="form-dialog-title" sx={{
position: 'sticky',
@@ -199,28 +221,40 @@
)}
perPage={DEFAULT_PAGE_SIZE}
>
- <StyledDatagrid
- preferenceKey='deliveryItem'
- bulkActionButtons={<AddOutStockButton setOpen={setOpen}/>}
- rowClick={(id, resource, record) => false}
- expand={false}
- expandSingle={true}
- omit={['id', 'createTime', 'createBy', 'memo', 'workQty', 'startTime', 'endTime', 'updateBy', 'createTime']}
- >
- <NumberField source="id" />
- <TextField source="matnrCode" label="table.field.deliveryItem.matnrCode" />
- <TextField source="matnrName" label="table.field.deliveryItem.matnrName" />
- <TextField source="unit" label="table.field.deliveryItem.unit" />
- <NumberField source="anfme" label="table.field.deliveryItem.anfme" />
- <TextField source="splrName" label="table.field.deliveryItem.splrName" />
- <TextField source="splrBatch" label="table.field.deliveryItem.splrBatch" />
- <TextField source="updateBy$" label="common.field.updateBy" />
- <DateField source="updateTime" label="common.field.updateTime" showTime />
- <TextField source="createBy$" label="common.field.createBy" />
- <DateField source="createTime" label="common.field.createTime" showTime />
- <BooleanField source="statusBool" label="common.field.status" sortable={false} />
- <TextField source="memo" label="common.field.memo" sortable={false} />
- </StyledDatagrid>
+ <Box sx={{ position: 'relative', minHeight: "60vh", }}>
+ <LinearProgress
+ sx={{
+ height: "2px",
+ position: 'absolute',
+ top: 0,
+ left: 0,
+ right: 0,
+ }}
+ />
+ <StyledDatagrid
+ preferenceKey='deliveryItem'
+ bulkActionButtons={<AddOutStockButton setOpen={setOpen} />}
+ rowClick={(id, resource, record) => false}
+ expand={false}
+ expandSingle={true}
+ omit={['id', 'createTime', 'createBy', 'memo', 'workQty', '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="unit" label="table.field.deliveryItem.unit" />
+ <NumberField source="anfme" label="table.field.deliveryItem.anfme" />
+ <TextField source="splrName" label="table.field.deliveryItem.splrName" />
+ <TextField source="splrBatch" label="table.field.deliveryItem.splrBatch" />
+ <TextField source="updateBy$" label="common.field.updateBy" />
+ <DateField source="updateTime" label="common.field.updateTime" showTime />
+ <TextField source="createBy$" label="common.field.createBy" />
+ <DateField source="createTime" label="common.field.createTime" showTime />
+ <BooleanField source="statusBool" label="common.field.status" sortable={false} />
+ <TextField source="memo" label="common.field.memo" sortable={false} />
+ </StyledDatagrid>
+ </Box>
</List>
</Grid>
</DialogContent>
@@ -236,8 +270,7 @@
const { selectedIds, onUnselectItems } = useListContext();
const notify = useNotify();
const confirm = async (event) => {
- console.log(selectedIds);
- const res = await request.post(`/outStock/generate/orders`, {ids: selectedIds});
+ const res = await request.post(`/outStock/generate/orders`, { ids: selectedIds });
if (res?.data?.code === 200) {
notify(res.data.msg);
} else {
--
Gitblit v1.9.1