hl-core 0.0.7-beta.20 → 0.0.7-beta.21

package/components/{Form → Pages}/ProductConditions.vue

@@ -16,7 +16,7 @@
       <base-form-section :title="$t('generalConditions')">
         <div v-if="isRecalculation && $route.params.taskId === '0'">
           <base-form-input
-            v-model="formStore.productConditionsForm.signDate"
+            v-model="productConditionsForm.signDate"
             :maska="$maska.date"
             :clearable="false"
             :readonly="true"
@@ -24,7 +24,7 @@
             append-inner-icon="mdi mdi-calendar-blank-outline"
           ></base-form-input>
           <base-form-input
-            v-model="formStore.productConditionsForm.birthDate"
+            v-model="productConditionsForm.birthDate"
             :maska="$maska.date"
             :readonly="isDisabled"
             :clearable="!isDisabled"
@@ -33,8 +33,8 @@
             append-inner-icon="mdi mdi-calendar-blank-outline"
           ></base-form-input>
           <base-panel-input
-            v-model="formStore.productConditionsForm.gender"
-            :value="formStore.productConditionsForm.gender.nameRu"
+            v-model="productConditionsForm.gender"
+            :value="productConditionsForm.gender.nameRu"
             :readonly="isDisabled"
             :clearable="!isDisabled"
             :label="$t('form.gender')"
@@ -44,7 +44,7 @@
           ></base-panel-input>
         </div>
         <base-form-input
-          v-model="formStore.productConditionsForm.coverPeriod"
+          v-model="productConditionsForm.coverPeriod"
           :maska="$maska.numbers"
           :readonly="isDisabled"
           :clearable="!isDisabled"
@@ -52,8 +52,8 @@
           :label="$t('productConditionsForm.coverPeriodFrom3to20')"
         ></base-form-input>
         <base-panel-input
-          v-model="formStore.productConditionsForm.paymentPeriod"
-          :value="formStore.productConditionsForm.paymentPeriod.nameRu"
+          v-model="productConditionsForm.paymentPeriod"
+          :value="productConditionsForm.paymentPeriod.nameRu"
           :readonly="isDisabled"
           :clearable="!isDisabled"
           :rules="$rules.objectRequired"
@@ -62,14 +62,14 @@
           @append="openPanel($t('productConditionsForm.processPaymentPeriod'), $dataStore.processPaymentPeriod, 'paymentPeriod', $dataStore.getProcessPaymentPeriod)"
         ></base-panel-input>
         <base-form-input
-          v-model="formStore.productConditionsForm.requestedSumInsured"
+          v-model="productConditionsForm.requestedSumInsured"
           :readonly="isDisabled"
           :clearable="!isDisabled"
           :rules="requestedSumInsured"
           :label="$t('productConditionsForm.requestedSumInsured')"
         ></base-form-input>
         <base-form-input
-          v-model="formStore.productConditionsForm.insurancePremiumPerMonth"
+          v-model="productConditionsForm.insurancePremiumPerMonth"
           :readonly="isDisabled"
           :clearable="!isDisabled"
           :rules="insurancePremiumPerMonth"
