From 8d5c50656d81dc3eb04a841ecd259adebf99424a Mon Sep 17 00:00:00 2001
From: chen.lin <1442464845@qq.com>
Date: 星期三, 11 二月 2026 15:49:26 +0800
Subject: [PATCH] 搜索库存明细调整不查询删除物料
---
rsf-admin/src/page/orders/outStock/OutOrderModal.jsx | 180 ++++++++++++++++++++++++++++++++++++++---------------------
1 files changed, 116 insertions(+), 64 deletions(-)
diff --git a/rsf-admin/src/page/orders/outStock/OutOrderModal.jsx b/rsf-admin/src/page/orders/outStock/OutOrderModal.jsx
index 5bc8cc3..67594a4 100644
--- a/rsf-admin/src/page/orders/outStock/OutOrderModal.jsx
+++ b/rsf-admin/src/page/orders/outStock/OutOrderModal.jsx
@@ -1,10 +1,11 @@
-import { Dialog, DialogActions, DialogContent, DialogTitle, Box } from "@mui/material";
-import React, { useState, useRef, useEffect, useMemo } from "react";
+import { Dialog, DialogActions, DialogContent, DialogTitle, Box, LinearProgress } from "@mui/material";
+import React, { useState, useRef, useEffect, useMemo, useCallback } from "react";
import {
List,
DatagridConfigurable,
SearchInput,
TopToolbar,
+ Toolbar,
Button,
SelectColumnsButton,
EditButton,
@@ -13,7 +14,6 @@
ExportButton,
BulkDeleteButton,
WrapperField,
- Toolbar,
useRecordContext,
useTranslate,
useNotify,
@@ -33,19 +33,23 @@
ReferenceArrayInput,
AutocompleteInput,
DeleteButton,
+ SimpleForm,
Form,
SaveButton,
useRefresh,
useGetList,
} from 'react-admin';
-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 request from '@/utils/request';
-import SaveIcon from '@mui/icons-material/Save';
-import debounce from "lodash/debounce";
+import DialogCloseButton from "../../components/DialogCloseButton";
+import EditableTextField from "../../components/EditableTextField";
import CheckCircleIcon from '@mui/icons-material/CheckCircle';
+import { Grid, margin, Stack, width } from "@mui/system";
+import SaveIcon from '@mui/icons-material/Save';
+import OutOrderPreview from "./OutOrderPreview";
+import { styled } from '@mui/material/styles';
+import request from '@/utils/request';
+
const StyledDatagrid = styled(DatagridConfigurable)(({ theme }) => ({
'& .css-1vooibu-MuiSvgIcon-root': {
@@ -58,6 +62,17 @@
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" />,
@@ -79,68 +94,100 @@
]
const OutOrderModal = (props) => {
- const { open, setOpen, record } = props;
- const translate = useTranslate();
- const [params, setParams] = useState({});
+ const { open, setOpen, preview, setPreview, record, initialFormData, saveFormData } = props;
const [drawerVal, setDrawerVal] = useState(false);
+ const [params, setParams] = useState(() => initialFormData?.params ?? {});
+ const [select, setSelect] = useState([]);
+ const translate = useTranslate();
const refresh = useRefresh();
+
+ useEffect(() => {
+ if (open && initialFormData?.params) {
+ setParams(initialFormData.params);
+ }
+ }, [open, initialFormData?.params]);
const handleClose = (event, reason) => {
if (reason !== "backdropClick") {
setOpen(false);
}
};
+
+ useEffect(() => {
+ if (open && params && Object.keys(params).length > 0 && saveFormData) {
+ saveFormData({ params, formValues: params });
+ }
+ }, [open, params, saveFormData]);
+
+ const handleFormValuesChange = useCallback((formValues) => {
+ if (saveFormData) {
+ saveFormData({ params: formValues, formValues });
+ }
+ }, [saveFormData]);
+
const CustomFilter = () => {
- const { filterValues, setFilters, refetch } = useListContext('deliveryItem');
- const [formValues, setFormValues] = useState(filterValues);
+ const { filterValues } = useListContext();
+ const initialFormValues = initialFormData?.formValues ?? initialFormData?.params ?? params ?? filterValues;
+ const [formValues, setFormValues] = useState(initialFormValues || {});
+ const initializedRef = useRef(false);
+ useEffect(() => {
+ if (open && (initialFormData?.formValues || initialFormData?.params) && !initializedRef.current) {
+ const init = initialFormData?.formValues ?? initialFormData?.params ?? {};
+ setFormValues(init);
+ initializedRef.current = true;
+ }
+ if (!open) initializedRef.current = false;
+ }, [open, initialFormData?.formValues, initialFormData?.params]);
+
const handleChange = (event) => {
- if (event.target == undefined || event.target == null) {return}
- setFormValues(formValues => ({
+ if (event.target == undefined || event.target == null) { return }
+ const next = {
...formValues,
- [event.target.name]: event.target.value
- }));
+ [event.target.name]: event.target.value,
+ };
+ setFormValues(next);
+ handleFormValuesChange(next);
};
const handleSubmit = (event) => {
- setParams(formValues)
+ setParams(formValues);
+ if (saveFormData) saveFormData({ params: formValues, formValues });
};
return (
- <Form>
- <Grid container rowSpacing={2} columnSpacing={2} >
+ <StyledForm>
+ <Grid container rowSpacing={3} columnSpacing={3} >
<Stack>
<TextInput
source="condition"
label="common.action.search"
resettable
- defaultValue={params?.condition}
+ value={formValues?.condition ?? ''}
onChange={handleChange} />
</Stack>
<Stack>
<TextInput
source="deliveryCode"
label="table.field.deliveryItem.deliveryCode"
- defaultValue={params?.matnrName}
+ value={formValues?.deliveryCode ?? ''}
onChange={handleChange}
resettable
-
/>
</Stack>
<Stack>
<TextInput
- source="matnrName"
+ source="maktx"
label="table.field.deliveryItem.matnrName"
- defaultValue={params?.matnrName}
+ value={formValues?.maktx ?? ''}
onChange={handleChange}
resettable
-
/>
</Stack>
<Stack>
<TextInput
source="matnrCode"
label="table.field.deliveryItem.matnrCode"
- defaultValue={params?.matnrCode}
+ value={formValues?.matnrCode ?? ''}
resettable
onChange={handleChange} />
</Stack>
@@ -148,7 +195,7 @@
<TextInput
source="splrName"
label="table.field.deliveryItem.splrName"
- defaultValue={params?.splrName}
+ value={formValues?.splrName ?? ''}
resettable
onChange={handleChange} />
</Stack>
@@ -158,7 +205,7 @@
<SaveButton onClick={handleSubmit} label={"toolbar.query"} />
</Toolbar>
</DialogActions>
- </Form>
+ </StyledForm>
);
};
return (
@@ -184,9 +231,9 @@
</DialogTitle>
<Grid container rowSpacing={2} columnSpacing={2}>
<DialogContent>
- <Grid item sx={24}>
+ <Grid item>
<List
- resource="deliveryItem"
+ resource="/deliveryItem/filters"
sx={{
flexGrow: 1,
transition: (theme) =>
@@ -206,33 +253,41 @@
)}
perPage={DEFAULT_PAGE_SIZE}
>
- <StyledDatagrid
- sx={{ height: '400' }}
- 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 sx={{ position: 'relative', minHeight: "60vh", }}>
+ <LinearProgress
+ sx={{ height: "2px", position: 'absolute', top: 0, left: 0, right: 0, }}
+ />
+ <StyledDatagrid
+ preferenceKey='deliveryItem'
+ bulkActionButtons={<AddOutStockButton setOpen={setOpen} setPreview={setPreview} setSelect={setSelect} />}
+ rowClick={(id, resource, record) => false}
+ expand={false}
+ expandSingle={true}
+ 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="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" />
+ <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>
+ </Grid>
+ <Grid>
+ <OutOrderPreview open={preview} setOpen={setPreview} selectedIds={select} setCloseParent={setOpen} />
</Grid>
</Dialog >
)
@@ -241,18 +296,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);
- }
+ setPreview(true)
+ setSelect(selectedIds);
onUnselectItems();
- setOpen(false);
+ // refresh();
}
return (
--
Gitblit v1.9.1