hl-core 0.0.7-beta.14 → 0.0.7-beta.15

package/components/Form/FormBlock.vue

@@ -1,10 +1,10 @@
 <template>
-  <div class="pt-3 pl-5 rounded border-[1px]" :class="[$libStyles.whiteBg]">
-    <div>
+  <div class="pt-3 rounded-lg border-[1px]" :class="[$libStyles.whiteBg]">
+    <div class="ml-5">
       <p :class="[$libStyles.textTitle, $libStyles.greenText]">{{ title }}</p>
       <p v-if="!!subtitle" :class="[$libStyles.greyText, $libStyles.textSimple]">{{ subtitle }}</p>
     </div>
-    <div class="mt-6 grid grid-cols-4 md:gap-5 md:grid-cols-4 lg:grid-cols-7 auto-rows-fr items-center">
+    <div class="ml-5 mt-6 grid grid-cols-4 md:gap-5 md:grid-cols-4 lg:grid-cols-7 auto-rows-fr items-center">
       <span :class="[$libStyles.textSimple]" class="font-medium">{{ $t('form.fullName') }}</span>
       <span :class="[$libStyles.textSimple]" class="font-medium">{{ $t('form.iin') }}</span>
       <span :class="[$libStyles.textSimple]" class="font-medium hidden lg:block"> {{ $t('form.gender') }}</span>
@@ -12,7 +12,7 @@
       <span :class="[$libStyles.textSimple]" class="font-medium hidden lg:block">{{ $t('form.Country') }} </span>
       <span :class="[$libStyles.textSimple]" class="font-medium hidden lg:block"> {{ $t('code') }}</span>
     </div>
-    <div v-if="isMultiple" class="flex flex-col">
+    <div v-if="isMultiple" class="ml-5 flex flex-col">
       <div v-for="(each, index) of member" :key="index" class="grid grid-cols-4 md:gap-5 md:grid-cols-4 lg:grid-cols-7 auto-rows-fr items-center relative">
         <span :class="[getMemberInfo(each).fullName === null && $libStyles.emptyBlockCol]">{{ getMemberInfo(each).fullName }}</span>
         <span :class="[getMemberInfo(each).iin === null && $libStyles.emptyBlockCol]">{{ getMemberInfo(each).iin }}</span>
@@ -21,7 +21,7 @@
         <span :class="[getMemberInfo(each).birthPlace === null && $libStyles.emptyBlockCol]" class="hidden lg:block"> {{ getMemberInfo(each).birthPlace }} </span>
         <span :class="[getMemberInfo(each).sectorCode === null && $libStyles.emptyBlockCol]" class="hidden lg:block"> {{ getMemberInfo(each).sectorCode }} </span>
         <div
-          class="transition-all h-[70px] w-[60px] place-self-end cursor-pointer"
+          class="rounded-br-lg transition-all h-[70px] w-[60px] place-self-end cursor-pointer"
           :class="[$libStyles.blueBgLight, $libStyles.blueBgLightHover]"
           @click="$emit('onMore', { whichForm, index })"
         >
@@ -29,7 +29,7 @@
         </div>
       </div>
     </div>
-    <div v-else class="grid grid-cols-4 md:gap-5 md:grid-cols-4 lg:grid-cols-7 auto-rows-fr items-center relative">
+    <div v-else class="ml-5 grid grid-cols-4 md:gap-5 md:grid-cols-4 lg:grid-cols-7 auto-rows-fr items-center relative">
       <span :class="[getMemberInfo(member).fullName === null && $libStyles.emptyBlockCol]">{{ getMemberInfo(member).fullName }}</span>
       <span :class="[getMemberInfo(member).iin === null && $libStyles.emptyBlockCol]">{{ getMemberInfo(member).iin }}</span>
       <span :class="[getMemberInfo(member).gender === null && $libStyles.emptyBlockCol]" class="hidden lg:block">{{ getMemberInfo(member).gender }} </span>
@@ -37,13 +37,21 @@
       <span :class="[getMemberInfo(member).birthPlace === null && $libStyles.emptyBlockCol]" class="hidden lg:block"> {{ getMemberInfo(member).birthPlace }} </span>
       <span :class="[getMemberInfo(member).sectorCode === null && $libStyles.emptyBlockCol]" class="hidden lg:block"> {{ getMemberInfo(member).sectorCode }} </span>
       <div
-        class="transition-all h-[70px] w-[60px] place-self-end cursor-pointer"
+        class="rounded-br-lg transition-all h-[70px] w-[60px] place-self-end cursor-pointer"
         :class="[$libStyles.blueBgLight, $libStyles.blueBgLightHover]"
         @click="$emit('onMore', { whichForm })"
       >
         <i class="mdi mdi-dots-vertical text-xl absolute top-[20px] right-[20px]"> </i>
       </div>
     </div>
+    <div
+      v-if="isMultiple && more"
+      :class="[$libStyles.blueBg, $libStyles.whiteText, $libStyles.textSimple]"
+      class="cursor-pointer rounded-b-lg h-[36px] flex items-center font-medium justify-center"
+      @click="memberStore.addMember(whichForm)"
+    >
+      {{ $t('buttons.add') }}
+    </div>
   </div>
 </template>
 
@@ -62,11 +70,16 @@ export default defineComponent({
       type: String as PropType<'policyholderForm' | 'insuredForm' | 'beneficiaryForm' | 'beneficialOwnerForm' | 'policyholdersRepresentativeForm' | 'productConditionsForm'>,
       default: '',
     },
+    more: {
+      type: Boolean,
+      default: false,
+    },
   },
