From 9e502880847d2b798d956ba36a92f9cbdec4f823 Mon Sep 17 00:00:00 2001
From: skyouc
Date: 星期五, 01 八月 2025 09:08:27 +0800
Subject: [PATCH] 调拔单需要据原库区，筛选出库库存信息 入出库历史单据界面优化
---
rsf-admin/src/page/orders/stock/OrderList.jsx | 25 +++++-------
rsf-admin/src/page/orders/transfer/CreateBySelectMats.jsx | 10 +---
rsf-admin/src/page/warehouseAreasItem/WarehouseAreasItemList.jsx | 2
rsf-admin/src/page/orders/stock/OrderEdit.jsx | 49 +++++++++++-------------
4 files changed, 37 insertions(+), 49 deletions(-)
diff --git a/rsf-admin/src/page/orders/stock/OrderEdit.jsx b/rsf-admin/src/page/orders/stock/OrderEdit.jsx
index acc0034..64c0e6b 100644
--- a/rsf-admin/src/page/orders/stock/OrderEdit.jsx
+++ b/rsf-admin/src/page/orders/stock/OrderEdit.jsx
@@ -17,25 +17,16 @@
required,
DeleteButton,
} from 'react-admin';
-import { useWatch, useFormContext } from "react-hook-form";
-import { Stack, Grid, Box, Typography } from '@mui/material';
-import * as Common from '@/utils/common';
import { EDIT_MODE, REFERENCE_INPUT_PAGESIZE } from '@/config/setting';
-import EditBaseAside from "../../components/EditBaseAside";
-import CustomerTopToolBar from "../../components/EditTopToolBar";
-import MemoInput from "../../components/MemoInput";
import StatusSelectInput from "../../components/StatusSelectInput";
+import CustomerTopToolBar from "../../components/EditTopToolBar";
+import { Stack, Grid, Box, Typography } from '@mui/material';
+import { useWatch, useFormContext } from "react-hook-form";
+import EditBaseAside from "../../components/EditBaseAside";
+import MemoInput from "../../components/MemoInput";
import OrderItemList from "./OrderItemList";
-const FormToolbar = () => {
- const { getValues } = useFormContext();
+import * as Common from '@/utils/common';
- return (
- <Toolbar sx={{ justifyContent: 'space-between' }}>
- <SaveButton />
- <DeleteButton mutationMode="optimistic" />
- </Toolbar>
- )
-}
const OrderEdit = () => {
const translate = useTranslate();
@@ -53,12 +44,27 @@
<SimpleForm
shouldUnregister
warnWhenUnsavedChanges
- toolbar={<FormToolbar />}
+ toolbar={false}
mode="onTouched"
defaultValues={{}}
+ sx={{
+ "& .MuiFormLabel-root.MuiInputLabel-root.Mui-disabled": {
+ bgcolor: 'white',
+ WebkitTextFillColor: "rgba(0, 0, 0)"
+ },
+
+ "& .MuiInputBase-input.MuiFilledInput-input.Mui-disabled": {
+ bgcolor: 'white',
+ WebkitTextFillColor: "rgba(0, 0, 0)"
+ },
+
+ "& .MuiFilledInput-root.MuiInputBase-sizeSmall": {
+ bgcolor: 'white',
+ }
+ }}
>
<Grid container width={{ xs: '100%', xl: '90%' }} rowSpacing={3} columnSpacing={3}>
- <Grid item xs={16} md={10}>
+ <Grid item xs={24} md={12}>
<Typography variant="h6" gutterBottom>
{translate('common.edit.title.main')}
</Typography>
@@ -69,7 +75,6 @@
parse={v => v}
autoFocus
/>
-
<TextInput
label="table.field.stock.sourceCode"
source="sourceCode"
@@ -103,14 +108,6 @@
validate={required()}
/>
</Stack>
- </Grid>
- <Grid item xs={8} md={2}>
- <Typography variant="h6" gutterBottom>
- {translate('common.edit.title.common')}
- </Typography>
- <StatusSelectInput />
- <Box mt="2em" />
- <MemoInput />
</Grid>
</Grid>
</SimpleForm>
diff --git a/rsf-admin/src/page/orders/stock/OrderList.jsx b/rsf-admin/src/page/orders/stock/OrderList.jsx
index 77918a1..516fea9 100644
--- a/rsf-admin/src/page/orders/stock/OrderList.jsx
+++ b/rsf-admin/src/page/orders/stock/OrderList.jsx
@@ -32,17 +32,19 @@
AutocompleteInput,
DeleteButton,
} from 'react-admin';
-import { Box, Typography, Card, Stack } from '@mui/material';
-import { styled } from '@mui/material/styles';
-import OrderCreate from "./OrderCreate";
-import OrderPanel from "./OrderPanel";
-import EmptyData from "../../components/EmptyData";
+
+import { PAGE_DRAWER_WIDTH, OPERATE_MODE, DEFAULT_PAGE_SIZE } from '@/config/setting';
import MyCreateButton from "../../components/MyCreateButton";
import MyExportButton from '../../components/MyExportButton';
+import { Box, Typography, Card, Stack } from '@mui/material';
import PageDrawer from "../../components/PageDrawer";
+import EmptyData from "../../components/EmptyData";
import MyField from "../../components/MyField";
-import { PAGE_DRAWER_WIDTH, OPERATE_MODE, DEFAULT_PAGE_SIZE } from '@/config/setting';
+import { styled } from '@mui/material/styles';
import * as Common from '@/utils/common';
+import OrderCreate from "./OrderCreate";
+import OrderPanel from "./OrderPanel";
+
const StyledDatagrid = styled(DatagridConfigurable)(({ theme }) => ({
'& .css-1vooibu-MuiSvgIcon-root': {
@@ -62,14 +64,12 @@
<SearchInput source="condition" alwaysOn />,
<DateInput label='common.time.after' source="timeStart" alwaysOn />,
<DateInput label='common.time.before' source="timeEnd" alwaysOn />,
-
<TextInput source="code" label="table.field.stock.code" />,
<TextInput source="sourceCode" label="table.field.stock.sourceCode" />,
<NumberInput source="sourceId" label="table.field.stock.sourceId" />,
<TextInput source="type" label="table.field.stock.type" />,
<TextInput source="wkType" label="table.field.stock.wkType" />,
<NumberInput source="anfme" label="table.field.stock.anfme" />,
-
<TextInput label="common.field.memo" source="memo" />,
<SelectInput
label="common.field.status"
@@ -83,9 +83,9 @@
]
const OrderList = () => {
- const translate = useTranslate();
const [createDialog, setCreateDialog] = useState(false);
const [drawerVal, setDrawerVal] = useState(false);
+ const translate = useTranslate();
return (
<Box display="flex">
@@ -116,7 +116,7 @@
bulkActionButtons={false}
rowClick='edit'
expandSingle={false}
- omit={['id', 'createTime', 'sourceId', 'createBy$', 'memo','statusBool','opt']}
+ omit={['id', 'sourceId', 'memo','statusBool','opt']}
>
<NumberField source="id" />
<TextField source="code" label="table.field.stock.code" />
@@ -131,12 +131,7 @@
<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} />
- <WrapperField cellClassName="opt" label="common.field.opt">
- <EditButton sx={{ padding: '1px', fontSize: '.75rem' }} />
- <DeleteButton sx={{ padding: '1px', fontSize: '.75rem' }} mutationMode={OPERATE_MODE} />
- </WrapperField>
</StyledDatagrid>
</List>
<OrderCreate
diff --git a/rsf-admin/src/page/orders/transfer/CreateBySelectMats.jsx b/rsf-admin/src/page/orders/transfer/CreateBySelectMats.jsx
index 34e824a..6c491bf 100644
--- a/rsf-admin/src/page/orders/transfer/CreateBySelectMats.jsx
+++ b/rsf-admin/src/page/orders/transfer/CreateBySelectMats.jsx
@@ -49,8 +49,6 @@
const translate = useTranslate();
const notify = useNotify();
const refresh = useRefresh();
- console.log("-----=====>");
- console.log(queryForm);
const handleClose = (event, reason) => {
if (reason !== "backdropClick") {
@@ -134,7 +132,7 @@
aria-labelledby="form-dialog-title"
fullWidth
disableRestoreFocus
- maxWidth="lg"
+ maxWidth="xl"
>
<DialogTitle id="form-dialog-title" sx={{
position: 'sticky',
@@ -174,7 +172,7 @@
</Grid>
</Box>
- <Box sx={{ mt: 2, height: 400, width: '100%' }}>
+ <Box sx={{ mt: 2, height: 600, width: '100%' }}>
<SelectMatsTableView
tableData={tableData}
setTableData={setTableData}
@@ -232,8 +230,6 @@
});
if (res?.data?.code === 200) {
const { data } = res.data;
- console.log('====-->');
- console.log(data);
setTableData(data?.records);
setRowCount(data?.total);
@@ -276,7 +272,7 @@
}
return (
- <div style={{ height: 400, width: '100%' }}>
+ <div style={{ height: 590, width: '100%' }}>
<DataGrid
rows={tableData}
rowCount={rowCount}
diff --git a/rsf-admin/src/page/warehouseAreasItem/WarehouseAreasItemList.jsx b/rsf-admin/src/page/warehouseAreasItem/WarehouseAreasItemList.jsx
index 607c6db..60d1b75 100644
--- a/rsf-admin/src/page/warehouseAreasItem/WarehouseAreasItemList.jsx
+++ b/rsf-admin/src/page/warehouseAreasItem/WarehouseAreasItemList.jsx
@@ -236,7 +236,7 @@
}
return (
- <Box sx={{ position: 'relative', minHeight: "60vh", }}>
+ <Box sx={{ position: 'relative', minHeight: "82vh", }}>
{isLoading && (
<LinearProgress
sx={{
--
Gitblit v1.9.1