@@ -125,7 +125,8 @@ export default defineComponent({
     const isPanelOpen = ref<boolean>(false);
     const panelValue = ref<Value>(new Value());
     const panelList = ref<Value[]>([]);
-    const currentPanel = ref<keyof typeof formStore.productConditionsForm>();
+    const productConditionsForm = formStore.productConditionsForm;
+    const currentPanel = ref<keyof typeof productConditionsForm>();
     const searchQuery = ref<string>('');
     const whichSum = ref<'insurancePremiumPerMonth' | 'requestedSumInsured' | ''>('');
 
@@ -138,15 +139,15 @@ export default defineComponent({
     });
     const isDisabled = computed(() => !memberStore.isStatementEditible(formStore.productConditionsFormKey));
     const isTask = computed(() => (route.params.taskId === '0' && props.isRecalculation === true) || dataStore.isTask());
-    const insurancePremiumPerMonth = computed(() => (!!formStore.productConditionsForm.insurancePremiumPerMonth ? dataStore.rules.required.concat(dataStore.rules.sums) : []));
-    const requestedSumInsured = computed(() => (!!formStore.productConditionsForm.requestedSumInsured ? dataStore.rules.required.concat(dataStore.rules.sums) : []));
+    const insurancePremiumPerMonth = computed(() => (!!productConditionsForm.insurancePremiumPerMonth ? dataStore.rules.required.concat(dataStore.rules.sums) : []));
+    const requestedSumInsured = computed(() => (!!productConditionsForm.requestedSumInsured ? dataStore.rules.required.concat(dataStore.rules.sums) : []));
 
     const pickPanelValue = (item: Value) => {
       if (!isDisabled.value) {
         dataStore.panel.open = false;
         isPanelOpen.value = false;
         // @ts-ignore
-        formStore.productConditionsForm[currentPanel.value] = item.nameRu === null ? new Value() : item;
+        productConditionsForm[currentPanel.value] = item.nameRu === null ? new Value() : item;
       } else {
         dataStore.showToaster('error', dataStore.t('toaster.viewErrorText'));
       }
@@ -155,7 +156,7 @@ export default defineComponent({
     const openPanel = async (title: string, list: Value[], key: string, asyncFunction?: Function, filterKey?: string) => {
       if (!isDisabled.value) {
         searchQuery.value = '';
-        currentPanel.value = key as keyof typeof formStore.productConditionsForm;
+        currentPanel.value = key as keyof typeof productConditionsForm;
         isPanelOpen.value = true;
         dataStore.panelAction = null;
         dataStore.panel.open = true;
@@ -168,7 +169,7 @@ export default defineComponent({
         }
         panelList.value = newList;
         // @ts-ignore
-        panelValue.value = formStore.productConditionsForm[currentPanel.value];
+        panelValue.value = productConditionsForm[currentPanel.value];
         isPanelLoading.value = false;
       } else {
         dataStore.showToaster('error', dataStore.t('toaster.viewErrorText'));
@@ -185,17 +186,17 @@ export default defineComponent({
       vForm.value.validate().then(async (v: { valid: Boolean; errors: any }) => {
         if (v.valid) {
           if (whichSum.value === 'requestedSumInsured') {
-            formStore.productConditionsForm.insurancePremiumPerMonth = null;
+            productConditionsForm.insurancePremiumPerMonth = null;
           }
           if (whichSum.value === 'insurancePremiumPerMonth') {
-            formStore.productConditionsForm.requestedSumInsured = null;
+            productConditionsForm.requestedSumInsured = null;
           }
-          if (formStore.productConditionsForm.requestedSumInsured !== '' && formStore.productConditionsForm.requestedSumInsured != null) {
-            formStore.productConditionsForm.insurancePremiumPerMonth = null;
+          if (productConditionsForm.requestedSumInsured !== '' && productConditionsForm.requestedSumInsured != null) {
+            productConditionsForm.insurancePremiumPerMonth = null;
             if (props.isRecalculation) whichSum.value = 'requestedSumInsured';
           }
-          if (formStore.productConditionsForm.insurancePremiumPerMonth !== '' && formStore.productConditionsForm.insurancePremiumPerMonth != null) {
-            formStore.productConditionsForm.requestedSumInsured = null;
+          if (productConditionsForm.insurancePremiumPerMonth !== '' && productConditionsForm.insurancePremiumPerMonth != null) {
+            productConditionsForm.requestedSumInsured = null;
             if (props.isRecalculation) whichSum.value = 'insurancePremiumPerMonth';
           }
 
@@ -223,14 +224,14 @@ export default defineComponent({
               adbAdditive,
               disabilityMultiply,
               disabilityAdditive,
-            }))(formStore.productConditionsForm);
+            }))(productConditionsForm);
             Object.keys(recalculationData).forEach(key => {
               // @ts-ignore
               recalculationData[key] = formatProcents(recalculationData[key]);
             });
-            recalculationData.amount = Number(formStore.productConditionsForm.requestedSumInsured?.replace(/\s/g, ''));
-            recalculationData.premium = Number(formStore.productConditionsForm.insurancePremiumPerMonth?.replace(/\s/g, ''));
-            recalculationData.riskGroup = formStore.productConditionsForm.riskGroup?.id ? formStore.productConditionsForm.riskGroup.id : 1;
+            recalculationData.amount = Number((productConditionsForm.requestedSumInsured as string)?.replace(/\s/g, ''));
+            recalculationData.premium = Number((productConditionsForm.insurancePremiumPerMonth as string)?.replace(/\s/g, ''));
+            recalculationData.riskGroup = productConditionsForm.riskGroup?.id ? productConditionsForm.riskGroup.id : 1;
             isCalculating.value = true;
             await dataStore.reCalculate(formStore.applicationData.processInstanceId, recalculationData, route.params.taskId, whichSum.value);
           }
@@ -267,48 +268,52 @@ export default defineComponent({
 
     onMounted(async () => {
       if (props.isRecalculation === true) {
-        if (route.params.taskId === '0') {
+        if (route.params.taskId === '0' && productConditionsForm.requestedSumInsured === null && productConditionsForm.insurancePremiumPerMonth === null) {
           const defaultData = await dataStore.getDefaultCalculationData(true);
-          dataStore.additionalInsuranceTermsWithout = defaultData.addCovers;
-          formStore.productConditionsForm.requestedSumInsured = defaultData.amount;
-          formStore.productConditionsForm.insurancePremiumPerMonth = defaultData.premium;
-          formStore.productConditionsForm.processIndexRate = dataStore.processIndexRate.find(i => i.id === defaultData.indexRateId);
-          formStore.productConditionsForm.paymentPeriod = dataStore.processPaymentPeriod.find(i => i.id == defaultData.paymentPeriodId);
-          formStore.productConditionsForm.signDate = reformatDate(defaultData.signDate);
+          if (!defaultData) {
+            dataStore.showToaster('error', 'Отсутствуют базовые данные');
+            return;
+          }
+          formStore.additionalInsuranceTermsWithout = defaultData.addCovers;
+          productConditionsForm.requestedSumInsured = defaultData.amount;
+          productConditionsForm.insurancePremiumPerMonth = defaultData.premium;
+          productConditionsForm.processIndexRate = dataStore.processIndexRate.find(i => i.id === defaultData.indexRateId);
+          productConditionsForm.paymentPeriod = dataStore.processPaymentPeriod.find(i => i.id == defaultData.paymentPeriodId);
+          productConditionsForm.signDate = reformatDate(defaultData.signDate);
         }
       }
-      if (!!formStore.productConditionsForm.insurancePremiumPerMonth) {
+      if (!!productConditionsForm.insurancePremiumPerMonth) {
         whichSum.value = 'insurancePremiumPerMonth';
       }
-      if (!!formStore.productConditionsForm.requestedSumInsured) {
+      if (!!productConditionsForm.requestedSumInsured) {
         whichSum.value = 'requestedSumInsured';
       }
     });
 
     watch(
-      () => formStore.productConditionsForm.requestedSumInsured,
+      () => productConditionsForm.requestedSumInsured,
       val => {
         if (!val && whichSum.value == 'requestedSumInsured') whichSum.value = '';
         if (val && whichSum.value != 'insurancePremiumPerMonth') {
           whichSum.value = 'requestedSumInsured';
-          formStore.productConditionsForm.requestedSumInsured = dataStore.getNumberWithSpaces(val);
+          productConditionsForm.requestedSumInsured = dataStore.getNumberWithSpaces(val);
         }
       },
     );
     watch(
-      () => formStore.productConditionsForm.insurancePremiumPerMonth,
+      () => productConditionsForm.insurancePremiumPerMonth,
       val => {
         if (!val && whichSum.value == 'insurancePremiumPerMonth') whichSum.value = '';
         if (val && whichSum.value != 'requestedSumInsured') {
           whichSum.value = 'insurancePremiumPerMonth';
-          formStore.productConditionsForm.insurancePremiumPerMonth = dataStore.getNumberWithSpaces(val);
+          productConditionsForm.insurancePremiumPerMonth = dataStore.getNumberWithSpaces(val);
         }
       },
     );
     watch(
-      () => formStore.productConditionsForm.amountOfInsurancePremium,
+      () => productConditionsForm.amountOfInsurancePremium,
       val => {
-        if (val) formStore.productConditionsForm.amountOfInsurancePremium = dataStore.getNumberWithSpaces(val);
+        if (val) productConditionsForm.amountOfInsurancePremium = dataStore.getNumberWithSpaces(val);
       },
     );
 
@@ -316,6 +321,7 @@ export default defineComponent({
       // State
       formStore,
       vForm,
+      productConditionsForm,
       isCalculating,
       isPanelLoading,
       isPanelOpen,

package/composables/classes.ts

@@ -68,7 +68,7 @@ export class Value {
   }
 }
 
-class IDocument {
+export class IDocument {
   id?: string;
   processInstanceId?: string;
   iin?: string;
@@ -678,8 +678,8 @@ export class ProductConditions {
   termsOfInsurance: string | null;
   annualIncome: string | null;
   processIndexRate: Value;
-  requestedSumInsured: string | null;
-  insurancePremiumPerMonth: string | null;
+  requestedSumInsured: number | string | null;
+  insurancePremiumPerMonth: number | string | null;
   establishingGroupDisabilityFromThirdYear: string | null;
   possibilityToChange: string | null;
   deathOfInsuredDueToAccident: Value;
@@ -769,6 +769,10 @@ export class DataStoreClass {
   controls: {
     // Проверка на роль при авторизации
     onAuth: boolean;
+    // Согласие на главной странице
+    hasAgreement: boolean;
+    // Наличие анкеты
+    hasAnketa: boolean;
     // Подтягивание с ГБДФЛ
     hasGBDFL: boolean;
     // Подтягивание с ГКБ
@@ -823,7 +827,7 @@ export class DataStoreClass {
   documentIssuers: Value[];
   familyStatuses: Value[];
   relations: Value[];
-  questionRefs: any[];
+  questionRefs: Value[];
   epayLink: string;
   residents: Value[];
   ipdl: Value[];
@@ -839,8 +843,6 @@ export class DataStoreClass {
   processCoverTypeSum: any[];
   processIndexRate: any[];
   processPaymentPeriod: any[];
-  additionalInsuranceTerms: any[];
-  additionalInsuranceTermsWithout: any[];
   taskList: TaskListItem[];
   processHistory: TaskHistory[];
   contragentList: any[];
@@ -849,30 +851,16 @@ export class DataStoreClass {
   groupCode: string;
   userGroups: Item[];
   onMainPage: boolean;
-  signUrl: string | null;
   SaleChanellPolicyList: any[];
   RegionPolicyList: any[];
   ManagerPolicyList: any[];
   AgentDataList: any[];
-  affilationResolution: {
-    id: string | number | null;
-    processInstanceId: string | number | null;
-    number: string | number | null;
-    date: string | number | null;
-  };
-  signedDocumentList: any[];
-  surveyByHealthBase: any[];
-  surveyByCriticalBase: any[];
-  surveyByHealthSecond: any[];
-  surveyByCriticalSecond: any[];
-  definedAnswersId: {
-    surveyByHealthBase: any;
-    surveyByCriticalBase: any;
-  };
   riskGroup: any[];
   constructor() {
     this.controls = {
       onAuth: false,
+      hasAnketa: true,
+      hasAgreement: true,
       hasGBDFL: true,
       hasGKB: false,
       hasInsis: false,
@@ -881,24 +869,11 @@ export class DataStoreClass {
     this.hasLayoutMargins = true;
     this.processIndexRate = [];
     this.processPaymentPeriod = [];
-    this.additionalInsuranceTerms = [];
-    this.additionalInsuranceTermsWithout = [];
-    this.definedAnswersId = {
-      surveyByHealthBase: {},
-      surveyByCriticalBase: {},
-    };
-    this.signedDocumentList = [];
-    this.affilationResolution = {
-      id: null,
-      processInstanceId: null,
-      number: null,
-      date: null,
-    };
+    this.questionRefs = [];
     this.SaleChanellPolicyList = [];
     this.RegionPolicyList = [];
     this.ManagerPolicyList = [];
     this.AgentDataList = [];
-    this.signUrl = null;
     this.product = import.meta.env.VITE_PRODUCT ? (import.meta.env.VITE_PRODUCT as string) : null;
     this.showNav = true;
     this.menuItems = [];
@@ -948,11 +923,6 @@ export class DataStoreClass {
     this.documentIssuers = [];
     this.familyStatuses = [];
     this.relations = [];
-    this.surveyByHealthBase = [];
-    this.surveyByCriticalBase = [];
-    this.surveyByHealthSecond = [];
-    this.surveyByCriticalSecond = [];
-    this.questionRefs = [];
     this.epayLink = '';
     this.residents = [];
     this.ipdl = [new Value(1, null), new Value(2, 'Да'), new Value(3, 'Нет')];
@@ -1006,6 +976,24 @@ export class DataStoreClass {
 }
 
 export class FormStoreClass {
+  additionalInsuranceTerms: AddCover[];
+  additionalInsuranceTermsWithout: AddCover[];
+  signUrl: string | null;
+  affilationResolution: {
+    id: string | number | null;
+    processInstanceId: string | number | null;
+    number: string | number | null;
+    date: string | number | null;
+  };
+  signedDocumentList: IDocument[];
+  surveyByHealthBase: AnketaFirst | null;
+  surveyByCriticalBase: AnketaFirst | null;
+  surveyByHealthSecond: AnketaSecond[] | null;
+  surveyByCriticalSecond: AnketaSecond[] | null;
+  definedAnswersId: {
+    surveyByHealthBase: any;
+    surveyByCriticalBase: any;
+  };
   birthInfos: BirthInfoGKB[];
   SaleChanellPolicy: Value;
   AgentData: {
@@ -1068,6 +1056,24 @@ export class FormStoreClass {
   canBeClaimed: boolean | null;
   applicationTaskId: string | null;
   constructor(procuctConditionsTitle?: string) {
+    this.additionalInsuranceTerms = [];
+    this.additionalInsuranceTermsWithout = [];
+    this.signUrl = null;
+    this.affilationResolution = {
+      id: null,
+      processInstanceId: null,
+      number: null,
+      date: null,
+    };
+    this.signedDocumentList = [];
+    this.surveyByHealthBase = null;
+    this.surveyByCriticalBase = null;
+    this.surveyByHealthSecond = null;
+    this.surveyByCriticalSecond = null;
+    this.definedAnswersId = {
+      surveyByHealthBase: {},
+      surveyByCriticalBase: {},
+    };
     this.birthInfos = [];
     this.SaleChanellPolicy = new Value();
     this.AgentData = {

package/composables/index.ts

@@ -10,6 +10,7 @@ export class Masks {
   phone: string = '+7 (7##) ### ## ##';
   date: string = '##.##.####';
   post: string = '######';
+  threeDigit: string = '###';
 }
 
 export const useMask = () => new Masks();

package/composables/styles.ts

@@ -77,7 +77,7 @@ export class Styles {
 
     // Complex
     this.flexColNav = 'flex flex-col gap-[10px] px-2 pt-[14px]';
-    this.emptyBlockCol = 'w-[110px] h-[30%] rounded-[8px] bg-[#f5f5f5]';
+    this.emptyBlockCol = 'w-[60px] sm:w-[100px] h-[30%] rounded-[8px] bg-[#f5f5f5]';
     this.scrollPage = 'max-h-[90vh] overflow-y-scroll';
   }
 }

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "hl-core",
-  "version": "0.0.7-beta.20",
+  "version": "0.0.7-beta.21",
   "license": "MIT",
   "private": false,
   "main": "nuxt.config.ts",

package/store/data.store.js

@@ -61,7 +61,7 @@ export const useDataStore = defineStore('data', {
       }
     },
     getFilesByIIN(iin) {
-      return iin ? this.signedDocumentList.filter(file => file.iin === iin && file.fileTypeName === 'Удостоверение личности') : null;
+      return iin ? this.formStore.signedDocumentList.filter(file => file.iin === iin && file.fileTypeName === 'Удостоверение личности') : null;
     },
     async getNewAccessToken() {
       try {
@@ -945,16 +945,15 @@ export const useDataStore = defineStore('data', {
       try {
         this.isLoading = true;
         const anketaToken = await this.api.setSurvey(data);
-        window.scrollTo({ top: 0, behavior: 'smooth' });
         this.showToaster('success', this.t('toaster.successSaved'), 2000);
         return anketaToken;
       } catch (error) {
-        ErrorHandler(err);
+        return ErrorHandler(err);
       } finally {
         this.isLoading = false;
       }
     },
-    async getFromApi(whichField, whichRequest, parameter) {
+    async getFromApi(whichField, whichRequest, parameter, reset = false) {
       const storageValue = JSON.parse(localStorage.getItem(whichField) || 'null');
       const currentHour = new Date().getHours();
 
@@ -966,8 +965,7 @@ export const useDataStore = defineStore('data', {
         if (storageValue && (hasHourKey === false || hasModeKey === false || hasValueKey === false)) return true;
         if (storageValue && (storageValue.hour !== currentHour || storageValue.mode !== import.meta.env.MODE || storageValue.value.length === 0)) return true;
       };
-
-      if (getDataCondition()) {
+      if (!!getDataCondition() || reset === true) {
         this[whichField] = [];
         try {
           const response = await this.api[whichRequest](parameter);
@@ -1089,7 +1087,7 @@ export const useDataStore = defineStore('data', {
       return await this.getFromApi('processPaymentPeriod', 'getProcessPaymentPeriod', this.processCode);
     },
     async getQuestionRefs(id) {
-      return await this.getFromApi('questionRefs', 'getQuestionRefs', id);
+      return await this.getFromApi('questionRefs', 'getQuestionRefs', id, true);
     },
     async getProcessTariff() {
       return await this.getFromApi('processTariff', 'getProcessTariff');
@@ -1097,26 +1095,25 @@ export const useDataStore = defineStore('data', {
     async getAdditionalInsuranceTermsAnswers(questionId) {
       try {
         const answers = await this.api.getAdditionalInsuranceTermsAnswers(this.processCode, questionId);
-        answers.unshift(answers.pop());
         return answers;
       } catch (err) {
         console.log(err);
       }
     },
     async getQuestionList(surveyType, processInstanceId, insuredId, baseField, secondaryField) {
-      if (!this[baseField].length) {
+      if (!this.formStore[baseField] || (this.formStore[baseField] && !this.formStore[baseField].length)) {
         try {
           const [{ value: baseQuestions }, { value: secondaryQuestions }] = await Promise.allSettled([
             this.api.getQuestionList(surveyType, processInstanceId, insuredId),
-            this.api.getQuestionList(`${surveyType}second`, processInstanceId, insuredId),
+            this.api.getQuestionListSecond(`${surveyType}second`, processInstanceId, insuredId),
           ]);
-          this[baseField] = baseQuestions;
-          this[secondaryField] = secondaryQuestions;
+          this.formStore[baseField] = baseQuestions;
+          this.formStore[secondaryField] = secondaryQuestions;
         } catch (err) {
           console.log(err);
         }
       }
-      return this[baseField];
+      return this.formStore[baseField];
     },
     getNumberWithSpaces(n) {
       return n === null ? null : Number((typeof n === 'string' ? n : n.toFixed().toString()).replace(/[^0-9]+/g, '')).toLocaleString('ru');
@@ -1292,18 +1289,6 @@ export const useDataStore = defineStore('data', {
         this.isLoading = false;
       }
     },
-    async getDictionaryItems(dictName) {
-      try {
-        this.isLoading = true;
-        if (!this[`${dictName}List`].length) {
-          this[`${dictName}List`] = await this.api.getDictionaryItems(dictName);
-        }
-      } catch (err) {
-        console.log(err);
-      } finally {
-        this.isLoading = false;
-      }
-    },
     async filterManagerByRegion(dictName, filterName) {
       try {
         this.isLoading = true;
@@ -1317,19 +1302,19 @@ export const useDataStore = defineStore('data', {
     async getUnderwritingCouncilData(id) {
       try {
         const response = await this.api.getUnderwritingCouncilData(id);
-        this.affilationResolution.id = response.underwritingCouncilAppDto.id;
-        this.affilationResolution.date = response.underwritingCouncilAppDto.date ? reformatDate(response.underwritingCouncilAppDto.date) : null;
-        this.affilationResolution.number = response.underwritingCouncilAppDto.number ? response.underwritingCouncilAppDto.number : null;
+        this.formStore.affilationResolution.id = response.underwritingCouncilAppDto.id;
+        this.formStore.affilationResolution.date = response.underwritingCouncilAppDto.date ? reformatDate(response.underwritingCouncilAppDto.date) : null;
+        this.formStore.affilationResolution.number = response.underwritingCouncilAppDto.number ? response.underwritingCouncilAppDto.number : null;
       } catch (err) {
         console.log(err);
       }
     },
     async setConfirmation() {
       const data = {
-        id: this.affilationResolution.id,
-        processInstanceId: this.affilationResolution.processInstanceId,
-        number: this.affilationResolution.number,
-        date: formatDate(this.affilationResolution.date)?.toISOString(),
+        id: this.formStore.affilationResolution.id,
+        processInstanceId: this.formStore.affilationResolution.processInstanceId,
+        number: this.formStore.affilationResolution.number,
+        date: formatDate(this.formStore.affilationResolution.date)?.toISOString(),
       };
       try {
         this.isLoading = true;
@@ -1358,14 +1343,14 @@ export const useDataStore = defineStore('data', {
       }
     },
     async definedAnswers(filter, whichSurvey, value = null, index = null) {
-      if (!this.definedAnswersId[whichSurvey].hasOwnProperty(filter)) {
-        this.definedAnswersId[whichSurvey][filter] = await this.api.definedAnswers(filter);
+      if (!this.formStore.definedAnswersId[whichSurvey].hasOwnProperty(filter)) {
+        this.formStore.definedAnswersId[whichSurvey][filter] = await this.api.definedAnswers(filter);
       }
-      if (value !== null && this.definedAnswersId[whichSurvey][filter].length) {
-        const answer = this.definedAnswersId[whichSurvey][filter].find(answer => answer.nameRu === value);
-        this[whichSurvey].body[index].first.answerId = answer.ids;
+      if (value !== null && this.formStore.definedAnswersId[whichSurvey][filter].length) {
+        const answer = this.formStore.definedAnswersId[whichSurvey][filter].find(answer => answer.nameRu === value);
+        this.formStore[whichSurvey].body[index].first.answerId = answer.ids;
       }
-      return this.definedAnswersId[whichSurvey];
+      return this.formStore.definedAnswersId[whichSurvey];
     },
     async getPaymentTable(id) {
       try {
@@ -1405,12 +1390,13 @@ export const useDataStore = defineStore('data', {
             ? this.formStore.productConditionsForm.processIndexRate.id
             : this.processIndexRate.find(i => i.code === '0')?.id,
           paymentPeriodId: this.formStore.productConditionsForm.paymentPeriod.id,
-          addCovers: this.additionalInsuranceTermsWithout,
+          addCovers: this.formStore.additionalInsuranceTermsWithout,
         };
+        console.log(calculationData);
         const calculationResponse = await this.api.calculateWithoutApplication(calculationData);
         this.formStore.productConditionsForm.requestedSumInsured = this.getNumberWithSpaces(calculationResponse.amount);
         this.formStore.productConditionsForm.insurancePremiumPerMonth = this.getNumberWithSpaces(calculationResponse.premium);
-        this.additionalInsuranceTermsWithout = calculationResponse.addCovers;
+        this.formStore.additionalInsuranceTermsWithout = calculationResponse.addCovers;
         this.showToaster('success', this.t('toaster.calculated'), 1000);
       } catch (err) {
         ErrorHandler(err);
@@ -1451,7 +1437,7 @@ export const useDataStore = defineStore('data', {
             disabilityAdditive: formatProcents(this.formStore.productConditionsForm.adbAdditive),
             riskGroup: this.formStore.productConditionsForm.riskGroup?.id ? this.formStore.productConditionsForm.riskGroup.id : 1,
           },
-          addCoversDto: this.additionalInsuranceTerms,
+          addCoversDto: this.formStore.additionalInsuranceTerms,
         };
 
         try {
@@ -1467,7 +1453,7 @@ export const useDataStore = defineStore('data', {
 
           const applicationData = await this.api.getApplicationData(taskId);
           this.formStore.applicationData = applicationData;
-          this.additionalInsuranceTerms = this.formStore.applicationData.addCoverDto;
+          this.formStore.additionalInsuranceTerms = this.formStore.applicationData.addCoverDto;
           if (this.formStore.productConditionsForm.insurancePremiumPerMonth != null) {
             this.formStore.productConditionsForm.requestedSumInsured = this.getNumberWithSpaces(result);
           } else {
@@ -1511,7 +1497,7 @@ export const useDataStore = defineStore('data', {
           return;
         }
         this.formStore.applicationData = applicationData;
-        this.additionalInsuranceTerms = applicationData.addCoverDto;
+        this.formStore.additionalInsuranceTerms = applicationData.addCoverDto;
 
         this.formStore.canBeClaimed = await this.api.isClaimTask(taskId);
         this.formStore.applicationTaskId = taskId;
@@ -1842,12 +1828,12 @@ export const useDataStore = defineStore('data', {
     },
     async signToDocument(data) {
       try {
-        if (this.signUrl) {
-          return this.signUrl;
+        if (this.formStore.signUrl) {
+          return this.formStore.signUrl;
         }
         const result = await this.api.signToDocument(data);
-        this.signUrl = result.uri;
-        return this.signUrl;
+        this.formStore.signUrl = result.uri;
+        return this.formStore.signUrl;
       } catch (error) {
         this.showToaster('error', this.t('toaster.error') + error?.response?.data, 2000);
       }
@@ -1863,7 +1849,7 @@ export const useDataStore = defineStore('data', {
     async getSignedDocList(processInstanceId) {
       if (processInstanceId !== 0) {
         try {
-          this.signedDocumentList = await this.api.getSignedDocList({
+          this.formStore.signedDocumentList = await this.api.getSignedDocList({
             processInstanceId: processInstanceId,
           });
         } catch (err) {
@@ -2012,7 +1998,7 @@ export const useDataStore = defineStore('data', {
       return true;
     },
     validateAnketa(whichSurvey) {
-      const list = this[whichSurvey].body;
+      const list = this.formStore[whichSurvey].body;
       if (!list || (list && list.length === 0)) return false;
       let notAnswered = 0;
       for (let x = 0; x < list.length; x++) {
@@ -2027,7 +2013,7 @@ export const useDataStore = defineStore('data', {
       const areMembersValid = await this.validateAllMembers(taskId);
       if (areMembersValid) {
         if (!!this.formStore.productConditionsForm.insurancePremiumPerMonth && !!this.formStore.productConditionsForm.requestedSumInsured) {
-          const hasCritical = this.additionalInsuranceTerms?.find(cover => cover.coverTypeName === 'Критическое заболевание Застрахованного');
+          const hasCritical = this.formStore.additionalInsuranceTerms?.find(cover => cover.coverTypeName === 'Критическое заболевание Застрахованного');
           if (hasCritical && hasCritical.coverSumName !== 'не включено') {
             await Promise.allSettled([
               this.getQuestionList(
@@ -2046,10 +2032,10 @@ export const useDataStore = defineStore('data', {
               ),
             ]);
             await Promise.allSettled([
-              ...this.surveyByHealthBase.body.map(async question => {
+              ...this.formStore.surveyByHealthBase.body.map(async question => {
                 await this.definedAnswers(question.first.id, 'surveyByHealthBase');
               }),
-              ...this.surveyByCriticalBase.body.map(async question => {
+              ...this.formStore.surveyByCriticalBase.body.map(async question => {
                 await this.definedAnswers(question.first.id, 'surveyByCriticalBase');
               }),
             ]);