diff --git a/src/pages/vehicle/create.tsx b/src/pages/vehicle/create.tsx index 431b6a3..4f12743 100644 --- a/src/pages/vehicle/create.tsx +++ b/src/pages/vehicle/create.tsx @@ -14,11 +14,11 @@ export const VehicleCreate = () => { formState: {errors}, } = useForm({}) - const {autocompleteProps: cityAutocompleteProps} = useAutocomplete({ - resource: 'city', + const {autocompleteProps: carrierAutocompleteProps} = useAutocomplete({ + resource: 'carrier', onSearch: (value) => [ { - field: 'name', + field: 'short_name', operator: 'contains', value, }, @@ -70,26 +70,26 @@ export const VehicleCreate = () => { ( option.id === field.value) || null} + {...carrierAutocompleteProps} + value={carrierAutocompleteProps.options.find((option) => option.id === field.value) || null} onChange={(_, value) => { field.onChange(value?.id || '') }} getOptionLabel={(item) => { - return item ? item.name : '' + return item ? item.short_name : '' }} isOptionEqualToValue={(option, value) => { return option.id === value?.id }} filterOptions={(options, {inputValue}) => { - return options.filter((option) => option.name.toLowerCase().includes(inputValue.toLowerCase())) + return options.filter((option) => option.short_name.toLowerCase().includes(inputValue.toLowerCase())) }} - renderInput={(params) => } + renderInput={(params) => } /> )} /> diff --git a/src/pages/vehicle/edit.tsx b/src/pages/vehicle/edit.tsx index 384acfd..5c612b9 100644 --- a/src/pages/vehicle/edit.tsx +++ b/src/pages/vehicle/edit.tsx @@ -19,11 +19,11 @@ export const VehicleEdit = () => { formState: {errors}, } = useForm({}) - const {autocompleteProps: cityAutocompleteProps} = useAutocomplete({ - resource: 'city', + const {autocompleteProps: carrierAutocompleteProps} = useAutocomplete({ + resource: 'carrier', onSearch: (value) => [ { - field: 'name', + field: 'short_name', operator: 'contains', value, }, @@ -75,26 +75,26 @@ export const VehicleEdit = () => { ( option.id === field.value) || null} + {...carrierAutocompleteProps} + value={carrierAutocompleteProps.options.find((option) => option.id === field.value) || null} onChange={(_, value) => { field.onChange(value?.id || '') }} getOptionLabel={(item) => { - return item ? item.name : '' + return item ? item.short_name : '' }} isOptionEqualToValue={(option, value) => { return option.id === value?.id }} filterOptions={(options, {inputValue}) => { - return options.filter((option) => option.name.toLowerCase().includes(inputValue.toLowerCase())) + return options.filter((option) => option.short_name.toLowerCase().includes(inputValue.toLowerCase())) }} - renderInput={(params) => } + renderInput={(params) => } /> )} /> diff --git a/src/pages/vehicle/list.tsx b/src/pages/vehicle/list.tsx index 746444c..74d03c5 100644 --- a/src/pages/vehicle/list.tsx +++ b/src/pages/vehicle/list.tsx @@ -21,8 +21,8 @@ export const VehicleList = () => { headerAlign: 'left', }, { - field: 'city_id', - headerName: 'ID города', + field: 'carrier_id', + headerName: 'ID перевозчика', type: 'string', minWidth: 150, display: 'flex',