diff --git a/src/client/Containers/Calculation/Sections/sectionsList.ts b/src/client/Containers/Calculation/Sections/sectionsList.ts index 8b5c069..0f923ad 100644 --- a/src/client/Containers/Calculation/Sections/sectionsList.ts +++ b/src/client/Containers/Calculation/Sections/sectionsList.ts @@ -273,9 +273,10 @@ const sections: ISection[] = [ { elements: [ 'cbxInsDecentral', - 'radioInsKaskoType', + // 'radioInsKaskoType', 'tbxInsFranchise', 'tbxMileage', + 'radioInfuranceOPF', // 'selectInsPeriod', // 'btnFranschise', ], @@ -296,7 +297,6 @@ const sections: ISection[] = [ 'selectGPSModel', 'selectLegalClientRegion', 'selectLegalClientTown', - // 'selectInfuranceOPF', 'tbxInsKaskoPriceLeasePeriod', ], }, diff --git a/src/client/Containers/Calculation/lib/elements/components.ts b/src/client/Containers/Calculation/lib/elements/components.ts index 042505a..c67448f 100644 --- a/src/client/Containers/Calculation/lib/elements/components.ts +++ b/src/client/Containers/Calculation/lib/elements/components.ts @@ -105,7 +105,7 @@ const elementsComponents: TElements = { selectGPSModel: Select, selectRegionRegistration: Select, selectTownRegistration: Select, - selectInfuranceOPF: Select, + radioInfuranceOPF: Radio, tbxInsKaskoPriceLeasePeriod: InputNumber, selectRegistration: Select, selectInsNSIB: Select, diff --git a/src/client/Containers/Calculation/lib/elements/elementsProps.ts b/src/client/Containers/Calculation/lib/elements/elementsProps.ts index 4b148aa..8512ce3 100644 --- a/src/client/Containers/Calculation/lib/elements/elementsProps.ts +++ b/src/client/Containers/Calculation/lib/elements/elementsProps.ts @@ -416,6 +416,9 @@ const elementsProps: TElements = { selectLegalClientTown: { showSearch: true, }, + radioInfuranceOPF: { + style: 'button', + }, }; const resultElementsProps: TElements = Object.assign( diff --git a/src/client/Containers/Calculation/lib/elements/titles.ts b/src/client/Containers/Calculation/lib/elements/titles.ts index 12335f8..7b80dd1 100644 --- a/src/client/Containers/Calculation/lib/elements/titles.ts +++ b/src/client/Containers/Calculation/lib/elements/titles.ts @@ -86,7 +86,7 @@ export const elementsTitles: TElements = { selectGPSModel: 'Модель GPS', selectRegionRegistration: 'Регион регистрации', selectTownRegistration: 'Город регистрации', - selectInfuranceOPF: 'ОПФ для расчета страховки', + radioInfuranceOPF: 'ОПФ для расчета страховки', radioInsKaskoType: 'Тип страхования КАСКО', tbxInsKaskoPriceLeasePeriod: 'Стоимость страховки КАСКО на весь срок', cbxInsDecentral: 'Децентрализованное страхование', diff --git a/src/client/Containers/Calculation/lib/elements/values.ts b/src/client/Containers/Calculation/lib/elements/values.ts index 69b920b..bde3df9 100644 --- a/src/client/Containers/Calculation/lib/elements/values.ts +++ b/src/client/Containers/Calculation/lib/elements/values.ts @@ -89,7 +89,7 @@ export const elementsValues: TElements = { selectGPSModel: 'GPSModel', selectRegionRegistration: 'regionRegistration', selectTownRegistration: 'townRegistration', - selectInfuranceOPF: 'infuranceOPF', + radioInfuranceOPF: 'infuranceOPF', radioInsKaskoType: 'insKaskoType', cbxInsDecentral: 'insDecentral', selectInsPeriod: 'insPeriod', diff --git a/src/client/Elements/Select.jsx b/src/client/Elements/Select.jsx index e7dab69..a83d3c7 100644 --- a/src/client/Elements/Select.jsx +++ b/src/client/Elements/Select.jsx @@ -2,7 +2,7 @@ import { Form, Select as AntSelect } from 'antd'; import { ElementStatus } from 'core/types/statuses'; const Select = ({ - value, + value = null, setCurrentValue, status, validateStatus, diff --git a/src/client/stores/CalculationStore/config/initialOptions.ts b/src/client/stores/CalculationStore/config/initialOptions.ts index 57f5ac3..89a7300 100644 --- a/src/client/stores/CalculationStore/config/initialOptions.ts +++ b/src/client/stores/CalculationStore/config/initialOptions.ts @@ -278,7 +278,7 @@ const initialOptions: TElements = { ['asc'], ), - radioInsuranceOPF: [ + radioInfuranceOPF: [ { name: 'ЮЛ', value: 100000000, diff --git a/src/client/stores/CalculationStore/config/initialStatuses.ts b/src/client/stores/CalculationStore/config/initialStatuses.ts index 14f0031..ed53f2f 100644 --- a/src/client/stores/CalculationStore/config/initialStatuses.ts +++ b/src/client/stores/CalculationStore/config/initialStatuses.ts @@ -40,6 +40,7 @@ const initialStatuses: TElements = { selectObjectTypeTax: ElementStatus.Disabled, selectLeaseObjectCategory: ElementStatus.Disabled, tbxINNForCalc: ElementStatus.Disabled, + radioInfuranceOPF: ElementStatus.Disabled, }; export default initialStatuses; diff --git a/src/client/stores/CalculationStore/config/initialValues.ts b/src/client/stores/CalculationStore/config/initialValues.ts index ae07a32..d51bf04 100644 --- a/src/client/stores/CalculationStore/config/initialValues.ts +++ b/src/client/stores/CalculationStore/config/initialValues.ts @@ -89,5 +89,6 @@ const initialValues: TValues = { regionRegistration: null, legalClientRegion: null, legalClientTown: null, + infuranceOPF: null, }; export default initialValues; diff --git a/src/core/types/Calculation/Store/elements.ts b/src/core/types/Calculation/Store/elements.ts index fbf3eb7..871fa14 100644 --- a/src/core/types/Calculation/Store/elements.ts +++ b/src/core/types/Calculation/Store/elements.ts @@ -87,7 +87,7 @@ export type ElementsNames = | 'selectGPSModel' | 'selectRegionRegistration' | 'selectTownRegistration' - | 'selectInfuranceOPF' + | 'radioInfuranceOPF' | 'radioInsKaskoType' | 'tbxInsKaskoPriceLeasePeriod' | 'cbxInsDecentral' @@ -124,7 +124,6 @@ export type ElementsNames = | 'tbxBusinessUnit' | 'tbxLeadNumber' | 'tbxOpportunityNumber' - | 'radioInsuranceOPF' | 'lblLead' | 'lblOpportunity' | 'btnCalculate'