From aaf0b93797452cbac7b08098621d1a35776b7d50 Mon Sep 17 00:00:00 2001 From: Chika Date: Mon, 21 Nov 2022 16:12:20 +0300 Subject: [PATCH] =?UTF-8?q?=D0=92=20=D0=B2=D0=B0=D0=BB=D0=B8=D0=B4=D0=B0?= =?UTF-8?q?=D1=86=D0=B8=D0=B8=20=D0=BF=D1=80=D0=B8=20=D0=BD=D0=B0=D0=B6?= =?UTF-8?q?=D0=B0=D1=82=D0=B8=D0=B8=20=D0=BA=D0=BD=D0=BE=D0=BF=D0=BA=D0=B8?= =?UTF-8?q?=20=D0=A0=D0=B0=D1=81=D1=81=D1=87=D0=B8=D1=82=D0=B0=D1=82=D1=8C?= =?UTF-8?q?=20=D0=B5=D1=81=D1=82=D1=8C=20=D0=BF=D1=80=D0=BE=D0=B2=D0=B5?= =?UTF-8?q?=D1=80=D0=BA=D0=B0=20DYN-1067=20:=20=D0=95=D0=A1=D0=9B=D0=98=20?= =?UTF-8?q?=D0=9B=D0=B8=D0=B7=D0=B8=D0=BD=D0=B3=20=D0=B1=D0=B5=D0=B7=20?= =?UTF-8?q?=D0=9A=D0=90=D0=A1=D0=9A=D0=9E=20SelectLeasingWithoutKasko=20?= =?UTF-8?q?=3D=20null=20=D0=98=20=D0=94=D0=B5=D1=86=D0=B5=D0=BD=D1=82?= =?UTF-8?q?=D1=80=D0=B0=D0=BB=D0=B8=D0=B7=D0=BE=D0=B2=D0=B0=D0=BD=D0=BD?= =?UTF-8?q?=D0=BE=D0=B5=20=D1=81=D1=82=D1=80=D0=B0=D1=85=D0=BE=D0=B2=D0=B0?= =?UTF-8?q?=D0=BD=D0=B8=D0=B5=20cbxInsDecentral=20=3D=20False=20=D0=98=20?= =?UTF-8?q?=D0=B2=20=D0=BA=D0=BE=D0=BD=D1=82=D1=80=D0=B0=D0=B3=D0=B5=D0=BD?= =?UTF-8?q?=D1=82=D0=B5-=D1=81=D1=82=D1=80=D0=B0=D1=85=D0=BE=D0=B2=D0=BE?= =?UTF-8?q?=D0=B9=20=D0=BA=D0=BE=D0=BC=D0=BF=D0=B0=D0=BD=D0=B8=D0=B8=20?= =?UTF-8?q?=D0=9E=D0=A1=D0=90=D0=93=D0=9E=20=D0=B7=D0=BD=D0=B0=D1=87=D0=B5?= =?UTF-8?q?=D0=BD=D0=B8=D0=B5=20=D0=BF=D0=BE=D0=BB=D1=8F=20"=D0=A1=D1=82?= =?UTF-8?q?=D1=80=D0=B0=D1=85=D0=BE=D0=B2=D0=B0=D0=BD=D0=B8=D0=B5=20=D0=9E?= =?UTF-8?q?=D0=A1=D0=90=D0=93=D0=9E=20=D0=B2=D0=BC=D0=B5=D1=81=D1=82=D0=B5?= =?UTF-8?q?=20=D1=81=20=D0=9A=D0=90=D0=A1=D0=9A=D0=9E"=20=3D=20=D0=94?= =?UTF-8?q?=D0=90=20=D0=98=20=D0=BD=D0=B0=20=D0=B2=D0=BA=D0=BB=D0=B0=D0=B4?= =?UTF-8?q?=D0=BA=D0=B5=20"=D1=81=D1=82=D1=80=D0=B0=D1=85=D0=BE=D0=B2?= =?UTF-8?q?=D0=B0=D0=BD=D0=B8=D0=B5"=20=D0=B2=20=D1=82=D0=B0=D0=B1=D0=BB?= =?UTF-8?q?=D0=B8=D1=86=D0=B5=20=D1=81=D1=82=D1=80=D0=B0=D1=85=D0=BE=D0=B2?= =?UTF-8?q?=D0=B0=D0=BD=D0=B8=D1=8F=20=D1=81=D1=82=D1=80=D0=B0=D1=85=D0=BE?= =?UTF-8?q?=D0=B2=D0=B0=D1=8F=20=D0=BA=D0=BE=D0=BC=D0=BF=D0=B0=D0=BD=D0=B8?= =?UTF-8?q?=D1=8F=20=D0=9A=D0=90=D0=A1=D0=9A=D0=9E=20=D0=BE=D1=82=D0=BB?= =?UTF-8?q?=D0=B8=D1=87=D0=B0=D0=B5=D1=82=D1=81=D1=8F=20=D0=BE=D1=82=20?= =?UTF-8?q?=D1=81=D1=82=D1=80=D0=B0=D1=85=D0=BE=D0=B2=D0=BE=D0=B9=20=D0=BA?= =?UTF-8?q?=D0=BE=D0=BC=D0=BF=D0=B0=D0=BD=D0=B8=D0=B8=20=D0=9E=D0=A1=D0=90?= =?UTF-8?q?=D0=93=D0=9E,=20=D0=A2=D0=9E=20=D0=B2=D1=8B=D0=B2=D0=B5=D1=81?= =?UTF-8?q?=D0=B8=20=D0=BE=D1=88=D0=B8=D0=B1=D0=BA=D1=83:=20"=D0=9D=D0=B5?= =?UTF-8?q?=D0=B2=D0=BE=D0=B7=D0=BC=D0=BE=D0=B6=D0=BD=D0=BE=20=D1=81=D1=82?= =?UTF-8?q?=D1=80=D0=B0=D1=85=D0=BE=D0=B2=D0=B0=D0=BD=D0=B8=D0=B5=20=D0=9E?= =?UTF-8?q?=D0=A1=D0=90=D0=93=D0=9E=20=D0=BE=D1=82=D0=B4=D0=B5=D0=BB=D1=8C?= =?UTF-8?q?=D0=BD=D0=BE=20=D0=BE=D1=82=20=D0=9A=D0=90=D0=A1=D0=9A=D0=9E=20?= =?UTF-8?q?-=20=D1=81=D1=82=D1=80=D0=B0=D1=85=D0=BE=D0=B2=D0=B0=D1=8F=20?= =?UTF-8?q?=D0=BA=D0=BE=D0=BC=D0=BF=D0=B0=D0=BD=D0=B8=D1=8F=20=D0=B4=D0=BE?= =?UTF-8?q?=D0=BB=D0=B6=D0=BD=D0=B0=20=D0=B1=D1=8B=D1=82=D1=8C=20=D0=BE?= =?UTF-8?q?=D0=B4=D0=BD=D0=B0!"=20=D0=98=20=D0=B7=D0=B0=D1=82=D0=B5=D1=80?= =?UTF-8?q?=D0=B5=D1=82=D1=8C=20=D0=BF=D0=BE=D0=BB=D0=B5=20=D1=81=D0=BE=20?= =?UTF-8?q?=D1=81=D1=82=D1=80=D0=B0=D1=85=D0=BE=D0=B2=D0=BE=D0=B9=20=D0=BA?= =?UTF-8?q?=D0=BE=D0=BC=D0=BF=D0=B0=D0=BD=D0=B8=D0=B5=D0=B9=20=D0=9E=D0=A1?= =?UTF-8?q?=D0=90=D0=93=D0=9E.?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../Effects/actions/calculate/validate/tables.ts | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/src/client/stores/CalculationStore/Effects/actions/calculate/validate/tables.ts b/src/client/stores/CalculationStore/Effects/actions/calculate/validate/tables.ts index 63c7d8d..0c6bf9e 100644 --- a/src/client/stores/CalculationStore/Effects/actions/calculate/validate/tables.ts +++ b/src/client/stores/CalculationStore/Effects/actions/calculate/validate/tables.ts @@ -28,8 +28,9 @@ function validateInsuranceTable(this: ICalculationStore) { x => x.accountid === osagoRow.insuranceCompany, ); - const { insDecentral } = this.values; + const { insDecentral, leasingWithoutKasko } = this.values; const invalid = + !leasingWithoutKasko && !insDecentral && osagoInsuranceCompanyOption?.evo_osago_with_kasko && osagoRow.insuranceCompany !== kaskoRow.insuranceCompany; @@ -134,7 +135,6 @@ function validateInsuranceTable(this: ICalculationStore) { * вместо костыля сбрасывать значение КАСКО на дефолтное, если текущего значения нет в списке опций * */ - const leasingWithoutKasko = this.getValue('leasingWithoutKasko'); const otherInsuranceCompany = this.tables.tableInsurance.options?.insuranceCompany?.find(x => x.name?.includes('ПРОЧИЕ'),