hl-core 0.0.9-beta.10 → 0.0.9-beta.11

package/components/Input/Monthpicker.vue

@@ -0,0 +1,33 @@
+<template>
+  <vue-date-picker
+    :model-value="modelValue"
+    :clearable="false"
+    :disabled="disabled"
+    :reaonly="readonly"
+    month-picker
+    locale="ru"
+    format="MM.yyyy"
+    :close-on-scroll="true"
+    cancel-text="Отменить"
+    select-text="Выбрать"
+    @update:modelValue="$emit('update:modelValue', $event)"
+  />
+</template>
+
+<script lang="ts">
+export default defineComponent({
+  props: {
+    modelValue: {
+      required: false,
+    },
+    disabled: {
+      type: Boolean,
+      default: false,
+    },
+    readonly: {
+      type: Boolean,
+      default: false,
+    },
+  },
+});
+</script>

package/components/Pages/Anketa.vue

@@ -34,19 +34,19 @@
           <base-form-text-section v-for="(question, index) in firstQuestionList.filter(i => i.first.definedAnswers === 'Y')" :key="index">
             <base-fade-transition>
               <div
-                v-if="question.first.answerName === 'Да' && secondQuestionList"
+                v-if="question.first.answerName === 'Да' && question.second"
                 :class="[$styles.greenBg, $styles.whiteText, $styles.textSimple]"
                 class="rounded-t-lg pl-6 py-1 cursor-pointer"
                 @click="openFirstPanel(question)"
               >
-                {{ $dataStore.t('questionnaireType.pleaseAnswer', { text: secondQuestionList.length }) }}
+                {{ $dataStore.t('questionnaireType.pleaseAnswer', { text: question.second.length }) }}
               </div>
             </base-fade-transition>
             <span :class="[$styles.textTitle]" class="border-b-[1px] border-b-[#F3F6FC] p-6 flex items-center justify-between">
               {{ question.first.name }}
               <base-fade-transition>
                 <i
-                  v-if="question.first.answerName === 'Да' && secondQuestionList && secondQuestionList.length"
+                  v-if="question.first.answerName === 'Да' && question.second && question.second.length"
                   class="mdi mdi-chevron-right text-2xl cursor-pointer"
                   @click="openFirstPanel(question)"
                 ></i>
@@ -78,30 +78,39 @@
       />
     </section>
     <v-btn
-      v-if="secondQuestionList && secondQuestionList.length && firstPanel"
+      v-if="currentQuestion && currentQuestion.second && currentQuestion.second.length && firstPanel"
       icon="mdi mdi-close"
       class="ml-3 !absolute z-10"
-      @click="
-        firstPanel = false;
-        secondPanel = false;
-      "
+      @click="submitSecondaryForm"
     />
-    <section ref="firstPanelSection" v-if="secondQuestionList && secondQuestionList.length && firstPanel" class="flex flex-col px-[10px] pb-[14px]" :class="[$styles.scrollPage]">
-      <section v-if="currentQuestion" :class="[$styles.blueBgLight, $styles.rounded]" class="mx-[10px] mt-[14px] p-4 flex flex-col gap-4">
+    <section ref="firstPanelSection" v-if="currentQuestion && currentQuestion.second && firstPanel" class="flex flex-col px-[10px] pb-[14px]" :class="[$styles.scrollPage]">
+      <v-form
+        v-if="currentQuestion"
+        :class="[$styles.blueBgLight, $styles.rounded]"
+        class="mx-[10px] mt-[14px] p-4 flex flex-col gap-4"
+        ref="vSecondaryForm"
+        @submit="submitSecondaryForm"
+      >
         <base-form-text-section v-for="question in currentQuestion.second" :title="question.name" :key="question.name">
           <base-form-input
             v-if="question.definedAnswers === 'N'"
             v-model="question.answerText"
             class="border-t-[1px] border-t-[#F3F6FC]"
-            placeholder="Введите текст"
+            :placeholder="$dataStore.t('labels.inputText')"
             :readonly="formStore.isDisabled[whichSurvey] || !$dataStore.isTask()"
+            :rules="isSecondRequired ? $rules.required : []"
           />
-          <span v-else class="flex items-center justify-between p-4 cursor-pointer" :class="[$styles.textTitle, $styles.greenText]" @click="openSecondPanel(question)">
-            {{ question.answerName ? question.answerName : 'Выбрать вариант ответа' }}
-            <i class="mdi mdi-chevron-right text-[28px]"></i>
-          </span>
+          <base-panel-input
+            v-else
+            :class="[$styles.textTitle, $styles.greenText]"
+            :value="question.answerName ? question.answerName : 'Выбрать вариант ответа'"
+            :readonly="formStore.isDisabled[whichSurvey] || !$dataStore.isTask()"
+            :clearable="false"
+            :error-messages="isSecondRequired ? (question.answerName ? [] : ['Выбрать вариант ответа']) : []"
+            @click="openSecondPanel(question)"
+          ></base-panel-input>
         </base-form-text-section>
