From 4e9a963945601d32a01f86b04e19d54e6a24be44 Mon Sep 17 00:00:00 2001 From: vchikalkin Date: Thu, 2 Sep 2021 13:25:14 +0300 Subject: [PATCH] fix prev commit#2 --- .../Effects/actions/calculate/validate/elements.ts | 8 +++++++- 1 file changed, 7 insertions(+), 1 deletion(-) diff --git a/src/client/stores/CalculationStore/Effects/actions/calculate/validate/elements.ts b/src/client/stores/CalculationStore/Effects/actions/calculate/validate/elements.ts index b6fa83e..1eed79c 100644 --- a/src/client/stores/CalculationStore/Effects/actions/calculate/validate/elements.ts +++ b/src/client/stores/CalculationStore/Effects/actions/calculate/validate/elements.ts @@ -93,12 +93,18 @@ const customConditions: TElements = { 'requirementTelematic', ]); - if (requirementTelematic !== 100000004 && (!telematic || !tracker)) { + if (requirementTelematic !== 100000004 && !telematic && !tracker) { return { isValid: false, message: 'Не указан Тип средства контроля: (Маяк или Телематика)', }; } + if (requirementTelematic === 100000004 && (telematic || tracker)) { + return { + isValid: false, + message: 'Маяк и телематика не должны быть указаны', + }; + } return { isValid: true }; }, };