-  emits: ['onMore'],
+  emits: ['onMore', 'addMember'],
   setup(props) {
     const dataStore = useDataStore();
     const formStore = useFormStore();
+    const memberStore = useMemberStore();
     const multipleMembers = ['insuredForm', 'beneficiaryForm', 'beneficialOwnerForm'];
     const isMultiple = ref(multipleMembers.includes(props.whichForm));
     const member = formStore[props.whichForm as keyof typeof formStore];
@@ -85,6 +98,7 @@ export default defineComponent({
     return {
       // State
       formStore,
+      memberStore,
       member,
       isMultiple,
 

package/components/Form/FormSection.vue

@@ -0,0 +1,18 @@
+<template>
+  <section :class="[$libStyles.blueBgLight, $libStyles.rounded]" class="mt-[14px] p-4 flex flex-col gap-[1px]">
+    <h2 :class="[$libStyles.textTitle]" class="font-medium text-center w-full mb-4">{{ title }}</h2>
+    <slot></slot>
+  </section>
+</template>
+
+<script lang="ts">
+export default defineComponent({
+  props: {
+    title: {
+      type: String,
+      default: 'Заголовок',
+      required: true,
+    },
+  },
+});
+</script>

package/components/Form/FormToggle.vue

@@ -1,5 +1,5 @@
 <template>
-  <div class="h-[74px] !pl-2 md:!pl-5 rounded border-[1px] flex items-center justify-start gap-4" :class="[$libStyles.whiteBg]">
+  <div class="h-[74px] !pl-2 md:!pl-5 rounded-lg border-[1px] flex items-center justify-start gap-4" :class="[$libStyles.whiteBg]">
     <v-switch class="base-toggle" :model-value="modelValue" @update:modelValue="$emit('update:modelValue', $event)" color="#009C73" hide-details :disabled="disabled"> </v-switch>
     <p :class="[$libStyles.textSimple]">{{ `${title}` }}</p>
     <p class="mr-3" :class="[modelValue ? $libStyles.greenText : '', $libStyles.textSimple]">{{ `${modelValue ? $dataStore.t('confirm.yes') : $dataStore.t('confirm.no')}` }}</p>

package/components/Form/MemberForm.vue

@@ -0,0 +1,376 @@
+<template>
+  <section class="flex flex-col gap-4 px-[10px]">
+    <v-form v-if="member" ref="vForm" @submit="submitForm" class="max-h-[75vh] md:max-h-[77vh] overflow-y-scroll">
+      <base-form-section :title="$t('form.personalData')">
+        <base-form-input
+          v-model="member.iin"
+          :label="$t('form.iin')"
+          maska="###-###-###-###"
+          append-inner-icon="mdi mdi-magnify"
+          @append="searchMember"
+          :rules="$rules.required.concat($rules.iinRight)"
+        ></base-form-input>
+        <base-form-input
+          v-model="member.phoneNumber"
+          :label="$t('form.phoneNumber')"
+          maska="+7 (7##) ### ## ##"
+          placeholder="+7 7"
+          :rules="$rules.required.concat($rules.phoneFormat)"
+        ></base-form-input>
+        <base-form-input v-model="member.lastName" :label="$t('form.lastName')" :rules="$rules.required.concat($rules.cyrillic)"></base-form-input>
+        <base-form-input v-model="member.firstName" :label="$t('form.firstName')" :rules="$rules.required.concat($rules.cyrillic)"></base-form-input>
+        <base-form-input v-model="member.middleName" :label="$t('form.middleName')" :rules="$rules.required.concat($rules.cyrillic)"></base-form-input>
+        <base-form-input
+          v-model="member.birthDate"
+          :label="$t('form.birthDate')"
+          :rules="$rules.required.concat($rules.birthDate)"
+          maska="##.##.####"
+          append-inner-icon="mdi mdi-calendar-blank-outline"
+        ></base-form-input>
+        <base-form-input v-model="member.age" :label="$t('form.age')" :rules="$rules.required.concat($rules.numbers)"></base-form-input>
+        <base-panel-input
+          v-model="member.gender"
+          :value="member.gender.nameRu"
+          :label="$t('form.gender')"
+          :rules="$rules.objectRequired"
+          append-inner-icon="mdi mdi-chevron-right"
+          @append="openPanel($t('form.gender'), $dataStore.gender, 'gender')"
+        ></base-panel-input>
+        <base-panel-input
+          v-model="member.familyStatus"
+          :value="member.familyStatus.nameRu"
+          :label="$t('form.familyStatus')"
+          :rules="$rules.objectRequired"
+          append-inner-icon="mdi mdi-chevron-right"
+          @append="openPanel($t('form.familyStatus'), [], 'familyStatus', $dataStore.getFamilyStatuses)"
+        ></base-panel-input>
+      </base-form-section>
+      <base-form-section :title="$t('form.jobData')">
+        <base-form-input v-model="member.job" :label="$t('form.job')" :rules="$rules.required"></base-form-input>
+        <base-form-input v-model="member.jobPosition" :label="$t('form.jobPosition')" :rules="$rules.required"></base-form-input>
+        <base-form-input v-model="member.jobPlace" :label="$t('form.jobPlace')" :rules="$rules.required"></base-form-input>
+      </base-form-section>
+      <base-form-section :title="$t('form.placeRegistration')">
+        <base-panel-input
+          v-model="member.registrationCountry"
+          :value="member.registrationCountry.nameRu"
+          :label="$t('form.Country')"
+          :rules="$rules.objectRequired"
+          append-inner-icon="mdi mdi-chevron-right"
+          @append="openPanel($t('form.Country'), [], 'registrationCountry', $dataStore.getCountries)"
+        ></base-panel-input>
+        <div class="flex flex-col gap-[1px]" v-if="member.registrationCountry.nameRu === 'Казахстан' || member.registrationCountry.nameRu === null">
+          <base-panel-input
+            v-model="member.registrationProvince"
+            :value="member.registrationProvince.nameRu"
+            :label="$t('form.Province')"
+            :rules="$rules.objectRequired"
+            append-inner-icon="mdi mdi-chevron-right"
+            @append="openPanel($t('form.Province'), [], 'registrationProvince', $dataStore.getStates, 'registrationCountry')"
+          ></base-panel-input>
+          <base-panel-input
+            v-model="member.registrationRegionType"
+            :value="member.registrationRegionType.nameRu"
+            :label="$t('form.RegionType')"
+            :rules="$rules.objectRequired"
+            append-inner-icon="mdi mdi-chevron-right"
+            @append="openPanel($t('form.RegionType'), [], 'registrationRegionType', $dataStore.getLocalityTypes)"
+          ></base-panel-input>
+          <base-panel-input
+            v-if="member.registrationRegionType.nameRu !== 'город'"
+            v-model="member.registrationRegion"
+            :value="member.registrationRegion.nameRu"
+            :label="$t('form.Region')"
+            :rules="$rules.objectRequired"
+            append-inner-icon="mdi mdi-chevron-right"
+            @append="openPanel($t('form.Region'), [], 'registrationRegion', $dataStore.getRegions, 'registrationProvince')"
+          ></base-panel-input>
+          <base-panel-input
+            v-model="member.registrationCity"
+            :value="member.registrationCity.nameRu"
+            :label="$t('form.City')"
+            :rules="$rules.objectRequired"
+            append-inner-icon="mdi mdi-chevron-right"
+            @append="openPanel($t('form.City'), [], 'registrationCity', $dataStore.getCities, 'registrationProvince')"
+          ></base-panel-input>
+          <base-form-input v-model="member.registrationQuarter" :label="$t('form.Quarter')"></base-form-input>
+          <base-form-input v-model="member.registrationMicroDistrict" :label="$t('form.MicroDistrict')"></base-form-input>
+          <base-form-input v-model="member.registrationStreet" :rules="$rules.required" :label="$t('form.Street')"></base-form-input>
+          <base-form-input v-model="member.registrationNumberHouse" :rules="$rules.required" :label="$t('form.NumberHouse')"></base-form-input>
+          <base-form-input v-model="member.registrationNumberApartment" :label="$t('form.NumberApartment')"></base-form-input>
+        </div>
+      </base-form-section>
+      <base-form-section :title="$t('form.birthData')">
+        <base-panel-input
+          v-model="member.birthPlace"
+          :value="member.birthPlace.nameRu"
+          :label="$t('form.Country')"
+          :rules="$rules.objectRequired"
+          append-inner-icon="mdi mdi-chevron-right"
+          @append="openPanel($t('form.Country'), [], 'birthPlace', $dataStore.getCountries)"
+        ></base-panel-input>
+        <!-- TODO -->
+        <!-- <base-panel-input
+          v-model="member.birthRegion"
+          :value="member.birthRegion.nameRu"
+          :label="$t('form.Region')"
+          :rules="$rules.objectRequired"
+          append-inner-icon="mdi mdi-chevron-right"
+          @append="openPanel($t('form.Region'), [], 'birthRegion', $dataStore.getRegions)"
+        ></base-panel-input> -->
+      </base-form-section>
+      <base-form-section :title="$t('form.documentData')">
+        <base-panel-input
+          v-model="member.documentType"
+          :value="member.documentType.nameRu"
+          :label="$t('form.documentType')"
+          :rules="$rules.objectRequired"
+          append-inner-icon="mdi mdi-chevron-right"
+          @append="openPanel($t('form.documentType'), [], 'documentType', $dataStore.getDocumentTypes)"
+        ></base-panel-input>
+        <base-form-input v-model="member.documentNumber" :label="$t('form.documentNumber')" :rules="$rules.required"></base-form-input>
+        <base-panel-input
+          v-model="member.documentIssuers"
+          :value="member.documentIssuers.nameRu"
+          :label="$t('form.documentIssuers')"
+          :rules="$rules.objectRequired"
+          append-inner-icon="mdi mdi-chevron-right"
+          @append="openPanel($t('form.documentIssuers'), [], 'documentIssuers', $dataStore.getDocumentIssuers)"
+        ></base-panel-input>
+        <base-form-input
+          v-model="member.documentDate"
+          :label="$t('form.documentDate')"
+          :rules="$rules.required.concat($rules.date)"
+          maska="##.##.####"
+          append-inner-icon="mdi mdi-calendar-blank-outline"
+        ></base-form-input>
+        <base-form-input
+          v-if="member.documentType.ids !== 'SBI' && member.documentType.ids !== 'VNZ'"
+          v-model="member.documentExpire"
+          :label="$t('form.documentExpire')"
+          :rules="$rules.required.concat($rules.date)"
+          maska="##.##.####"
+          append-inner-icon="mdi mdi-calendar-blank-outline"
+        ></base-form-input>
+        <base-panel-input
+          v-model="member.signOfResidency"
+          :value="member.signOfResidency.nameRu"
+          :label="$t('form.signOfResidency')"
+          :rules="$rules.objectRequired"
+          append-inner-icon="mdi mdi-chevron-right"
+          @append="openPanel($t('form.signOfResidency'), [], 'signOfResidency', $dataStore.getResidents)"
+        ></base-panel-input>
+        <base-panel-input
+          v-model="member.countryOfTaxResidency"
+          :value="member.countryOfTaxResidency.nameRu"
+          :label="$t('form.countryOfTaxResidency')"
+          :rules="$rules.objectRequired"
+          append-inner-icon="mdi mdi-chevron-right"
+          @append="openPanel($t('form.countryOfTaxResidency'), [], 'countryOfTaxResidency', $dataStore.getTaxCountries)"
+        ></base-panel-input>
+        <base-panel-input
+          v-if="member.countryOfTaxResidency.ids === '500014.3'"
+          v-model="member.addTaxResidency"
+          :value="member.addTaxResidency.nameRu"
+          :label="$t('form.addTaxResidency')"
+          :rules="$rules.objectRequired"
+          append-inner-icon="mdi mdi-chevron-right"
+          @append="openPanel($t('form.addTaxResidency'), [], 'addTaxResidency', $dataStore.getAdditionalTaxCountries)"
+        ></base-panel-input>
+        <base-panel-input
+          v-model="member.signOfIPDL"
+          :value="member.signOfIPDL.nameRu"
+          :label="$t('form.signOfIPDL')"
+          :rules="$rules.objectRequired"
+          append-inner-icon="mdi mdi-chevron-right"
+          @append="openPanel($t('form.signOfIPDL'), $dataStore.ipdl, 'signOfIPDL')"
+        ></base-panel-input>
+        <base-panel-input
+          v-model="member.countryOfCitizenship"
+          :value="member.countryOfCitizenship.nameRu"
+          :label="$t('form.countryOfCitizenship')"
+          :rules="$rules.objectRequired"
+          append-inner-icon="mdi mdi-chevron-right"
+          @append="openPanel($t('form.countryOfCitizenship'), [], 'countryOfCitizenship', $dataStore.getCitizenshipCountries)"
+        ></base-panel-input>
+        <base-panel-input
+          v-model="member.economySectorCode"
+          :value="member.economySectorCode.nameRu"
+          :label="$t('form.economySectorCode')"
+          :rules="$rules.objectRequired"
+          append-inner-icon="mdi mdi-chevron-right"
+          @append="openPanel($t('form.economySectorCode'), [], 'economySectorCode', $dataStore.getSectorCodeList)"
+        ></base-panel-input>
+      </base-form-section>
+      <base-form-section :title="$t('form.contactsData')">
+        <base-form-input
+          v-model="member.homePhone"
+          maska="+7 (7##) ### ## ##"
+          placeholder="+7 7"
+          :label="$t('form.homePhone')"
+          :rules="whichForm === formStore.beneficiaryFormKey ? [] : $rules.phoneFormat"
+        ></base-form-input>
+        <base-form-input v-model="member.email" :label="$t('form.email')" :rules="$rules.email"></base-form-input>
+      </base-form-section>
+    </v-form>
+    <base-btn :text="$t('buttons.save')" @click="submitForm"></base-btn>
+    <Teleport v-if="isPanelOpen" to="#panel-actions">
+      <div :class="[$libStyles.scrollPage]">
+        <base-rounded-input v-model="searchQuery" :label="$t('labels.search')" class="p-2" :hide-details="true"></base-rounded-input>
+        <div v-if="panelList && isPanelLoading === false">
+          <base-panel-item class="cursor-pointer border-t-[1px]" @click="pickPanelValue(new Value())">{{ $t('form.notChosen') }}</base-panel-item>
+          <base-panel-item
+            v-for="(item, index) of panelList.filter(i => i.nameRu && (i.nameRu as string).match(new RegExp(searchQuery, 'i')))"
+            :key="index"
+            class="cursor-pointer"
+            :class="[item.nameRu === panelValue.nameRu && $libStyles.greenText]"
+            @click="pickPanelValue(item)"
+          >
+            {{ item.nameRu }}
+          </base-panel-item>
+        </div>
+        <base-loader v-if="isPanelLoading" class="absolute mx-auto mt-10" :size="50"></base-loader>
+      </div>
+    </Teleport>
+  </section>
+</template>
+
+<script lang="ts">
+import { LocationQueryValue } from 'vue-router';
+import { Value } from '@/composables/classes';
+
+export default defineComponent({
+  setup() {
+    const componentKey = ref<number>(0);
+    const vForm = ref<any>();
+    const route = useRoute();
+    const router = useRouter();
+    const dataStore = useDataStore();
+    const formStore = useFormStore();
+    const memberStore = useMemberStore();
+    const getMember = (whichForm: LocationQueryValue | LocationQueryValue[], whichIndex?: LocationQueryValue | LocationQueryValue[]) =>
+      memberStore.getMemberFromStore(whichForm as keyof typeof formStore, Number((whichIndex ? whichIndex : '0') as string))!;
+    const member = ref(getMember(route.query.tab, route.query.i));
+    const isPanelOpen = ref<boolean>(false);
+    const isPanelLoading = ref<boolean>(false);
+    const panelValue = ref<Value>(new Value());
+    const panelList = ref<Value[]>([]);
+    const currentPanel = ref<string>('');
+    const searchQuery = ref<string>('');
+
+    const whichForm = computed(() => route.query.tab);
+    const whichIndex = computed(() => route.query.i);
+
+    const searchMember = async () => {
+      console.log('Search');
+    };
+
+    const openPanel = async (title: string, list: Value[], key: string, asyncFunction?: Function, filterKey?: string) => {
+      if (formStore.isDisabled[whichForm.value as keyof typeof formStore.isDisabled] === false) {
+        const notAllowedToChange = ['gender', 'documentType', 'documentIssuers'];
+        if (member.value.gotFromInsis === false && notAllowedToChange.includes(key)) {
+          return;
+        }
+        currentPanel.value = key;
+        isPanelOpen.value = true;
+        dataStore.panelAction = null;
+        dataStore.panel.open = true;
+        dataStore.panel.title = title;
+
+        let newList = list;
+        if (asyncFunction) {
+          isPanelLoading.value = true;
+          newList = await asyncFunction(filterKey, whichForm.value);
+        }
+        panelList.value = newList;
+        panelValue.value = member.value[key as keyof typeof member.value];
+        isPanelLoading.value = false;
+      } else {
+        dataStore.showToaster('error', dataStore.t('toaster.viewErrorText'));
+      }
+    };
+
+    const pickPanelValue = (item: Value) => {
+      if (formStore.isDisabled[whichForm.value as keyof typeof formStore.isDisabled] === false) {
+        dataStore.panel.open = false;
+        isPanelOpen.value = false;
+        member.value[currentPanel.value as keyof typeof member.value] = item.nameRu === null ? new Value() : item;
+      } else {
+        dataStore.showToaster('error', dataStore.t('toaster.viewErrorText'));
+      }
+    };
+
+    const submitForm = async () => {
+      await vForm.value.validate().then(async (v: { valid: Boolean; errors: any }) => {
+        if (v.valid) {
+          console.log(v);
+        } else {
+          const errors = document.querySelector('.v-input--error');
+          if (errors) {
+            const errorText = errors.querySelector('.v-label.v-field-label');
+            if (errorText) {
+              dataStore.showToaster('error', dataStore.t('toaster.errorFormField').replace('{text}', errorText.innerHTML?.replace(/[-<>!//.]/g, '')));
+            } else {
+              const errorFieldText = errors.querySelector('.v-input__control');
+              if (errorFieldText) {
+                dataStore.showToaster('error', dataStore.t('toaster.errorFormField').replace('{text}', errorFieldText.innerHTML?.replace(/[-<>!//.]/g, '')));
+              }
+            }
+            errors.scrollIntoView({
+              behavior: 'smooth',
+              block: 'center',
+              inline: 'nearest',
+            });
+          }
+        }
+      });
+    };
+
+    onBeforeRouteUpdate(to => {
+      member.value = getMember(to.query.tab, to.query.i);
+      componentKey.value++;
+    });
+
+    watch(
+      () => dataStore.panel.open,
+      () => {
+        if (dataStore.panel.open === false) {
+          isPanelOpen.value = false;
+        }
+      },
+      { immediate: true },
+    );
+
+    watch(searchQuery, () => {
+      if (searchQuery.value === null) {
+        searchQuery.value = '';
+      }
+    });
+
+    return {
+      // State
+      vForm,
+      formStore,
+      memberStore,
+      member,
+      isPanelOpen,
+      isPanelLoading,
+      componentKey,
+      panelValue,
+      panelList,
+      searchQuery,
+      Value,
+
+      // Computed
+      whichForm,
+      whichIndex,
+
+      // Functions
+      searchMember,
+      openPanel,
+      pickPanelValue,
+      submitForm,
+    };
+  },
+});
+</script>

package/components/Form/ProductConditions.vue

@@ -0,0 +1,43 @@
+<template>
+  <section class="flex flex-col gap-4 px-[10px]">
+    <v-form ref="vForm" @submit="submitForm">
+      <base-form-section :title="$t('generalConditions')">
+        <base-form-input
+          v-model="formStore.productConditionsForm.requestedSumInsured"
+          :rules="$dataStore.rules.numbers"
+          :label="$t('productConditionsForm.requestedSumInsured')"
+        ></base-form-input>
+        <base-form-input
+          v-model="formStore.productConditionsForm.insurancePremiumPerMonth"
+          :rules="$dataStore.rules.numbers"
+          :label="$t('productConditionsForm.insurancePremiumAmount')"
+        ></base-form-input>
+      </base-form-section>
+    </v-form>
+    <base-btn :text="$t('buttons.calculate')" @click="submitForm"></base-btn>
+  </section>
+</template>
+
+<script lang="ts">
+export default defineComponent({
+  setup() {
+    const formStore = useFormStore();
+    const vForm = ref<any>();
+
+    const submitForm = async () => {
+      vForm.value.validate().then(async (v: { valid: Boolean; errors: any }) => {
+        console.log(v);
+      });
+    };
+
+    return {
+      // State
+      formStore,
+      vForm,
+
+      // Functions
+      submitForm,
+    };
+  },
+});
+</script>

package/components/Form/ProductConditionsBlock.vue

@@ -1,5 +1,5 @@
 <template>
-  <div class="pt-3 pl-5 rounded border-[1px]" :class="[$libStyles.whiteBg]">
+  <div class="pt-3 pl-5 rounded-lg border-[1px]" :class="[$libStyles.whiteBg]">
     <div>
       <p :class="[$libStyles.textTitle, $libStyles.greenText]">
         {{ $t('productConditions') }}
@@ -20,7 +20,7 @@
         {{ paymentPeriod }}
       </span>
       <div
-        class="transition-all h-[70px] w-[60px] relative place-self-end cursor-pointer"
+        class="rounded-br-lg transition-all h-[70px] w-[60px] relative place-self-end cursor-pointer"
         :class="[$libStyles.blueBgLight, $libStyles.blueBgLightHover]"
         @click="$emit('onMore', { whichForm: 'productConditions' })"
       >

package/components/Input/FormInput.vue

@@ -1,22 +1,31 @@
 <template>
   <v-text-field
-    class="rounded-input"
+    class="form-input"
     :model-value="modelValue"
     v-maska="maska"
     :rules="rules"
     :loading="loading"
     :placeholder="placeholder"
+    :label="label"
+    :messages="messages"
     :type="type"
     :variant="variant"
     :clear-icon="clearIcon"
     :color="color"
     :hint="hint"
-    :clearable="clearable"
+    :clearable="readonly ? false : clearable"
     :disabled="disabled"
-    :prepend-inner-icon="prependIcon ? prependIcon : ''"
+    :readonly="readonly"
+    :prepend-icon="prependIcon ? prependIcon : ''"
     :append-icon="appendIcon ? appendIcon : ''"
+    :prepend-inner-icon="prependInnerIcon ? prependInnerIcon : ''"
+    :append-inner-icon="appendInnerIcon ? appendInnerIcon : ''"
     :bg-color="bgColor ? bgColor : ''"
     @keyup.enter.prevent="submitted"
+    @click:append="!readonly && $emit('append-out')"
+    @click:prepend="!readonly && $emit('prepend-out')"
+    @click:append-inner="!readonly && $emit('append')"
+    @click:prepend-inner="!readonly && $emit('prepend')"
     @update:modelValue="$emit('update:modelValue', $event)"
   >
     <template v-if="loading" #loader>
@@ -32,8 +41,7 @@ export default defineComponent({
   name: 'BaseRoundedInput',
   props: {
     modelValue: {
-      type: String,
-      default: '',
+      required: false,
     },
     loading: {
       type: Boolean,
@@ -47,9 +55,20 @@ export default defineComponent({
       type: Boolean,
       default: false,
     },
+    readonly: {
+      type: Boolean,
+      default: false,
+    },
     placeholder: {
       type: String,
-      default: 'Поле',
+      default: '',
+    },
+    label: {
+      type: String,
+      default: '',
+    },
+    messages: {
+      type: [String, Array<string>],
     },
     maska: {
       type: String,
@@ -85,11 +104,17 @@ export default defineComponent({
     appendIcon: {
       type: String,
     },
+    prependInnerIcon: {
+      type: String,
+    },
+    appendInnerIcon: {
+      type: String,
+    },
     bgColor: {
       type: String,
     },
   },
-  emits: ['update:modelValue', 'submitted'],
+  emits: ['update:modelValue', 'submitted', 'prepend', 'append', 'prepend-out', 'append-out'],
 
   setup(props, { emit }) {
     const submitted = (event: any) => {
@@ -104,19 +129,44 @@ export default defineComponent({
 </script>
 
 <style>
-.rounded-input input:focus {
+.form-input input:focus {
   border: none !important;
   outline: none !important;
 }
-
-/* .rounded-input .v-field {
-  border-radius: 8px;
-  border: 1px solid #dadada;
+.form-input input {
+  padding-top: 30px;
+}
+.form-input .v-field {
   box-shadow: none;
   font-size: 14px;
-} */
-
-.rounded-input .v-field--error {
+}
+.form-input .v-label.v-field-label {
+  top: 20px;
+}
+.form-input .v-field__append-inner {
+  padding-top: 18px;
+  padding-right: 6px;
+}
+.form-input .v-field__append-inner i {
+  color: #a0b3d8 !important;
+  margin-left: 10px;
+  margin-right: 4px;
+}
+.form-input {
+  border-bottom: 1px solid #f3f6fc;
+}
+.form-input.v-input--error {
+  border-color: #ff5449;
+}
+.form-input.v-input--error .v-input__details {
+  display: block;
+}
+.form-input .v-input__details {
+  display: none;
+  background-color: white;
+  padding-top: 0 !important;
+}
+.form-input .v-field--error {
   border-color: #ff5449;
 }
 </style>

package/components/Input/PanelInput.vue

@@ -0,0 +1,132 @@
+<template>
+  <v-text-field
+    class="form-input"
+    :model-value="modelValue"
+    v-maska="maska"
+    :rules="rules"
+    :loading="loading"
+    :placeholder="placeholder"
+    :label="label"
+    :messages="messages"
+    :type="type"
+    :variant="variant"
+    :clear-icon="clearIcon"
+    :color="color"
+    :hint="hint"
+    :clearable="clearable"
+    :disabled="disabled"
+    :readonly="true"
+    :prepend-icon="prependIcon ? prependIcon : ''"
+    :append-icon="appendIcon ? appendIcon : ''"
+    :prepend-inner-icon="prependInnerIcon ? prependInnerIcon : ''"
+    :append-inner-icon="appendInnerIcon ? appendInnerIcon : ''"
+    :bg-color="bgColor ? bgColor : ''"
+    @keyup.enter.prevent="submitted"
+    @click:clear="(readonly ? false : clearable) && $emit('update:modelValue', new Value())"
+    @click:append="!readonly && $emit('append-out')"
+    @click:prepend="!readonly && $emit('prepend-out')"
+    @click:append-inner="!readonly && $emit('append')"
+    @click:prepend-inner="!readonly && $emit('prepend')"
+    @update:modelValue="$emit('update:modelValue', $event)"
+  >
+    <template v-if="loading" #loader>
+      <v-progress-linear :active="loading" :color="color" absolute height="1" indeterminate></v-progress-linear>
+    </template>
+  </v-text-field>
+</template>
+
+<script lang="ts">
+import { InputTypes } from '@/composables/models';
+import { Value } from '@/composables/classes';
+
+export default defineComponent({
+  name: 'BaseRoundedInput',
+  props: {
+    modelValue: {
+      required: false,
+    },
+    loading: {
+      type: Boolean,
+      default: false,
+    },
+    clearable: {
+      type: Boolean,
+      default: true,
+    },
+    disabled: {
+      type: Boolean,
+      default: false,
+    },
+    readonly: {
+      type: Boolean,
+      default: false,
+    },
+    placeholder: {
+      type: String,
+      default: '',
+    },
+    label: {
+      type: String,
+      default: '',
+    },
+    messages: {
+      type: [String, Array<string>],
+    },
+    maska: {
+      type: String,
+      default: '',
+    },
+    hint: {
+      type: String,
+      default: '',
+    },
+    rules: {
+      type: Array<any>,
+      default: [],
+    },
+    type: {
+      type: String as PropType<InputTypes>,
+      default: 'text',
+    },
+    variant: {
+      type: String as PropType<'solo' | 'filled' | 'outlined' | 'plain' | 'underlined'>,
+      default: 'solo',
+    },
+    color: {
+      type: String,
+      default: '#009c73',
+    },
+    clearIcon: {
+      type: String,
+      default: 'mdi-close',
+    },
+    prependIcon: {
+      type: String,
+    },
+    appendIcon: {
+      type: String,
+    },
+    prependInnerIcon: {
+      type: String,
+    },
+    appendInnerIcon: {
+      type: String,
+    },
+    bgColor: {
+      type: String,
+    },
+  },
+  emits: ['update:modelValue', 'submitted', 'prepend', 'append', 'prepend-out', 'append-out', 'clear'],
+
+  setup(props, { emit }) {
+    const submitted = (event: any) => {
+      emit('submitted', event);
+    };
+
+    return {
+      submitted,
+      Value,
+    };
+  },
+});
+</script>

package/components/Input/RoundedInput.vue

@@ -6,17 +6,25 @@
     :rules="rules"
     :loading="loading"
     :placeholder="placeholder"
+    :label="label"
     :type="type"
     :variant="variant"
     :clear-icon="clearIcon"
     :color="color"
     :hint="hint"
-    :clearable="clearable"
+    :clearable="readonly ? false : clearable"
     :disabled="disabled"
-    :prepend-inner-icon="prependIcon ? prependIcon : ''"
+    :readonly="readonly"
+    :prepend-icon="prependIcon ? prependIcon : ''"
     :append-icon="appendIcon ? appendIcon : ''"
+    :prepend-inner-icon="prependInnerIcon ? prependInnerIcon : ''"
+    :append-inner-icon="appendInnerIcon ? appendInnerIcon : ''"
     :bg-color="bgColor ? bgColor : ''"
     @keyup.enter.prevent="submitted"
+    @click:append="!readonly && $emit('append-out')"
+    @click:prepend="!readonly && $emit('prepend-out')"
+    @click:append-inner="!readonly && $emit('append')"
+    @click:prepend-inner="!readonly && $emit('prepend')"
     @update:modelValue="$emit('update:modelValue', $event)"
   >
     <template v-if="loading" #loader>
@@ -29,11 +37,11 @@
 import { InputTypes } from '@/composables/models';
 
 export default defineComponent({
+  extends: {},
   name: 'BaseRoundedInput',
   props: {
     modelValue: {
-      type: String,
-      default: '',
+      required: false,
     },
     loading: {
       type: Boolean,
@@ -47,9 +55,17 @@ export default defineComponent({
       type: Boolean,
       default: false,
     },
+    readonly: {
+      type: Boolean,
+      default: false,
+    },
     placeholder: {
       type: String,
-      default: 'Поле',
+      default: '',
+    },
+    label: {
+      type: String,
+      default: '',
     },
     maska: {
       type: String,
@@ -85,11 +101,17 @@ export default defineComponent({
     appendIcon: {
       type: String,
     },
+    prependInnerIcon: {
+      type: String,
+    },
+    appendInnerIcon: {
+      type: String,
+    },
     bgColor: {
       type: String,
     },
   },
-  emits: ['update:modelValue', 'submitted'],
+  emits: ['update:modelValue', 'submitted', 'prepend', 'append', 'prepend-out', 'append-out'],
 
   setup(props, { emit }) {
     const submitted = (event: any) => {
@@ -108,14 +130,18 @@ export default defineComponent({
   border: none !important;
   outline: none !important;
 }
-
+.rounded-input input {
+  padding-top: 30px;
+}
+.rounded-input .v-label.v-field-label {
+  top: 20px;
+}
 .rounded-input .v-field {
   border-radius: 8px;
   border: 1px solid #dadada;
   box-shadow: none;
   font-size: 14px;
 }
-
 .rounded-input .v-field--error {
   border-color: #ff5449;
 }

package/composables/classes.ts

@@ -59,13 +59,7 @@ export class Value {
   nameKz: string | number | null;
   ids: string | number | null;
 
-  constructor(
-    id: string | number | null = null,
-    nameRu: string | number | null = null,
-    nameKz: string | number | null = null,
-    code: string | number | null = null,
-    ids: string | number | null = null,
-  ) {
+  constructor(id: string | number | null = null, nameRu: string | null = null, nameKz: string | null = null, code: string | null = null, ids: string | null = null) {
     this.id = id;
     this.code = code;
     this.nameRu = nameRu;
@@ -760,6 +754,9 @@ export class ProductConditions {
 }
 
 export class DataStoreClass {
+  controls: {
+    onAuth: boolean;
+  };
   hasLayoutMargins: boolean;
   readonly product: string | null;
   showNav: boolean;
@@ -852,6 +849,9 @@ export class DataStoreClass {
   };
   riskGroup: any[];
   constructor() {
+    this.controls = {
+      onAuth: false,
+    };
     this.hasLayoutMargins = true;
     this.processIndexRate = [];
     this.processPaymentPeriod = [];
@@ -983,28 +983,28 @@ export class FormStoreClass {
   SaleChanellPolicy: Value;
   AgentData: {
     agentId: null;
-    manId: 0;
-    fullName: '';
+    manId: number;
+    fullName: string;
     officeId: null;
     officeCode: null;
-    saleChannel: '';
-    managerName: '';
+    saleChannel: string;
+    managerName: string;
   };
   RegionPolicy: Value;
   ManagerPolicy: Value;
   isDisabled: {
-    policyholderForm: true;
-    beneficiaryForm: true;
-    beneficialOwnerForm: true;
-    insuredForm: true;
-    policyholdersRepresentativeForm: true;
-    productConditionsForm: true;
-    recalculationForm: true;
-    surveyByHealthBase: true;
-    surveyByCriticalBase: true;
-    surveyByHealthBasePolicyholder: true;
-    surveyByCriticalBasePolicyholder: true;
-    insuranceDocument: true;
+    policyholderForm: boolean;
+    beneficiaryForm: boolean;
+    beneficialOwnerForm: boolean;
+    insuredForm: boolean;
+    policyholdersRepresentativeForm: boolean;
+    productConditionsForm: boolean;
+    recalculationForm: boolean;
+    surveyByHealthBase: boolean;
+    surveyByCriticalBase: boolean;
+    surveyByHealthBasePolicyholder: boolean;
+    surveyByCriticalBasePolicyholder: boolean;
+    insuranceDocument: boolean;
   };
   isPolicyholderInsured: boolean = false;
   isPolicyholderBeneficiary: boolean = false;

package/composables/constants.ts

@@ -28,6 +28,8 @@ export const constants = Object.freeze({
     upk: 'UPK',
     financeCenter: 'FinanceCenter',
     supervisor: 'Supervisor',
+    support: 'Support',
+    managerHalykBank: 'ManagerHalykBank',
   },
   actions: {
     accept: 'accept',

package/layouts/default.vue

@@ -40,6 +40,7 @@ const openSettings = async () => {
 span,
 header,
 *[class='text-[14px]'],
+.v-label,
 .text-\[14px\] {
   font-size: v-bind('dataStore.fontSize + "px"') !important;
   /* line-height: v-bind('dataStore.fontSize*1.5 + "px"') !important; */
@@ -49,7 +50,6 @@ header,
 .text-\[16px\],
 label .v-label .v-field-label,
 .v-field__input,
-.v-label,
 .v-field,
 .v-input {
   font-size: v-bind('dataStore.fontSize+2 + "px"') !important;

package/package.json

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

package/plugins/storePlugin.ts

@@ -11,6 +11,7 @@ export default defineNuxtPlugin(nuxtApp => {
   return {
     provide: {
       dataStore: useDataStore(),
+      rules: useDataStore().rules,
       libStyles: new Styles(),
       t: useDataStore().t,
       toast: useDataStore().showToaster,

package/store/data.store.js

@@ -2,7 +2,7 @@ import { defineStore } from 'pinia';
 import { t } from './messages';
 import { rules } from './rules';
 import { Toast, Types, Positions, ToastOptions } from './toast';
-import { isValidGUID, yearEnding, jwtDecode } from '../composables';
+import { isValidGUID, yearEnding, jwtDecode, ErrorHandler, getKeyWithPattern } from '../composables';
 import { DataStoreClass, Contragent } from '../composables/classes';
 import { ApiClass } from '@/api';
 import { useFormStore } from './form.store';
@@ -16,6 +16,7 @@ export const useDataStore = defineStore('data', {
     toastTypes: Types,
     toastPositions: Positions,
     isValidGUID: isValidGUID,
+    route: useRoute(),
     router: useRouter(),
     formStore: useFormStore(),
     contragent: useContragentStore(),
@@ -82,7 +83,6 @@ export const useDataStore = defineStore('data', {
     async loginUser(login, password, numAttempt) {
       try {
         const token = localStorage.getItem('accessToken') || null;
-
         if (token && isValidToken(token)) {
           this.accessToken = token;
           this.getUserRoles();
@@ -97,28 +97,34 @@ export const useDataStore = defineStore('data', {
           this.refreshToken = response.refreshToken;
           this.getUserRoles();
         }
-        if (
-          this.isManager() ||
-          this.isUnderwriter() ||
-          this.isAdmin() ||
-          this.isAgent() ||
-          this.isCompliance() ||
-          this.isAgentMycar() ||
-          this.isAnalyst() ||
-          this.isUpk() ||
-          this.isFinanceCenter() ||
-          this.isSupervisor()
-        ) {
+        if (this.controls.onAuth) {
+          const hasPermission =
+            this.isManager() ||
+            this.isUnderwriter() ||
+            this.isAdmin() ||
+            this.isAgent() ||
+            this.isCompliance() ||
+            this.isAgentMycar() ||
+            this.isAnalyst() ||
+            this.isUpk() ||
+            this.isFinanceCenter() ||
+            this.isSupervisor() ||
+            this.isSupport() ||
+            this.isManagerHalykBank();
+          if (hasPermission) {
+            localStorage.setItem('accessToken', this.accessToken);
+            localStorage.setItem('refreshToken', this.refreshToken);
+          } else {
+            this.showToaster('error', this.t('toaster.noProductPermission'), 5000);
+            this.accessToken = null;
+            this.refreshToken = null;
+          }
+        } else {
           localStorage.setItem('accessToken', this.accessToken);
           localStorage.setItem('refreshToken', this.refreshToken);
-        } else {
-          this.showToaster('error', this.t('toaster.noProductPermission'), 5000);
         }
       } catch (err) {
-        console.log(err);
-        if ('response' in err) {
-          this.showToaster('error', err.response.data, 3000);
-        }
+        ErrorHandler(err);
       }
     },
     getUserRoles() {
@@ -145,7 +151,7 @@ export const useDataStore = defineStore('data', {
       return !!isRole;
     },
     isInitiator() {
-      return this.isRole(constants.roles.manager) || this.isRole(constants.roles.agent) || this.isRole(constants.roles.agentMycar);
+      return this.isManager() || this.isAgent() || this.isAgentMycar();
     },
     isManager() {
       return this.isRole(constants.roles.manager);
@@ -159,6 +165,9 @@ export const useDataStore = defineStore('data', {
     isAgent() {
       return this.isRole(constants.roles.agent);
     },
+    isManagerHalykBank() {
+      return this.isRole(constants.roles.managerHalykBank);
+    },
     isUnderwriter() {
       return this.isRole(constants.roles.underwriter);
     },
@@ -171,19 +180,26 @@ export const useDataStore = defineStore('data', {
     isUpk() {
       return this.isRole(constants.roles.upk);
     },
+    isSupport() {
+      return this.isRole(constants.roles.support);
+    },
     isFinanceCenter() {
       return this.isRole(constants.roles.financeCenter);
     },
     isSupervisor() {
       return this.isRole(constants.roles.supervisor);
     },
-
     isProcessEditable(statusCode) {
       return !!constants.editableStatuses.find(status => status === statusCode);
     },
     isTask() {
       return this.formStore.applicationData.processInstanceId != 0 && this.formStore.applicationData.isTask;
     },
+    resetSelected() {
+      this.settings.open = false;
+      this.menu.selectedItem = new MenuItem();
+      this.router.replace({ name: this.route.name });
+    },
     async logoutUser() {
       this.isLoading = true;
       try {
@@ -1002,7 +1018,7 @@ export const useDataStore = defineStore('data', {
       };
 
       if (getDataCondition()) {
-        this.whichField = [];
+        this[whichField] = [];
         try {
           const response = await this.api[whichRequest](parameter);
           if (response) {
@@ -1015,9 +1031,6 @@ export const useDataStore = defineStore('data', {
               }),
             );
             this[whichField] = response;
-            if (this[whichField].length && this[whichField][this[whichField].length - 1].nameRu == 'невключено') {
-              this[whichField].unshift(this[whichField].pop());
-            }
           }
         } catch (err) {
           console.log(err);

package/store/member.store.ts

@@ -12,13 +12,32 @@ export const useMemberStore = defineStore('members', {
   }),
   getters: {},
   actions: {
+    isStatementEditible(whichForm: string, showToaster: boolean = false) {
+      if (this.formStore.isDisabled[whichForm as keyof typeof this.formStore.isDisabled] === true) {
+        if (showToaster) this.dataStore.showToaster('error', this.dataStore.t('toaster.viewErrorText'), 2000);
+        return false;
+      }
+      return true;
+    },
+    validateInitiator(showToaster: boolean = true) {
+      if (!this.dataStore.isInitiator()) {
+        if (showToaster) this.dataStore.showToaster('error', this.dataStore.t('toaster.viewErrorText'));
+        return false;
+      }
+      return true;
+    },
     hasMemberData(whichForm: keyof typeof this.formStore, whichIndex?: number, key: string = 'id', emptyValue: any = 0) {
       if (!this.validateInitiator(false)) return false;
+      if (!this.isStatementEditible(whichForm)) return false;
       return typeof whichIndex === 'number' ? this.formStore[whichForm][whichIndex][key] != emptyValue : this.formStore[whichForm][key] != emptyValue;
     },
     canMemberDeleted(whichForm: keyof typeof this.formStore, whichIndex?: number) {
       if (!whichForm) return false;
+      if (!this.isStatementEditible(whichForm)) return false;
       if (!this.validateInitiator(false)) return false;
+      if (typeof whichIndex === 'number' && whichIndex > 0) {
+        return true;
+      }
       if (this.dataStore.isTask() && this.dataStore.isProcessEditable(this.formStore.applicationData.statusCode)) {
         if (whichForm !== this.formStore.policyholderFormKey) {
           return this.hasMemberData(whichForm, whichIndex);
@@ -27,7 +46,6 @@ export const useMemberStore = defineStore('members', {
       return false;
     },
     getMemberFromStore(whichForm: keyof typeof this.formStore, whichIndex?: number) {
-      if (!whichForm) return false;
       switch (whichForm) {
         case this.formStore.policyholderFormKey:
           return this.formStore.policyholderForm;
@@ -39,6 +57,8 @@ export const useMemberStore = defineStore('members', {
           return this.formStore.beneficiaryForm[whichIndex!];
         case this.formStore.beneficialOwnerFormKey:
           return this.formStore.beneficialOwnerForm[whichIndex!];
+        default:
+          return this.formStore.policyholderForm;
       }
     },
     getMemberFromApplication(whichForm: keyof typeof this.formStore, whichIndex?: number) {
@@ -91,15 +111,9 @@ export const useMemberStore = defineStore('members', {
           return 'Spokesman';
       }
     },
-    validateInitiator(showToaster: boolean = true) {
-      if (!this.dataStore.isInitiator()) {
-        if (showToaster) this.dataStore.showToaster('error', this.dataStore.t('toaster.viewErrorText'));
-        return false;
-      }
-      return true;
-    },
     clearMember(whichForm: keyof typeof this.formStore, whichIndex?: number) {
       if (!whichForm) return false;
+      if (!this.isStatementEditible(whichForm)) return false;
       if (!this.validateInitiator()) return false;
       const memberClass = this.getMemberClass(whichForm);
       if (!memberClass) return false;
@@ -120,24 +134,31 @@ export const useMemberStore = defineStore('members', {
     },
     async deleteMember(whichForm: keyof typeof this.formStore, whichIndex?: number) {
       if (!whichForm) return false;
+      if (!this.isStatementEditible(whichForm)) return false;
       if (!this.validateInitiator()) return false;
       try {
         const memberCode = this.getMemberCode(whichForm);
+        const memberData = this.getMemberFromApplication(whichForm, whichIndex);
         if (!memberCode) return false;
         if (typeof whichIndex !== 'number') {
           if (whichForm === this.formStore.policyholdersRepresentativeFormKey) {
             await this.dataStore.api.deleteMember(memberCode, this.formStore.applicationData.processInstanceId);
           }
         } else {
-          const memberData = this.getMemberFromApplication(whichForm, whichIndex);
-          if (!memberData) return false;
-          await this.dataStore.api.deleteMember(memberCode, memberData.id as number);
+          if (memberData) await this.dataStore.api.deleteMember(memberCode, memberData.id as number);
         }
-        await this.dataStore.getApplicationData(this.route.params.taskId, true, true, true, false);
+        if (memberData) await this.dataStore.getApplicationData(this.route.params.taskId, true, true, true, false);
         return this.clearMember(whichForm, whichIndex);
       } catch (err) {
+        console.log(err);
         return ErrorHandler(err);
       }
     },
+    addMember(whichForm: keyof typeof this.formStore) {
+      if (!whichForm) return false;
+      if (!this.isStatementEditible(whichForm)) return false;
+      if (!this.validateInitiator()) return false;
+      this.formStore[whichForm].push(this.getMemberClass(whichForm));
+    },
   },
 });

package/store/messages.ts

@@ -92,6 +92,7 @@ export const messages = {
       tokenExpire: 'Истекло время ожидания',
     },
     buttons: {
+      add: 'Добавить',
       userLogin: 'Логин',
       password: 'Пароль',
       login: 'Вход в систему',
@@ -231,6 +232,9 @@ export const messages = {
       conditions: 'Условия оплаты страховой премии',
       processTariff: 'Тариф',
       riskGroup: 'Группа риска',
+      requestedProductConditions: 'Запрашиваемые условия страхования',
+      coverPeriodFrom3to20: 'Срок страхования (от 3-х до 20 лет)',
+      insurancePremiumAmount: 'Размер Страховой премии (страховой взнос)',
     },
     history: {
       addRegNumber: 'Номер',