From 95549a8f8a6a64ed7fc822f275e5c8b8d4e5c0ae Mon Sep 17 00:00:00 2001
From: skyouc
Date: 星期五, 18 七月 2025 16:30:12 +0800
Subject: [PATCH] 盘点差异单功能优化
---
rsf-admin/src/page/orders/check/checkDiff/CheckDiffEdit.jsx | 173 ++++++++++++++++++++++++++-------------------------------
1 files changed, 80 insertions(+), 93 deletions(-)
diff --git a/rsf-admin/src/page/orders/check/checkDiff/CheckDiffEdit.jsx b/rsf-admin/src/page/orders/check/checkDiff/CheckDiffEdit.jsx
index e29859d..885c0c0 100644
--- a/rsf-admin/src/page/orders/check/checkDiff/CheckDiffEdit.jsx
+++ b/rsf-admin/src/page/orders/check/checkDiff/CheckDiffEdit.jsx
@@ -22,109 +22,96 @@
} 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 EditBaseAside from "../../../components/EditBaseAside";
+import CustomerTopToolBar from "../../../components/EditTopToolBar";
+import CheckDiffItemList from "../checkDiffItem/CheckDiffItemList";
-const FormToolbar = () => {
- const { getValues } = useFormContext();
-
- return (
- <Toolbar sx={{ justifyContent: 'space-between' }}>
- <SaveButton />
- <DeleteButton mutationMode="optimistic" />
- </Toolbar>
- )
-}
const CheckDiffEdit = () => {
const translate = useTranslate();
return (
- <Edit
- redirect="list"
- mutationMode={EDIT_MODE}
- actions={<CustomerTopToolBar />}
- aside={<EditBaseAside />}
- >
- <SimpleForm
- shouldUnregister
- warnWhenUnsavedChanges
- toolbar={<FormToolbar />}
- mode="onTouched"
- defaultValues={{}}
- // validate={(values) => { }}
+ <>
+ <Edit
+ redirect="list"
+ sx={{marginBottom: 1}}
+ mutationMode={EDIT_MODE}
+ actions={<CustomerTopToolBar />}
+ aside={<EditBaseAside />}
>
- <Grid container width={{ xs: '100%', xl: '80%' }} rowSpacing={3} columnSpacing={3}>
- <Grid item xs={12} md={8}>
- <Typography variant="h6" gutterBottom>
- {translate('common.edit.title.main')}
- </Typography>
- <Stack direction='row' gap={2}>
- <TextInput
- label="table.field.checkDiff.orderCode"
- source="orderCode"
- parse={v => v}
- autoFocus
- />
- </Stack>
- <Stack direction='row' gap={2}>
- <SelectInput
- label="table.field.checkDiff.checkType"
- source="checkType"
- choices={[
- { id: 0, name: '鏄庣洏' },
- { id: 1, name: '鏆楃洏' },
- ]}
- />
- </Stack>
- <Stack direction='row' gap={2}>
- <NumberInput
- label="table.field.checkDiff.areaId"
- source="areaId"
- />
- </Stack>
- <Stack direction='row' gap={2}>
- <TextInput
- label="table.field.checkDiff.areaName"
- source="areaName"
- parse={v => v}
- />
- </Stack>
- <Stack direction='row' gap={2}>
- <NumberInput
- label="table.field.checkDiff.anfme"
- source="anfme"
- />
- </Stack>
- <Stack direction='row' gap={2}>
- <NumberInput
- label="table.field.checkDiff.checkQty"
- source="checkQty"
- />
- </Stack>
- <Stack direction='row' gap={2}>
- <NumberInput
- label="table.field.checkDiff.exceStatus"
- source="exceStatus"
- />
- </Stack>
+ <SimpleForm
+ shouldUnregister
+ warnWhenUnsavedChanges
+ toolbar={false}
+ mode="onTouched"
+ defaultValues={{}}
+ >
+ <Grid container width={{ xs: '100%', xl: '100%' }} rowSpacing={3} columnSpacing={3}
+ 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 item xs={24} md={12} >
+ <Typography variant="h6" gutterBottom>
+ {translate('common.edit.title.main')}
+ </Typography>
+ <Stack direction='row' gap={2}>
+ <TextInput
+ label="table.field.checkDiff.orderCode"
+ source="orderCode"
+ parse={v => v}
+ autoFocus
+ />
+ <SelectInput
+ label="table.field.checkDiff.checkType"
+ source="checkType"
+ choices={[
+ { id: 0, name: '鏄庣洏' },
+ { id: 1, name: '鏆楃洏' },
+ ]}
+ />
+ <NumberInput
+ label="table.field.checkDiff.areaId"
+ source="areaId"
+ />
+ <TextInput
+ label="table.field.checkDiff.areaName"
+ source="areaName"
+ parse={v => v}
+ />
+ </Stack>
+ <Stack direction='row' gap={2}>
+ <NumberInput
+ label="table.field.checkDiff.anfme"
+ source="anfme"
+ />
+ <NumberInput
+ label="table.field.checkDiff.checkQty"
+ source="checkQty"
+ />
+ <NumberInput
+ label="table.field.checkDiff.exceStatus"
+ source="exceStatus"
+ />
+ </Stack>
+ </Grid>
</Grid>
- <Grid item xs={12} md={4}>
- <Typography variant="h6" gutterBottom>
- {translate('common.edit.title.common')}
- </Typography>
- <StatusSelectInput />
- <Box mt="2em" />
- <MemoInput />
- </Grid>
- </Grid>
- </SimpleForm>
- </Edit >
+ </SimpleForm>
+ </Edit >
+ <CheckDiffItemList />
+ </>
)
}
--
Gitblit v1.9.1