-      </section>
+      </v-form>
     </section>
   </base-fade-transition>
   <Teleport v-if="secondPanel" to="#panel-actions">
@@ -132,6 +141,7 @@ export default defineComponent({
     const formStore = useFormStore();
     const dataStore = useDataStore();
     const vForm = ref<any>();
+    const vSecondaryForm = ref<any>();
     const firstPanelSection = ref<any>();
     const isButtonLoading = ref<boolean>(false);
     const answerToAll = ref<boolean>(false);
@@ -148,13 +158,13 @@ export default defineComponent({
         : 'surveyByCriticalBasePolicyholder',
     );
     const firstQuestionList = ref<AnketaBody[]>([]);
-    const secondQuestionList = ref<AnketaSecond[]>([]);
     const currentQuestion = ref<AnketaBody>();
     const currentSecond = ref<AnketaSecond>();
     const isPanelLoading = ref<boolean>(false);
     const searchQuery = ref<string>('');
 
     const whichMember = computed(() => ('member' in route.query && !!route.query.member ? (route.query.member as 'insured' | 'policyholder') : 'insured'));
+    const isSecondRequired = computed(() => dataStore.controls.isSecondAnketaRequired);
     const scrollForm = (direction: 'up' | 'down') => {
       const scrollObject = { top: direction === 'up' ? 0 : screen.height * 10, behavior: 'smooth' };
       if (firstPanel.value) {
@@ -168,11 +178,25 @@ export default defineComponent({
       await vForm.value.validate().then(async (v: { valid: Boolean; errors: any }) => {
         if (v.valid) {
           isButtonLoading.value = true;
-          formStore[whichSurvey.value]!.body.forEach((survey: AnketaBody) => {
-            if (survey.first.answerText === 'Нет') {
-              survey.second = [];
-            }
-          });
+          const isValid = dataStore.validateAnketa(whichSurvey.value);
+          if (!isValid) {
+            isButtonLoading.value = false;
+            return false;
+          }
+          if (formStore[whichSurvey.value] && formStore[whichSurvey.value]?.body) {
+            formStore[whichSurvey.value]?.body.forEach(question => {
+              if (question.first.definedAnswers === 'Y' && question.first.answerName?.match(new RegExp('Нет', 'i')) && question.second && question.second.length) {
+                question.second.forEach(second => {
+                  if (second.definedAnswers === 'N') {
+                    second.answerText = null;
+                  } else {
+                    second.answerId = null;
+                    second.answerName = null;
+                  }
+                });
+              }
+            });
+          }
           formStore[whichSurvey.value]!.type = surveyType.value;
           const anketaToken = await dataStore.setSurvey(formStore[whichSurvey.value]!);
           if (typeof anketaToken === 'string') {
@@ -201,13 +225,36 @@ export default defineComponent({
       });
     };
 
-    const openFirstPanel = async (question: AnketaBody) => {
-      currentQuestion.value = question;
-      formStore[whichSurvey.value]!.body.forEach((question_object: AnketaBody) => {
-        if ((question_object.first.id === question.first.id && question_object.second && !question_object.second.length) || question_object.second == null) {
-          question_object.second = JSON.parse(JSON.stringify(formStore[surveyType.value === 'health' ? 'surveyByHealthSecond' : 'surveyByCriticalSecond']));
+    const submitSecondaryForm = async () => {
+      await vSecondaryForm.value.validate().then(async (v: { valid: Boolean; errors: any }) => {
+        if (v.valid) {
+          if (isSecondRequired.value && currentQuestion.value && currentQuestion.value.second) {
+            const hasError = currentQuestion.value.second.find(second => (second.definedAnswers === 'N' ? !second.answerText : !second.answerName));
+            if (hasError) {
+              dataStore.showToaster('error', dataStore.t('toaster.emptySecondAnketa', { text: hasError.name }), 5000);
+              return false;
+            }
+          }
+          firstPanel.value = false;
+          secondPanel.value = false;
+        } else {
+          const errors = document.querySelector('.v-input--error');
+          if (errors) {
+            const errorText = errors.parentElement?.children[0].innerHTML;
+            if (errorText) {
+              dataStore.showToaster('error', dataStore.t('toaster.errorFormField', { text: errorText?.replace(/[-<>!//.]/g, '') }));
+            }
+            errors.scrollIntoView({
+              behavior: 'smooth',
+              block: 'center',
+              inline: 'nearest',
+            });
+          }
         }
       });
+    };
+    const openFirstPanel = async (question: AnketaBody) => {
+      currentQuestion.value = question;
       firstPanel.value = true;
       secondPanel.value = false;
     };
@@ -236,7 +283,6 @@ export default defineComponent({
     };
 
     const getDefinedAnswerId = async (id: string, value: any, index: number) => {
-      // @ts-ignore
       await dataStore.definedAnswers(id, whichSurvey.value, value, index);
     };
 
@@ -272,11 +318,9 @@ export default defineComponent({
         formStore.applicationData.processInstanceId,
         whichMember.value === 'insured' ? formStore.applicationData.insuredApp[0].id : formStore.applicationData.clientApp.id,
         whichSurvey.value,
-        surveyType.value === 'health' ? 'surveyByHealthSecond' : 'surveyByCriticalSecond',
         whichMember.value,
       );
       firstQuestionList.value = formStore[whichSurvey.value]!.body;
-      secondQuestionList.value = formStore[surveyType.value === 'health' ? 'surveyByHealthSecond' : 'surveyByCriticalSecond']!;
       formStore[whichSurvey.value]!.type = surveyType.value;
       const negativeAnswer = firstQuestionList.value.every(i => i.first.answerName === 'Нет');
       if (negativeAnswer) {
@@ -320,10 +364,10 @@ export default defineComponent({
     return {
       // State
       vForm,
+      vSecondaryForm,
       formStore,
       answerToAll,
       firstQuestionList,
-      secondQuestionList,
       whichSurvey,
       isButtonLoading,
       firstPanel,
@@ -333,9 +377,11 @@ export default defineComponent({
       isPanelLoading,
       searchQuery,
       firstPanelSection,
+      isSecondRequired,
 
       // Functions
       submitForm,
+      submitSecondaryForm,
       getDefinedAnswerId,
       scrollForm,
       handleToggler,

package/components/Pages/ProductConditions.vue

@@ -1,6 +1,13 @@
 <template>
   <section class="flex flex-col gap-4 px-[10px]">
     <v-form ref="vForm" @submit="submitForm" class="max-h-[82svh] overflow-y-scroll">
+      <base-message-block
+        v-if="isRecalculation"
+        class="mt-4"
+        :color="$styles.blueBgLight"
+        :text="$dataStore.t('preliminaryCalculation')"
+        icon="mdi-alert text-[#FCB016]"
+      ></base-message-block>
       <base-form-section v-if="whichProduct === 'gons'" :title="$dataStore.t('productConditionsForm.requestedProductConditions')" :class="[$styles.textSimple]">
         <base-form-text-section
           class="mb-4"
@@ -54,7 +61,7 @@
           :clearable="isRecalculationDisabled === false"
           :label="$dataStore.t('percent') + `Life Multiply`"
           :readonly="isRecalculationDisabled"
-          :rules="$dataStore.rules.recalculationMultiply"
+          :rules="whichProduct === 'gons' ? $dataStore.rules.recalculationMultiplyBetween : $dataStore.rules.recalculationMultiply"
         />
         <base-form-input
           v-model="productConditionsForm.lifeAdditive"
@@ -88,7 +95,7 @@
           :clearable="isRecalculationDisabled === false"
           :label="$dataStore.t('percent') + `Disability Multiply`"
           :readonly="isRecalculationDisabled"
-          :rules="$dataStore.rules.recalculationMultiply"
+          :rules="whichProduct === 'gons' ? [] : $dataStore.rules.recalculationMultiply"
         />
         <base-form-input
           v-model="productConditionsForm.disabilityAdditive"
@@ -200,6 +207,34 @@
           @input="onInputInsurancePremiumPerMonth"
           @onClear="onClearPremium"
         />
+        <base-form-input
+          v-if="whichProduct === 'gons' && isRecalculation"
+          v-model="productConditionsForm.totalAmount5"
+          :readonly="true"
+          :label="$dataStore.t('productConditionsForm.totalAmount5')"
+          :suffix="$constants.currencySymbols.kzt"
+        />
+        <base-form-input
+          v-if="whichProduct === 'gons' && isRecalculation"
+          v-model="productConditionsForm.statePremium5"
+          :readonly="true"
+          :label="$dataStore.t('productConditionsForm.statePremium5')"
+          :suffix="$constants.currencySymbols.kzt"
+        />
+        <base-form-input
+          v-if="whichProduct === 'gons' && isRecalculation"
+          v-model="productConditionsForm.totalAmount7"
+          :readonly="true"
+          :label="$dataStore.t('productConditionsForm.totalAmount7')"
+          :suffix="$constants.currencySymbols.kzt"
+        />
+        <base-form-input
+          v-if="whichProduct === 'gons' && isRecalculation"
+          v-model="productConditionsForm.statePremium7"
+          :readonly="true"
+          :label="$dataStore.t('productConditionsForm.statePremium7')"
+          :suffix="$constants.currencySymbols.kzt"
+        />
         <base-form-input
           v-if="hasInsurancePremiumPerMonthInDollar"
           v-model="productConditionsForm.insurancePremiumPerMonthInDollar"
@@ -388,7 +423,7 @@ export default defineComponent({
     });
     const isDisabled = computed(() => (dataStore.isCalculator ? false : !memberStore.isStatementEditible('productConditionsForm')));
     const isTermsDisabled = computed(() => {
-      if (dataStore.isGons) {
+      if (dataStore.isGons || whichProduct.value === 'gons') {
         return true;
       }
       return isDisabled.value;
@@ -720,6 +755,13 @@ export default defineComponent({
             return;
           }
 
+          if (
+            whichProduct.value === 'gons' &&
+            (formStore.applicationData.statusCode === 'EditForm' || formStore.applicationData.statusCode === 'StartForm') &&
+            getNumber(productConditionsForm.requestedSumInsured as string)! >= 10_000_000
+          ) {
+            dataStore.showToaster('info', dataStore.t('toaster.calcSumForUnder'), 6000);
+          }
           if (isUnderwriterForm.value) {
             type recalculationInfo = {
               lifeMultiply: string | null | number;

package/components/Panel/PanelHandler.vue

@@ -199,6 +199,11 @@ export default defineComponent({
 
     const handleTask = async () => {
       loading.value = true;
+      if (needRecalculation.value) {
+        dataStore.showToaster('info', dataStore.t('toaster.needToRecalculate'));
+        loading.value = false;
+        return;
+      }
       if (dataStore.isAML || dataStore.isCheckContract || dataStore.isCheckContragent) {
         emit('task', [dataStore.panelAction, route.params.taskId as string, actionCause.value]);
       } else {
@@ -237,6 +242,13 @@ export default defineComponent({
       },
       { immediate: true },
     );
+    const needRecalculation = computed(
+      () =>
+        dataStore.isGons &&
+        formStore.applicationData.statusCode === 'UnderwriterForm' &&
+        dataStore.panelAction === constants.actions.accept &&
+        formStore.productConditionsForm.isRecalculated === false,
+    );
     const sendingActions = computed(
       () => dataStore.panelAction === constants.actions.reject || dataStore.panelAction === constants.actions.return || dataStore.panelAction === constants.actions.rejectclient,
     );

package/composables/classes.ts

@@ -700,6 +700,11 @@ export class ProductConditions {
   termAnnuityPayments: number | string | null;
   periodAnnuityPayment: Value;
   amountAnnuityPayments: number | string | null;
+  isRecalculated: boolean;
+  totalAmount5: number | string | null;
+  totalAmount7: number | string | null;
+  statePremium5: number | string | null;
+  statePremium7: number | string | null;
   constructor(
     insuranceCase = null,
     coverPeriod = null,
@@ -735,6 +740,11 @@ export class ProductConditions {
     termAnnuityPayments = null,
     periodAnnuityPayment = new Value(),
     amountAnnuityPayments = null,
+    isRecalculated = false,
+    totalAmount5 = null,
+    totalAmount7 = null,
+    statePremium5 = null,
+    statePremium7 = null,
   ) {
     this.requestedSumInsuredInDollar = null;
     this.insurancePremiumPerMonthInDollar = null;
@@ -775,6 +785,11 @@ export class ProductConditions {
     this.termAnnuityPayments = termAnnuityPayments;
     this.periodAnnuityPayment = periodAnnuityPayment;
     this.amountAnnuityPayments = amountAnnuityPayments;
+    this.isRecalculated = isRecalculated;
+    this.totalAmount5 = totalAmount5;
+    this.totalAmount7 = totalAmount7;
+    this.statePremium5 = statePremium5;
+    this.statePremium7 = statePremium7;
   }
 }
 
@@ -811,6 +826,8 @@ export class DataStoreClass {
     hasAgreement: boolean;
     // Наличие анкеты
     hasAnketa: boolean;
+    // Обязательность доп анкеты
+    isSecondAnketaRequired: boolean;
     // Подтягивание с ГБДФЛ
     hasGBDFL: boolean;
     // Подтягивание с ГКБ
@@ -949,6 +966,7 @@ export class DataStoreClass {
       },
       onAuth: false,
       hasAnketa: true,
+      isSecondAnketaRequired: true,
       hasAgreement: true,
       hasGBDFL: true,
       hasGKB: false,
@@ -1100,8 +1118,6 @@ export class FormStoreClass {
   surveyByHealthBasePolicyholder: AnketaFirst | null;
   surveyByCriticalBase: AnketaFirst | null;
   surveyByCriticalBasePolicyholder: AnketaFirst | null;
-  surveyByHealthSecond: AnketaSecond[] | null;
-  surveyByCriticalSecond: AnketaSecond[] | null;
   definedAnswersId: {
     surveyByHealthBase: any;
     surveyByCriticalBase: any;
@@ -1186,8 +1202,6 @@ export class FormStoreClass {
     this.surveyByHealthBasePolicyholder = null;
     this.surveyByCriticalBase = null;
     this.surveyByCriticalBasePolicyholder = null;
-    this.surveyByHealthSecond = null;
-    this.surveyByCriticalSecond = null;
     this.definedAnswersId = {
       surveyByHealthBase: {},
       surveyByCriticalBase: {},

package/locales/ru.json

@@ -67,6 +67,7 @@
     "emptyHealthAnketa": "Не заполнены данные анкеты по здоровью Застрахованного",
     "emptyHealthAnketaPolicyholder": "Не заполнены данные анкеты по здоровью Страхователя",
     "emptyCriticalAnketa": "Не заполнены данные анкеты по критическому заболеванию Застрахованного",
+    "emptySecondAnketa": "Не заполнены вопросы доп. анкеты  \"{text}\"",
     "successOperation": "Операция прошла успешно",
     "noAssignee": "Нужно взять задачу в работу",
     "canDoOnlyAssignee": "Задача в работе и у вас нету доступа",
@@ -83,6 +84,7 @@
     "documentNumberWasNotFilled": "Номер документа и дата не были заполнены",
     "valueShouldBeHigher": "Значение должно быть больше {text} процентов",
     "valueShouldBeBetween": "Значение должно быть в промежутке от {floor} до {ceil} процентов",
+    "recalculationMultiplyBetween": "Значение должно быть в промежутке от {floor} до {ceil} процентов",
     "needAgreement": "Нужно получить согласие контрагента",
     "successOtp": "Код подтверждения отправлен успешно",
     "hasSuccessOtp": "По контрагенту уже имеется согласие",
@@ -108,7 +110,8 @@
     "wrongInn": "Неправильный ИНН",
     "underageShouldBeLess18": "Несовершеннолетний не может быть старше 18 лет",
     "needAgent": "Поле агент должно быть заполнено",
-    "tripInsuredAmountCalculated": "Высчитана страховая сумма для выбора"
+    "tripInsuredAmountCalculated": "Высчитана страховая сумма для выбора",
+    "calcSumForUnder":"Внимание! Требуется пересчет страховой суммы андеррайтером. Заявка будет направлена Андеррайтеру"
   },
   "buttons": {
     "dataInput": "Ввод данных",
@@ -260,6 +263,7 @@
   "recalculation": "Перерасчет",
   "survey": "Анкета",
   "calculationAnnuityPayments": "Расчет аннуитетных выплат",
+  "preliminaryCalculation":"Расчет предварительный. Требуется заполнить все необходимые данные",
   "productConditionsForm": {
     "coverPeriod": "Срок страхования",
     "payPeriod": "Период оплаты страховой премии",
@@ -268,6 +272,10 @@
     "requestedSumInsured": "Страховая сумма",
     "requestedSumInsuredInTenge": "Страховая сумма в тенге",
     "requestedSumInsuredInDollar": "Страховая сумма в долларах",
+    "totalAmount5":"Общая сумма (страховая сумма с учетом Гос. премии 5 %)",
+    "totalAmount7":"Общая сумма (страховая сумма с учетом Гос. премии 7 %)",
+    "statePremium5":"Гос. премия (5 %)",
+    "statePremium7":"Гос. премия (7 %)",
     "sumInsured": "Страховая сумма",
     "insurancePremiumPerMonth": "Страховая премия",
     "hint": "Сумма рассчитывается автоматически",
@@ -377,6 +385,40 @@
     "reportDate": "Отчетная дата",
     "agentPolicy": "Личные продажи",
     "paymentJournal": "Журнал оплаты",
+    "paySlip": "Расчетный лист",
+    "pay-slip": {
+      "formationDate": "Дата формирования",
+      "endPeriodLevel": "Уровень на конец периода",
+      "reportinPeriodFrom": "Отчетный период с {text}",
+      "reportinPeriodTo": "Отчетный период по {text}",
+      "unitCalculation": "Расчет единиц",
+      "selfUnit": "Личн.ед.",
+      "groupUnit": "Груп.ед.",
+      "allUnit": "Общ.ед.",
+      "unitFrom": "На начало",
+      "unitTo": "На конец",
+      "unitChange": "Изменения",
+      "unitInsLife": "Страхование жизни",
+      "unitTotalLife": "Общее страхование",
+      "unitCurrent": "Текущие начисления",
+      "calculationAward": "Расчет вознаграждения",
+      "selfPr": "Личн.пр.",
+      "groupPr": "Груп.пр.",
+      "allPr": "Общ.пр.",
+      "accrualsSummary": "Свод начислений по ветвям и анализ перекосов развития структуры",
+      "beginLevel": "Ур. на начало",
+      "endLevel": "Ур. на конец",
+      "currentUnit": "Ед. текущие",
+      "beginUnit": "Ед. на начало",
+      "endUnit": "Ед. на конец",
+      "personalAwards": "Персональное вознаграждение",
+      "groupAwards": "Групповое вознаграждение",
+      "payPeriod": "Периодич. оплаты",
+      "tarrifRate": "Тарифная ставка",
+      "beginRate": "Нач. единицы",
+      "beginAward": "Нач. вознагр.",
+      "activeYear": "Год действия"
+    },
     "journal": {
       "incomeKz": "Приходы KZT",
       "outcomeKz": "Расходы KZT",
@@ -426,6 +468,8 @@
     "new": "Подать заявление"
   },
   "labels": {
+    "period": "Период",
+    "currentPerf": "Текущие показатели",
     "premium": "Премия",
     "currencySum": "Сумма валюты",
     "contractNo": "Номер контракта",

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "hl-core",
-  "version": "0.0.9-beta.10",
+  "version": "0.0.9-beta.11",
   "license": "MIT",
   "private": false,
   "main": "nuxt.config.ts",

package/store/data.store.ts

@@ -1285,46 +1285,37 @@ export const useDataStore = defineStore('data', {
       surveyType: 'health' | 'critical',
       processInstanceId: string | number,
       insuredId: any,
-      baseField: string,
-      secondaryField: string,
+      baseField: 'surveyByHealthBase' | 'surveyByCriticalBase' | 'surveyByHealthBasePolicyholder' | 'surveyByCriticalBasePolicyholder',
       whichMember: 'insured' | 'policyholder' = 'insured',
     ) {
-      //@ts-ignore
-      if (!this.formStore[baseField] || (this.formStore[baseField] && !this.formStore[baseField].length)) {
+      if (!this.formStore[baseField]) {
         try {
-          if (whichMember === 'insured') {
-            const [baseQuestions, secondaryQuestions] = await Promise.allSettled([
-              this.api.getQuestionList(surveyType, processInstanceId, insuredId),
-              this.api.getQuestionListSecond(`${surveyType}second`, processInstanceId, insuredId),
-            ]);
-            if (baseQuestions.status === 'fulfilled') {
-              //@ts-ignore
-              this.formStore[baseField] = baseQuestions.value;
-            }
-            if (secondaryQuestions.status === 'fulfilled') {
-              //@ts-ignore
-              this.formStore[secondaryField] = secondaryQuestions;
-            }
-          }
-          if (whichMember === 'policyholder') {
-            const [baseQuestions, secondaryQuestions] = await Promise.allSettled([
-              this.api.getClientQuestionList(surveyType, processInstanceId, insuredId),
-              this.api.getClientQuestionListSecond(`${surveyType}second`, processInstanceId, insuredId),
-            ]);
-            if (baseQuestions.status === 'fulfilled') {
-              //@ts-ignore
-              this.formStore[baseField] = baseQuestions.value;
-            }
-            if (secondaryQuestions.status === 'fulfilled') {
-              //@ts-ignore
-              this.formStore[secondaryField] = secondaryQuestions;
+          const [baseQuestions, secondaryQuestions] = await Promise.allSettled([
+            whichMember === 'insured'
+              ? this.api.getQuestionList(surveyType, processInstanceId, insuredId)
+              : this.api.getClientQuestionList(surveyType, processInstanceId, insuredId),
+            whichMember === 'insured'
+              ? this.api.getQuestionListSecond(`${surveyType}second`, processInstanceId, insuredId)
+              : this.api.getClientQuestionListSecond(`${surveyType}second`, processInstanceId, insuredId),
+            ,
+          ]);
+          if (baseQuestions.status === 'fulfilled') {
+            this.formStore[baseField] = baseQuestions.value;
+          }
+          if (secondaryQuestions.status === 'fulfilled') {
+            const baseAnketa = this.formStore[baseField];
+            if (baseAnketa && baseAnketa.body && baseAnketa.body.length) {
+              baseAnketa.body.forEach(i => {
+                if (i.first.definedAnswers === 'Y' && i.second === null && secondaryQuestions.value) {
+                  i.second = structuredClone(secondaryQuestions.value);
+                }
+              });
             }
           }
         } catch (err) {
-          console.log(err);
+          ErrorHandler(err);
         }
       }
-      //@ts-ignore
       return this.formStore[baseField];
     },
     getNumberWithSpaces(n: any) {
@@ -1541,7 +1532,7 @@ export const useDataStore = defineStore('data', {
           calculationData.amountInCurrency = getNumber(String(this.formStore.productConditionsForm.requestedSumInsuredInDollar));
           calculationData.currencyExchangeRate = this.currencies.usd;
         }
-        if (this.isLiferenta) {
+        if (this.isLiferenta || product === 'liferenta') {
           calculationData.guaranteedPaymentPeriod = this.formStore.productConditionsForm.guaranteedPeriod || 0;
           calculationData.annuityTypeId = (this.formStore.productConditionsForm.typeAnnuityInsurance.id as string) ?? undefined;
           calculationData.paymentPeriod = Number(this.formStore.productConditionsForm.termAnnuityPayments);
@@ -1558,9 +1549,15 @@ export const useDataStore = defineStore('data', {
             this.formStore.productConditionsForm.insurancePremiumPerMonthInDollar = this.getNumberWithSpaces(calculationResponse.premiumInCurrency);
           }
         }
-        if (this.isLiferenta) {
+        if (this.isLiferenta || product === 'liferenta') {
           this.formStore.productConditionsForm.amountAnnuityPayments = this.getNumberWithSpaces(calculationResponse.annuityMonthPay);
         }
+        if (this.isGons || product === 'gons') {
+          this.formStore.productConditionsForm.totalAmount5 = this.getNumberWithSpaces(calculationResponse.totalAmount5);
+          this.formStore.productConditionsForm.totalAmount7 = this.getNumberWithSpaces(calculationResponse.totalAmount7);
+          this.formStore.productConditionsForm.statePremium5 = this.getNumberWithSpaces(calculationResponse.statePremium5);
+          this.formStore.productConditionsForm.statePremium7 = this.getNumberWithSpaces(calculationResponse.statePremium7);
+        }
         this.showToaster('success', this.t('toaster.calculated'), 1000);
       } catch (err) {
         ErrorHandler(err);
@@ -1596,6 +1593,7 @@ export const useDataStore = defineStore('data', {
         if (this.isLiferenta) {
           this.formStore.productConditionsForm.amountAnnuityPayments = this.getNumberWithSpaces(applicationData.policyAppDto.annuityMonthPay);
         }
+
         this.showToaster('success', this.t('toaster.calculated'), 1000);
       } catch (err) {
         ErrorHandler(err);
@@ -2087,6 +2085,9 @@ export const useDataStore = defineStore('data', {
         const recalculatedValue = await this.api.reCalculate(data);
         if (!!recalculatedValue) {
           await this.getApplicationData(taskId, false, false, false, true);
+          if (this.isGons) {
+            this.formStore.productConditionsForm.isRecalculated = true;
+          }
           this.showToaster(
             'success',
             `${this.t('toaster.successRecalculation')}. ${whichSum == 'insurancePremiumPerMonth' ? 'Страховая премия' : 'Страховая сумма'}: ${this.getNumberWithSpaces(
@@ -2247,13 +2248,26 @@ export const useDataStore = defineStore('data', {
       if (!anketa) return false;
       const list = anketa.body;
       if (!list || (list && list.length === 0)) return false;
-      let notAnswered = 0;
-      for (let x = 0; x < list.length; x++) {
-        if ((list[x].first.definedAnswers === 'N' && !list[x].first.answerText) || (list[x].first.definedAnswers === 'Y' && !list[x].first.answerName)) {
-          notAnswered = notAnswered + 1;
+      const isAnketaValid = ref<boolean>(true);
+      list.forEach(i => {
+        if ((i.first.definedAnswers === 'N' && !i.first.answerText) || (i.first.definedAnswers === 'Y' && !i.first.answerName)) {
+          isAnketaValid.value = false;
+          return false;
         }
-      }
-      return notAnswered === 0;
+        if (this.controls.isSecondAnketaRequired && i.first.definedAnswers === 'Y' && i.first.answerName?.match(new RegExp('Да', 'i'))) {
+          if (i.second && i.second.length) {
+            const isValid = i.second.every(second => (second.definedAnswers === 'N' ? !!second.answerText : !!second.answerName));
+            if (!isValid) {
+              isAnketaValid.value = false;
+              this.showToaster('info', this.t('toaster.emptySecondAnketa', { text: i.first.name }), 5000);
+              return false;
+            }
+          } else {
+            // TODO уточнить
+          }
+        }
+      });
+      return isAnketaValid.value;
     },
     async validateAllForms(taskId: string) {
       this.isLoading = true;
@@ -2263,27 +2277,14 @@ export const useDataStore = defineStore('data', {
           const hasCritical = this.formStore.additionalInsuranceTerms?.find(cover => cover.coverTypeName === 'Критическое заболевание Застрахованного');
           if (hasCritical && hasCritical.coverSumName.match(new RegExp('не включено', 'i'))) {
             await Promise.allSettled([
-              this.getQuestionList(
-                'health',
-                this.formStore.applicationData.processInstanceId,
-                this.formStore.applicationData.insuredApp[0].id,
-                'surveyByHealthBase',
-                'surveyByHealthSecond',
-              ),
-              this.getQuestionList(
-                'critical',
-                this.formStore.applicationData.processInstanceId,
-                this.formStore.applicationData.insuredApp[0].id,
-                'surveyByCriticalBase',
-                'surveyByCriticalSecond',
-              ),
+              this.getQuestionList('health', this.formStore.applicationData.processInstanceId, this.formStore.applicationData.insuredApp[0].id, 'surveyByHealthBase'),
+              this.getQuestionList('critical', this.formStore.applicationData.processInstanceId, this.formStore.applicationData.insuredApp[0].id, 'surveyByCriticalBase'),
               this.isClientAnketaCondition &&
                 this.getQuestionList(
                   'health',
                   this.formStore.applicationData.processInstanceId,
                   this.formStore.applicationData.clientApp.id,
                   'surveyByHealthBasePolicyholder',
-                  'surveyByHealthSecond',
                   'policyholder',
                 ),
             ]);
@@ -2309,20 +2310,13 @@ export const useDataStore = defineStore('data', {
                 ]);
           } else {
             await Promise.allSettled([
-              this.getQuestionList(
-                'health',
-                this.formStore.applicationData.processInstanceId,
-                this.formStore.applicationData.insuredApp[0].id,
-                'surveyByHealthBase',
-                'surveyByHealthSecond',
-              ),
+              this.getQuestionList('health', this.formStore.applicationData.processInstanceId, this.formStore.applicationData.insuredApp[0].id, 'surveyByHealthBase'),
               this.isClientAnketaCondition &&
                 this.getQuestionList(
                   'health',
                   this.formStore.applicationData.processInstanceId,
                   this.formStore.applicationData.clientApp.id,
                   'surveyByHealthBasePolicyholder',
-                  'surveyByHealthSecond',
                   'policyholder',
                 ),
               ,

package/store/rules.ts

@@ -5,6 +5,7 @@ const t = i18n.t;
 
 export const rules = {
   recalculationMultiply: [(v: any) => (v !== null && v !== '' && v >= 100) || t('toaster.valueShouldBeHigher', { text: '100' })],
+  recalculationMultiplyBetween: [(v: any) => (v !== null && v !== '' && v >= 100 && v <= 200) || t('toaster.recalculationMultiplyBetween', { floor: '100', ceil: '200' })],
   recalculationAdditive: [(v: any) => (v !== null && v !== '' && v <= 100 && v >= 0) || t('toaster.valueShouldBeBetween', { floor: '0', ceil: '100' })],
   required: [(v: any) => !!v || t('rules.required')],
   objectRequired: [

package/types/index.ts

@@ -141,7 +141,7 @@ declare global {
 
   type AnketaBody = {
     first: EachAnketa;
-    second: any[] | null;
+    second: AnketaSecond[] | null;
   };
 
   type EachAnketa = {
@@ -251,6 +251,10 @@ declare global {
   type RecalculationResponseType = {
     amount: number;
     premium: number;
+    statePremium5?: number;
+    statePremium7?: number;
+    totalAmount5?: number;
+    totalAmount7?: number;
     mainCoverPremium: number;
     addCovers: AddCover[];
     amountInCurrency: number;
@@ -414,7 +418,7 @@ declare global {
     stateName?: string;
     cityCode?: string | number;
     cityName?: string;
-    regionCode?: string | number |null;
+    regionCode?: string | number | null;
     regionName?: string | null;
     streetName?: string;
     blockNumber?: string;