diff --git a/src/client/Containers/Calculation/Sections/sectionsList.ts b/src/client/Containers/Calculation/Sections/sectionsList.ts index 8db3fe9..f5d0de1 100644 --- a/src/client/Containers/Calculation/Sections/sectionsList.ts +++ b/src/client/Containers/Calculation/Sections/sectionsList.ts @@ -163,7 +163,7 @@ const sections: ISection[] = [ ], }, { - elements: ['tbxCountSeats', 'tbxMaxSpeed', 'selectWithTrailer'], + elements: ['tbxCountSeats', 'tbxMaxSpeed', 'cbxWithTrailer'], }, ], }, diff --git a/src/client/Containers/Calculation/lib/elements/components.ts b/src/client/Containers/Calculation/lib/elements/components.ts index fbdd086..758fb8b 100644 --- a/src/client/Containers/Calculation/lib/elements/components.ts +++ b/src/client/Containers/Calculation/lib/elements/components.ts @@ -70,7 +70,7 @@ const elementsComponents: TElements = { tbxMaxMass: InputNumber, tbxCountSeats: InputNumber, tbxMaxSpeed: InputNumber, - selectWithTrailer: Select, + cbxWithTrailer: Checkbox, selectDealer: Select, selectDealerPerson: Select, selectDealerRewardCondition: Select, diff --git a/src/client/Containers/Calculation/lib/elements/elementsProps.ts b/src/client/Containers/Calculation/lib/elements/elementsProps.ts index d43054d..6023e36 100644 --- a/src/client/Containers/Calculation/lib/elements/elementsProps.ts +++ b/src/client/Containers/Calculation/lib/elements/elementsProps.ts @@ -196,9 +196,6 @@ const elementsProps: TElements = { min: '0', max: '2000', }, - selectWithTrailer: { - showSearch: false, - }, selectDealer: { showSearch: true, }, diff --git a/src/client/Containers/Calculation/lib/elements/titles.ts b/src/client/Containers/Calculation/lib/elements/titles.ts index af7b63b..8f9f1e5 100644 --- a/src/client/Containers/Calculation/lib/elements/titles.ts +++ b/src/client/Containers/Calculation/lib/elements/titles.ts @@ -50,7 +50,7 @@ const elementsTitles: TElements = { labelLeaseObjectRisk: 'Риск ПЛ', labelDepreciationGroup: 'Группа обесценения', tbxLeaseObjectCount: 'Кол-во ПЛ в расчете', - selectWithTrailer: 'ТС с прицепом', + cbxWithTrailer: 'ТС с прицепом', cbxLeaseObjectUsed: 'ПЛ БУ', tbxMaxMass: 'Разрешенная макс.масса(кг)', tbxCountSeats: 'Количество мест', diff --git a/src/client/Containers/Calculation/lib/elements/values.ts b/src/client/Containers/Calculation/lib/elements/values.ts index 811a35b..50a6ac4 100644 --- a/src/client/Containers/Calculation/lib/elements/values.ts +++ b/src/client/Containers/Calculation/lib/elements/values.ts @@ -52,7 +52,7 @@ export const elementsValues: TElements = { radioDeliveryTime: 'deliveryTime', labelDepreciationGroup: 'depreciationGroup', tbxLeaseObjectCount: 'leaseObjectCount', - selectWithTrailer: 'withTrailer', + cbxWithTrailer: 'withTrailer', cbxLeaseObjectUsed: 'leaseObjectUsed', tbxMaxMass: 'maxMass', tbxCountSeats: 'countSeats', diff --git a/src/client/stores/CalculationStore/Effects/autorun.ts b/src/client/stores/CalculationStore/Effects/autorun.ts index cff1296..e429908 100644 --- a/src/client/stores/CalculationStore/Effects/autorun.ts +++ b/src/client/stores/CalculationStore/Effects/autorun.ts @@ -89,13 +89,13 @@ const autorunEffects: IAutorunEffect[] = [ calculationStore.setValidation('tbxMaxMass', true); } if (!withTrailer) { - calculationStore.setValidation('selectWithTrailer', false); + calculationStore.setValidation('cbxWithTrailer', false); } else { - calculationStore.setValidation('selectWithTrailer', true); + calculationStore.setValidation('cbxWithTrailer', true); } } else { calculationStore.setValidation('tbxMaxMass', true); - calculationStore.setValidation('selectWithTrailer', true); + calculationStore.setValidation('cbxWithTrailer', true); } }, calculationStore => () => { diff --git a/src/client/stores/CalculationStore/Effects/reactions/otherReactions.ts b/src/client/stores/CalculationStore/Effects/reactions/otherReactions.ts index e13c3df..2d4d175 100644 --- a/src/client/stores/CalculationStore/Effects/reactions/otherReactions.ts +++ b/src/client/stores/CalculationStore/Effects/reactions/otherReactions.ts @@ -1488,10 +1488,10 @@ const reactionEffects: IReactionEffect[] = [ leaseObjectCategory === 100000001 || leaseObjectCategory === 100000001 ) { - calculationStore.setValue('withTrailer', null); - calculationStore.setStatus('selectWithTrailer', ElementStatus.Disabled); + calculationStore.setValue('withTrailer', false); + calculationStore.setStatus('cbxWithTrailer', ElementStatus.Disabled); } else { - calculationStore.setStatus('selectWithTrailer', ElementStatus.Default); + calculationStore.setStatus('cbxWithTrailer', ElementStatus.Default); } }, options: { diff --git a/src/client/stores/CalculationStore/config/initialOptions.ts b/src/client/stores/CalculationStore/config/initialOptions.ts index f3c3f26..a955f94 100644 --- a/src/client/stores/CalculationStore/config/initialOptions.ts +++ b/src/client/stores/CalculationStore/config/initialOptions.ts @@ -139,21 +139,6 @@ const initialOptions: TElements = { }, ], - selectWithTrailer: [ - // { - // name: 'пусто', - // value: 100000000, - // }, - { - name: 'Да', - value: 100000001, - }, - { - name: 'Нет', - value: 100000002, - }, - ], - selectEngineType: [ { name: 'Бензин', diff --git a/src/client/stores/CalculationStore/config/initialValues.ts b/src/client/stores/CalculationStore/config/initialValues.ts index 67e893d..ed300f1 100644 --- a/src/client/stores/CalculationStore/config/initialValues.ts +++ b/src/client/stores/CalculationStore/config/initialValues.ts @@ -32,7 +32,7 @@ const initialValues: TValues = { configuration: null, deliveryTime: 100000000, leaseObjectCount: 1, - withTrailer: null, + withTrailer: false, leaseObjectUsed: false, maxMass: 0, countSeats: 0, diff --git a/src/core/types/Calculation/Store/elements.ts b/src/core/types/Calculation/Store/elements.ts index 1b297ad..2a8590c 100644 --- a/src/core/types/Calculation/Store/elements.ts +++ b/src/core/types/Calculation/Store/elements.ts @@ -48,7 +48,7 @@ export type ElementsNames = | 'labelLeaseObjectRisk' | 'labelDepreciationGroup' | 'tbxLeaseObjectCount' - | 'selectWithTrailer' + | 'cbxWithTrailer' | 'cbxLeaseObjectUsed' | 'tbxMaxMass' | 'tbxCountSeats'