Merge branch 'front' into devlop

skyouc

2025-03-18 031e36213941ad3430da2b0429701e742f09f5d8

 rsf-admin/src/page/basicInfo/loc/LocEdit.jsx

@@ -66,7 +66,7 @@
                        <Grid container rowSpacing={2} columnSpacing={2}>
                            <Grid item xs={6} display="flex" gap={1}>
                                <ReferenceInput
                                    source="warehouseId$"
                                    source="warehouseId"
                                    reference="warehouse"
                                >
                                    <AutocompleteInput
@@ -99,12 +99,19 @@
                                />
                            </Grid>
                            <Grid item xs={6} display="flex" gap={1}>
                                <TextInput
                                    label="table.field.loc.type"
                                <ReferenceInput
                                    source="type"
                                    parse={v => v}
                                    validate={required()}
                                />
                                    reference="dictData"
                                    filter={{ dictTypeCode: 'sys_loc_type' }}
                                >
                                    <AutocompleteInput
                                        label="table.field.loc.type"
                                        optionText="label"
                                        optionValue="value"
                                        parse={v => v}
                                        validate={[required()]}
                                    />
                                </ReferenceInput>
                            </Grid>
                            <Grid item xs={6} display="flex" gap={1}>
                                <TextInput
@@ -141,10 +148,24 @@
                                />
                            </Grid>
                            <Grid item xs={6} display="flex" gap={1}>
                                <TextInput
                                    label="table.field.loc.size"
                                    source="size"
                                    parse={v => v}
                                <NumberInput
                                    label="table.field.loc.length"
                                    source="length"
                                    validate={required()}
                                />
                            </Grid>
                            <Grid item xs={6} display="flex" gap={1}>
                                <NumberInput
                                    label="table.field.loc.width"
                                    source="width"
                                    validate={required()}
                                />
                            </Grid>
                            <Grid item xs={6} display="flex" gap={1}>
                                <NumberInput
                                    label="table.field.loc.height"
                                    source="height"
                                    validate={required()}
                                />
                            </Grid>
                            <Grid item xs={6} display="flex" gap={1}>