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

skyouc

2025-03-21 ef4e00d941103884eede0037c62a6739f68ed5d5

 rsf-admin/src/page/basicInfo/locArea/LocAreaCreate.jsx

@@ -100,12 +100,18 @@
                                    />
                                </Grid>
                                <Grid item xs={6} display="flex" gap={1}>
                                    <NumberInput
                                        label="table.field.locArea.areaId"
                                    <ReferenceInput
                                        source="areaId"
                                    />
                                        reference="warehouseAreas"
                                    >
                                        <AutocompleteInput
                                            label="table.field.locArea.areaId"
                                            optionText="name"
                                            filterToQuery={(val) => ({ name: val })}
                                        />
                                    </ReferenceInput>
                                </Grid>
                                <Grid item xs={6} display="flex" gap={1}>
                                {/* <Grid item xs={6} display="flex" gap={1}>
                                    <ReferenceInput
                                        source="locId"
                                        reference="loc"
@@ -116,7 +122,7 @@
                                            filterToQuery={(val) => ({ warehouseId: val })}
                                        />
                                    </ReferenceInput>
                                </Grid>
                                </Grid> */}

                                <Grid item xs={6} display="flex" gap={1}>
                                    <StatusSelectInput />