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

skyouc

2025-07-11 e7dcf3d8570b6a9b2967ba0b90e982322b9cfaf7

 rsf-admin/src/page/warehouseAreas/WarehouseAreasEdit.jsx

@@ -28,6 +28,8 @@
import CustomerTopToolBar from "../components/EditTopToolBar";
import MemoInput from "../components/MemoInput";
import StatusSelectInput from "../components/StatusSelectInput";
import DictionarySelect from "../components/DictionarySelect";
import DictSelect from "../components/DictSelect";

const FormToolbar = () => {
    const { getValues } = useFormContext();
@@ -86,13 +88,11 @@
                                validate={[required()]}
                                parse={v => v}
                            />
                            <AutocompleteInput
                                choices={dicts}
                                optionText="label"
                                label="table.field.warehouseAreas.type"
                                source="type"
                                optionValue="value"
                                parse={v => v}
                            <DictionarySelect
                                label='table.field.warehouseAreas.type'
                                name="type"
                                dictTypeCode="sys_ware_areas_type"
                                alwaysOn                                
                            />
                            <ReferenceInput
                                source="warehouseId"
@@ -101,6 +101,7 @@
                                <AutocompleteInput
                                    label="table.field.warehouseAreas.wareId"
                                    optionText="name"
                                    optionValue="id"
                                    validate={[required()]}
                                    filterToQuery={(val) => ({ name: val })}
                                />