Merge branch 'devlop' of http://47.97.1.152:5880/r/wms-master into devlop

verou

2025-04-11 401e85bb3749bb9107f65ddaa15868a0a9ba852e

 rsf-admin/src/page/purchase/PurchaseEdit.jsx

@@ -28,12 +28,13 @@
import CustomerTopToolBar from "../components/EditTopToolBar";
import MemoInput from "../components/MemoInput";
import StatusSelectInput from "../components/StatusSelectInput";
import PurchaseItemList from "./PurchaseItemList";

const FormToolbar = () => {
    const { getValues } = useFormContext();

    return (
        <Toolbar sx={{ justifyContent: 'space-between' }}>
        <Toolbar sx={{ justifyContent: 'end' }}>
            <SaveButton />
            <DeleteButton mutationMode="optimistic" />
        </Toolbar>
@@ -44,6 +45,7 @@
    const translate = useTranslate();

    return (
        <>
        <Edit
            redirect="list"
            mutationMode={EDIT_MODE}
@@ -59,7 +61,7 @@
            // validate={(values) => { }}
            >
                <Grid container width={{ xs: '100%', xl: '80%' }} rowSpacing={3} columnSpacing={3}>
                    <Grid item xs={12} md={8}>
                        <Grid item xs={18} md={10}>
                        <Typography variant="h6" gutterBottom>
                            {translate('common.edit.title.main')}
                        </Typography>
@@ -74,26 +76,20 @@
                        <Stack direction='row' gap={2}>
                            <TextInput
                                label="table.field.purchase.type"
                                source="type"
                                    source="type$"
                                parse={v => v}
                                validate={required()}
                            />
                        </Stack>
                        <Stack direction='row' gap={2}>
                            <TextInput
                                label="table.field.purchase.source"
                                source="source"
                                parse={v => v}
                                validate={required()}
                            />
                        </Stack>
                        <Stack direction='row' gap={2}>
                            <DateInput
                                label="table.field.purchase.preArr"
                                source="preArr"
                            />
                        </Stack>
                        <Stack direction='row' gap={2}>
                            <NumberInput
                                label="table.field.purchase.anfme"
                                source="anfme"
@@ -106,22 +102,16 @@
                                source="qty"
                                validate={required()}
                            />
                        </Stack>
                        <Stack direction='row' gap={2}>
                            <NumberInput
                                label="table.field.purchase.workQty"
                                source="workQty"
                                validate={required()}
                            />
                        </Stack>
                        <Stack direction='row' gap={2}>
                            <TextInput
                                label="table.field.purchase.channel"
                                source="channel"
                                parse={v => v}
                            />
                        </Stack>
                        <Stack direction='row' gap={2}>
                            <TextInput
                                label="table.field.purchase.platCode"
                                source="platCode"
@@ -133,23 +123,18 @@
                                label="table.field.purchase.startTime"
                                source="startTime"
                            />
                        </Stack>
                        <Stack direction='row' gap={2}>
                            <DateInput
                                label="table.field.purchase.endTime"
                                source="endTime"
                            />
                        </Stack>
                        <Stack direction='row' gap={2}>
                            <TextInput
                                label="table.field.purchase.project"
                                source="project"
                                parse={v => v}
                            />
                        </Stack>

                    </Grid>
                    <Grid item xs={12} md={4}>
                        <Grid item xs={6} md={2}>
                        <Typography variant="h6" gutterBottom>
                            {translate('common.edit.title.common')}
                        </Typography>
@@ -160,6 +145,8 @@
                </Grid>
            </SimpleForm>
        </Edit >
            <PurchaseItemList />                            
        </>
    )
}