Merge branch 'front' into devlop

skyouc

2025-03-19 3bd07e5f90d5d832b8502252e1daebdd014320f8

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

@@ -42,7 +42,7 @@

const LocEdit = () => {
    const translate = useTranslate();

    const dicts = JSON.parse(localStorage.getItem('sys_dicts'))?.filter(dict => (dict.dictTypeCode == 'sys_loc_type')) || [];
    return (
        <Edit
            redirect="list"
@@ -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,38 +99,14 @@
                                />
                            </Grid>
                            <Grid item xs={6} display="flex" gap={1}>
                                <TextInput
                                    label="table.field.loc.type"
                                <AutocompleteInput
                                    choices={dicts}
                                    source="type"
                                    optionText="label"
                                    label="table.field.loc.type"
                                    optionValue="value"
                                    parse={v => v}
                                    validate={required()}
                                />
                            </Grid>
                            <Grid item xs={6} display="flex" gap={1}>
                                <TextInput
                                    label="table.field.loc.name"
                                    source="name"
                                    parse={v => v}
                                />
                            </Grid>
                            <Grid item xs={6} display="flex" gap={1}>
                                <NumberInput
                                    label="table.field.loc.flagLogic"
                                    source="flagLogic"
                                />
                            </Grid>
                            <Grid item xs={6} display="flex" gap={1}>
                                <TextInput
                                    label="table.field.loc.fucAtrrs"
                                    source="fucAtrrs"
                                    parse={v => v}
                                />
                            </Grid>
                            <Grid item xs={6} display="flex" gap={1}>
                                <TextInput
                                    label="table.field.loc.barcode"
                                    source="barcode"
                                    parse={v => v}
                                    validate={[required()]}
                                />
                            </Grid>
                            <Grid item xs={6} display="flex" gap={1}>
@@ -164,7 +140,7 @@
                            <Grid item xs={6} display="flex" gap={1}>
                                <NumberInput
                                    label="table.field.loc.row"
                                    source="lrow"
                                    source="row"
                                    validate={required()}
                                />
                            </Grid>
@@ -182,41 +158,7 @@
                                    validate={required()}
                                />
                            </Grid>
                            <Grid item xs={6} display="flex" gap={1}>
                                <NumberInput
                                    label="table.field.loc.channel"
                                    source="channel"
                                    validate={required()}
                                />
                            </Grid>
                            <Grid item xs={6} display="flex" gap={1}>
                                <NumberInput
                                    label="table.field.loc.maxParts"
                                    source="maxParts"
                                />
                            </Grid>
                            <Grid item xs={6} display="flex" gap={1}>
                                <NumberInput
                                    label="table.field.loc.maxPack"
                                    source="maxPack"
                                />
                            </Grid>
                            <Grid item xs={6} display="flex" gap={1}>
                                <NumberInput
                                    label="table.field.loc.flagLabelMange"
                                    source="flagLabelMange"
                                />
                            </Grid>
                            <Grid item xs={6} display="flex" gap={1}>
                                <TextInput
                                    label="table.field.loc.locAttrs"
                                    source="locAttrs"
                                    parse={v => v}
                                    validate={required()}
                                />
                            </Grid>
                        </Grid>

                    </Grid>
                    <Grid item xs={12} md={2}>
                        <Typography variant="h6" gutterBottom>