hl-core 0.0.10-beta.73 → 0.0.10-beta.75

package/api/base.api.ts

@@ -965,9 +965,7 @@ export class ApiClass {
     return await this.axiosCall<number>({
       method: Methods.POST,
       url: `/${this.productUrl}/api/Application/Calculator`,
-      ...(typeof processInstanceIdOrData === 'string'
-        ? { params: { processInstanceId: processInstanceIdOrData } }
-        : { data: processInstanceIdOrData }),
+      ...(typeof processInstanceIdOrData === 'string' ? { params: { processInstanceId: processInstanceIdOrData } } : { data: processInstanceIdOrData }),
     });
   }
 
@@ -1211,6 +1209,14 @@ export class ApiClass {
         params: { processInstanceId },
       });
     },
+    getEnpfExpirationDate: async (processInstanceId: string | number) => {
+      return await this.axiosCall<void>({
+        method: Methods.GET,
+        baseURL: getStrValuePerEnv('efoBaseApi'),
+        url: `${this.pensionannuityNew.base}/GetEnpfExpirationDate`,
+        params: { processInstanceId },
+      });
+    },
   };
 
   externalServices = {

package/components/Dialog/Dialog.vue

@@ -1,6 +1,6 @@
 <template>
   <v-dialog class="base-dialog" :model-value="Boolean(modelValue)" @update:modelValue="$emit('update:modelValue', $event)" :persistent="persistent">
-    <v-card class="self-center w-full sm:w-4/4 md:w-2/3 lg:w-[35%] xl:w-[500px] rounded-lg !px-[15px] !py-[30px] sm:!p-[36px]">
+    <v-card class="self-center w-full sm:w-4/4 md:w-2/3 lg:w-[35%] xl:w-[500px] rounded-lg !px-[15px] !py-[30px] sm:!p-[36px]" :class="innerClass">
       <div class="flex sm:flex-row flex-col place-items-center sm:place-items-start">
         <div class="h-20 w-20 place-items-start pt-1">
           <div class="bg-[#F7F7F7] h-24 w-24 sm:h-16 sm:w-16 rounded grid place-items-center invisible sm:visible">
@@ -75,6 +75,10 @@ export default defineComponent({
         color: '#FAB31C',
       },
     },
+    innerClass: {
+      type: String,
+      default: '',
+    },
   },
   emits: ['update:modelValue', 'yes', 'no'],
 });

package/components/Form/FormBlock.vue

@@ -16,7 +16,10 @@
     </div>
     <div
       class="ml-5 mt-6 grid auto-rows-fr items-center"
-      :class="[isShort ? 'grid-cols-2 md:gap-5 md:grid-cols-2 lg:grid-cols-2 mb-6' : 'grid-cols-4 md:gap-5 md:grid-cols-4 lg:grid-cols-7 ']"
+      :class="[
+        isShort ? 'grid-cols-2 md:gap-5 md:grid-cols-2 lg:grid-cols-2 mb-6' : 'grid-cols-4 md:gap-5 md:grid-cols-4',
+        !isShort && (isVisible ? 'lg:grid-cols-8' : 'lg:grid-cols-7'),
+      ]"
     >
       <span :class="[$styles.textSimple]" class="font-medium">{{ $appContextStore.t('form.fullName') }}</span>
       <span :class="[$styles.textSimple]" class="font-medium">{{ $appContextStore.t('form.iin') }}</span>
@@ -24,13 +27,17 @@
       <span v-if="!isShort" :class="[$styles.textSimple]" class="font-medium"> {{ $appContextStore.t('form.birthDate') }} </span>
       <span v-if="!isShort" :class="[$styles.textSimple]" class="font-medium hidden lg:block">{{ $appContextStore.t('form.Country') }} </span>
       <span v-if="!isShort" :class="[$styles.textSimple]" class="font-medium hidden lg:block"> {{ $appContextStore.t('code') }}</span>
+      <span v-if="!isShort && isVisible" :class="[$styles.textSimple]" class="font-medium hidden lg:block">ManId</span>
     </div>
     <div v-if="isMultiple && multipleMember !== null" class="ml-5 flex flex-col" :class="[isShort ? 'mb-6' : '']">
       <div
         v-for="(each, index) of multipleMember"
         :key="index"
         class="grid auto-rows-fr items-center relative"
-        :class="[isShort ? 'grid-cols-2 md:gap-5 md:grid-cols-2 lg:grid-cols-2' : 'grid-cols-4 md:gap-5 md:grid-cols-4 lg:grid-cols-7']"
+        :class="[
+          isShort ? 'grid-cols-2 md:gap-5 md:grid-cols-2 lg:grid-cols-2' : 'grid-cols-4 md:gap-5 md:grid-cols-4',
+          !isShort && (isVisible ? 'lg:grid-cols-8' : 'lg:grid-cols-7'),
+        ]"
       >
         <span :class="[getMemberInfo(each).fullName === null && $styles.emptyBlockCol]">{{ getMemberInfo(each).fullName }}</span>
         <span :class="[getMemberInfo(each).iin === null && $styles.emptyBlockCol]">{{ getMemberIIN(each) }}</span>
@@ -38,6 +45,7 @@
         <span v-if="!isShort" :class="[getMemberInfo(each).birthDate === null && $styles.emptyBlockCol]"> {{ getMemberInfo(each).birthDate }} </span>
         <span v-if="!isShort" :class="[getMemberInfo(each).birthPlace === null && $styles.emptyBlockCol]" class="hidden lg:block"> {{ getMemberInfo(each).birthPlace }} </span>
         <span v-if="!isShort" :class="[getMemberInfo(each).sectorCode === null && $styles.emptyBlockCol]" class="hidden lg:block"> {{ getMemberInfo(each).sectorCode }} </span>
+        <span v-if="!isShort && isVisible" :class="[getMemberInfo(each).id === null && $styles.emptyBlockCol]" class="hidden lg:block"> {{ getMemberInfo(each).id }} </span>
         <div
           v-if="!isShort"
           class="rounded-br-lg transition-all h-[70px] w-[60px] place-self-end"
@@ -51,7 +59,10 @@
     <div
       v-if="singleMember !== null"
       class="ml-5 grid auto-rows-fr items-center relative"
-      :class="[isShort ? 'grid-cols-2 md:gap-5 md:grid-cols-2 lg:grid-cols-2' : 'grid-cols-4 md:gap-5 md:grid-cols-4 lg:grid-cols-7']"
+      :class="[
+        isShort ? 'grid-cols-2 md:gap-5 md:grid-cols-2 lg:grid-cols-2' : 'grid-cols-4 md:gap-5 md:grid-cols-4',
+        !isShort && (isVisible ? 'lg:grid-cols-8' : 'lg:grid-cols-7'),
+      ]"
     >
       <span :class="[getMemberInfo(singleMember).fullName === null && $styles.emptyBlockCol]">{{ getMemberInfo(singleMember).fullName }}</span>
       <span :class="[getMemberInfo(singleMember).iin === null && $styles.emptyBlockCol]">{{ getMemberInfo(singleMember).iin }}</span>
@@ -63,6 +74,9 @@
       <span v-if="!isShort" :class="[getMemberInfo(singleMember).sectorCode === null && $styles.emptyBlockCol]" class="hidden lg:block">
         {{ getMemberInfo(singleMember).sectorCode }}
       </span>
+      <span v-if="!isShort && isVisible" :class="[getMemberInfo(singleMember).id === null && $styles.emptyBlockCol]" class="hidden lg:block">
+        {{ getMemberInfo(singleMember).id }}
+      </span>
       <div
         v-if="!isShort"
         class="rounded-br-lg transition-all h-[70px] w-[60px] place-self-end"
@@ -129,6 +143,7 @@ export default defineComponent({
 
     const isShort = computed(() => props.type === 'short');
     const isActionsAvailable = computed(() => memberStore.isStatementEditible(props.whichForm));
+    const isVisible = computed(() => dataStore.isSupport() || dataStore.isAdmin());
     const getMemberIIN = (each: Member) => {
       const iin = getMemberInfo(each).iin;
       if (dataStore.isFinCenter() && iin) {
@@ -145,6 +160,7 @@ export default defineComponent({
         birthDate: computed(() => (memberData && memberData.birthDate ? memberData.birthDate : null)).value,
         birthPlace: computed(() => (memberData && memberData.birthPlace.nameRu ? (memberData.birthPlace.nameRu as string).substring(0, 3) : null)).value,
         sectorCode: computed(() => (memberData && memberData.economySectorCode.ids ? (memberData.economySectorCode.ids as string).slice(-1) : null)).value,
+        id: computed(() => (memberData && memberData.id ? memberData.id : null)).value,
       };
     };
 
@@ -158,6 +174,7 @@ export default defineComponent({
 
       // Computed
       isShort,
+      isVisible,
       isActionsAvailable,
 
       // Functions

package/components/Form/FormData.vue

@@ -30,7 +30,11 @@
             <v-col v-if="row.every((i: any) => !i)" :class="[$styles.textSimple, $styles.blueText]">{{
               block.noValueText ?? $appContextStore.t('clients.necessaryFillForm')
             }}</v-col>
-            <v-col v-else v-for="each of row.filter((_: any, i: number) => ($display().lgAndUp.value ? true : block.labels[i].hideOnMobile === false))" :key="each">
+            <v-col
+              v-else
+              v-for="each of row.filter((_: any, i: number) => ($display().lgAndUp.value ? true : block.labels[i].hideOnMobile === false) && block.labels[i].visible)"
+              :key="each"
+            >
               <p :class="[$styles.textSimple]">
                 {{ each }}
               </p>
@@ -78,7 +82,7 @@ export default defineComponent({
   },
   setup(props) {
     const display = useDisplayInfo();
-    const visibleLabels = computed(() => (display.lgAndUp.value ? props.block.labels : props.block.labels.filter(i => i.hideOnMobile === false)));
+    const visibleLabels = computed(() => (display.lgAndUp.value ? props.block.labels : props.block.labels.filter(i => i.hideOnMobile === false)).filter(j => j.visible));
 
     const hasBlockData = (data: ComputedRefWithControl<any> | string[][]) => {
       if (data) {

package/components/Input/FormInput.vue

@@ -1,6 +1,7 @@
 <template>
   <v-text-field
     class="form-input"
+    :class="{ 'show-hint': !!hint && isFocused }"
     :model-value="modelValue"
     v-maska="maska"
     :rules="rules"
@@ -21,6 +22,7 @@
     :prepend-inner-icon="prependInnerIcon ? prependInnerIcon : ''"
     :bg-color="bgColor ? bgColor : ''"
     :suffix="suffix"
+    :prefix="prefix"
     @input="$emit('input', $event)"
     @keyup.enter.prevent="submitted"
     @click:append="!props.readonly && $emit('append-out')"
@@ -28,6 +30,8 @@
     @click:prepend-inner="!props.readonly && $emit('prepend')"
     @click:clear="!props.readonly && $emit('on-clear')"
     @update:modelValue="$emit('update:modelValue', $event)"
+    @focus="isFocused = true"
+    @blur="isFocused = false"
   >
     <template v-if="appendInnerIcon && appendInnerIcon.length" v-slot:append-inner>
       <v-icon
@@ -88,11 +92,15 @@ export default defineComponent({
       type: String,
       default: '',
     },
+    prefix: {
+      type: String,
+      default: '',
+    },
     messages: {
       type: [String, Array<string>],
     },
     maska: {
-      type: String,
+      type: [String, Object],
       default: '',
     },
     hint: {
@@ -152,9 +160,11 @@ export default defineComponent({
     const submitted = (event: any) => {
       emit('submitted', event);
     };
+    const isFocused = ref(false);
     return {
       props,
       submitted,
+      isFocused,
     };
   },
 });
@@ -189,7 +199,8 @@ export default defineComponent({
 .form-input.v-input--error {
   border-color: #ff5449;
 }
-.form-input.v-input--error .v-input__details {
+.form-input.v-input--error .v-input__details,
+.form-input.show-hint .v-input__details {
   display: block;
 }
 .form-input .v-input__details {
@@ -204,4 +215,11 @@ export default defineComponent({
   padding-top: 30px;
   font-size: 16px !important;
 }
+.v-text-field--prefixed.v-text-field .v-field__input {
+  padding-left: 0.5px;
+}
+.v-text-field__prefix__text {
+  color: #000000 !important;
+  font-size: 16px !important;
+}
 </style>

package/components/Input/PanelInput.vue

@@ -141,3 +141,17 @@ export default defineComponent({
   },
 });
 </script>
+
+<style>
+.form-input .v-field.v-field--appended {
+  padding-right: 0px !important;
+}
+@media (max-width: 640px) {
+  .form-input .v-field__input {
+    padding-right: 10px;
+  }
+  .form-input .v-field-label {
+    max-width: 95% !important;
+  }
+}
+</style>

package/components/Layout/SettingsPanel.vue

@@ -5,10 +5,15 @@
       Шрифт
       <v-btn size="x-small" icon="mdi-plus" color="#A0B3D8" class="text-white" variant="flat" @click="handleFontSize('increase')" />
     </base-panel-item>
+    <base-panel-item>
+      <v-btn size="small" :color="locale.currentLocale.value === 'ru' ? '#A0B3D8' : '#E0E0E0'" class="text-white" variant="flat" @click="handleLocaleChange('ru')"> РУС </v-btn>
+      Язык / Тіл
+      <v-btn size="small" :color="locale.currentLocale.value === 'kz' ? '#A0B3D8' : '#E0E0E0'" class="text-white" variant="flat" @click="handleLocaleChange('kz')"> ҚАЗ </v-btn>
+    </base-panel-item>
     <base-panel-item>
       <v-text-field v-model="$dataStore.user.fullName" :readonly="true" hide-details variant="plain" :label="$dataStore.user.roles?.join(', ')" />
-      <i class="mdi mdi-account-outline text-2xl text-[#A0B3D8]"></i
-    ></base-panel-item>
+      <i class="mdi mdi-account-outline text-2xl text-[#A0B3D8]"> </i>
+    </base-panel-item>
     <base-panel-item
       v-if="authStore.accessToken && (($appContextStore.isEFO && $dataStore.hasAccess().toLKA) || ($appContextStore.isAULETTI && $dataStore.hasAccess().toLKA_A))"
       @click="changeBridge('lka', authStore.accessToken)"
@@ -65,8 +70,8 @@
 
 <script lang="ts" setup>
 import { changeBridge } from '#imports';
-
 import packageJson from '../../package.json';
+
 const dialogSignOut = ref(false);
 const dataStore = useDataStore();
 const authStore = useAuthStore();
@@ -74,6 +79,7 @@ const appContextStore = useAppContextStore();
 const router = useRouter();
 const commitVersion = String(import.meta.env.VITE_COMMIT_VERSION ?? '');
 const pkg = packageJson as { version: string };
+const locale = useLocale();
 
 const handleFontSize = (action: 'increase' | 'decrease') => {
   if (action === 'increase' && dataStore.fontSize < 24) dataStore.fontSize += 2;
@@ -85,6 +91,17 @@ const handleFontSize = (action: 'increase' | 'decrease') => {
   }
 };
 
+const handleLocaleChange = (newLocale: 'ru' | 'kz') => {
+  if (locale.currentLocale.value !== newLocale) {
+    locale.setLocale(newLocale);
+    if (appContextStore.isBridge) {
+      window.location.reload();
+    } else {
+      dataStore.sendToParent(constants.postActions.locale, newLocale);
+    }
+  }
+};
+
 const logoutUser = async () => {
   dialogSignOut.value = false;
   await authStore.logoutUser();

package/components/Pages/MemberForm.vue

@@ -48,8 +48,11 @@
       <base-form-section
         v-if="$dataStore.hasPersonalDataSection(whichForm)"
         :title="$appContextStore.t('form.personalData')"
-        :class="[memberSetting && memberSetting.has === true && memberSetting.isMultiple === true ? 'rounded-t-0 !mt-[-5px]' : 'mt-[14px]']"
+        :class="[memberSetting && memberSetting.has === true && memberSetting.isMultiple === true ? 'rounded-t-0 !mt-[-5px]' : 'mt-[14px]', 'position-relative']"
       >
+        <p :class="[$styles.textSimple]" class="mb-[2px] md:absolute md:top-[18px]" v-if="!!member.id && ($dataStore.isSupport() || $dataStore.isAdmin())">
+          <span :class="[$styles.greyText]">ManId:</span> {{ member.id }}
+        </p>
         <base-panel-input
           v-if="$appContextStore.isLifetrip || $appContextStore.isPension"
           v-model="member.signOfResidency"
@@ -2298,10 +2301,15 @@ export default {
           if (digitalDocumentOwnerType.value === 'child' && selectedChild.value && responseData) {
             const { firstName, lastName, birthDate } = selectedChild.value;
 
+            const norm = (s?: string) => s?.trim().toLowerCase() ?? '';
+            const normalizeDate = (d?: string) => d?.slice(0, 10) ?? '';
+
+            const firstNameMatch = norm(firstName) === norm(responseData.firstName);
+            const lastNameMatch = norm(lastName) === norm(responseData.lastName);
             const birthDateMatch =
-              birthDate && responseData.birthDate ? new Date(birthDate).toISOString().split('T')[0] === new Date(responseData.birthDate).toISOString().split('T')[0] : true;
+              normalizeDate(birthDate) !== '' && normalizeDate(responseData.birthDate) !== '' && normalizeDate(birthDate) === normalizeDate(responseData.birthDate);
 
-            if (firstName !== responseData.firstName || lastName !== responseData.lastName || !birthDateMatch) {
+            if (!firstNameMatch || !lastNameMatch || !birthDateMatch) {
               showToaster('error', `Выбранный ребёнок (${lastName} ${firstName}) и полученные данные (${responseData.lastName} ${responseData.firstName}) не совпадают.`);
               return;
             }
@@ -2314,6 +2322,8 @@ export default {
             }
           }
 
+          if (responseData.iin) member.value.iin = reformatIin(responseData.iin);
+
           await memberStore.getContragent(member.value, false, false);
 
           if (responseData.firstName && responseData.lastName) {

package/components/Pages/ProductConditions.vue

@@ -526,11 +526,20 @@
                 >до {{ transferMaxDate }} включительно</span
               >
             </div>
-            <base-form-input v-model="contract.transferContractNumber" :label="$appContextStore.t('pension.globalId')" :readonly="isDisabled" :clearable="!isDisabled" />
+            <base-form-input
+              v-model="contract.transferContractNumber"
+              :label="$appContextStore.t('pension.globalId')"
+              :readonly="isDisabled"
+              :clearable="!isDisabled"
+              :rules="[$dataStore.rules.globalId(contract)]"
+              :hint="$appContextStore.t('pension.globalIdHint')"
+              :prefix="globalIdPrefix(contract)"
+              :maska="globalIdMaska(contract)"
+            />
             <base-form-input
               v-model="contract.transferContractRegNumber"
               :label="$appContextStore.t('pension.transferRegNumber')"
-              :rules="$rules.required"
+              :rules="!contract.transferContractNumber ? $rules.required : []"
               :readonly="isDisabled"
               :clearable="!isDisabled"
             />
@@ -852,7 +861,7 @@
             v-model="additionalTerms[index]"
             :value="locale === 'ru' ? term.coverSumName : term.coverSumNameKz"
             :readonly="isTermsDisabled"
-            :clearable="!isTermsDisabled"
+            :clearable="false"
             :label="coverTypeName(term)"
             append-inner-icon="mdi mdi-chevron-right"
             :suffix="
@@ -1068,7 +1077,7 @@
 </template>
 
 <script lang="ts">
-import { Member, Value, CountryValue, CalculatorForm, TransferContract, DocumentItem } from '../../composables/classes';
+import { Member, Value, CountryValue, CalculatorForm, TransferContract, DocumentItem, TransferContractCompany } from '../../composables/classes';
 import type { Projects, AddCover, AddCoverAnswer, FileActions } from '../../types';
 import { useI18n } from 'vue-i18n';
 import { getNumber, parseAmount } from '../../composables';
@@ -1650,7 +1659,7 @@ export default defineComponent({
     const totalInsPremium = computed(() => getNumberWithSpaces(formatSpacedNumber(formStore.pensionApp?.amount) + formatSpacedNumber(formStore.pensionApp.slave?.amount)));
 
     const isCompulsoryProfContractAmount = computed(() => {
-      return Number(cleanWhiteSpace(pensionForm.value.compulsoryProfContractAmount)) > 0;
+      return formatSpacedNumber(pensionForm.value.compulsoryProfContractAmount) > 0;
     });
 
     const transferContractsHasOppv = computed(() => {
@@ -1706,7 +1715,7 @@ export default defineComponent({
       }
     };
 
-    const pickPanelValue = async (item: Value) => {
+    const pickPanelValue = async (item: Value | TransferContractCompany) => {
       dataStore.rightPanel.open = false;
       isPanelOpen.value = false;
       isMultiplePanelOpen.value = false;
@@ -1719,7 +1728,7 @@ export default defineComponent({
         calculatorForm[currentPanel.value] = item.nameRu === null ? new Value() : item;
       } else if (whichProduct.value === 'pensionannuitynew') {
         if (currentPanel.value === 'transferContractCompany') {
-          transferContracts.value[contractIndex.value].transferContractCompany = item;
+          transferContracts.value[contractIndex.value].transferContractCompany = item as TransferContractCompany;
         } else {
           // @ts-ignore
           pensionForm.value[currentPanel.value] = item.nameRu === null ? new Value() : item;
@@ -1733,15 +1742,7 @@ export default defineComponent({
             if (defaultIndexRate) productConditionsForm.processIndexRate = defaultIndexRate;
           }
           if (whichProduct.value === 'bolashak') {
-            const termCover = additionalTerms.value?.findIndex(i => i.coverTypeCode === 10);
-            if (termCover !== -1) {
-              const termList = await formStore.getAdditionalInsuranceTermsAnswers(additionalTerms.value[termCover].coverTypeId);
-              const defaultTermValue = termList?.find(i => i.isDefault === true);
-              if (defaultTermValue) {
-                additionalTerms.value[termCover].coverSumId = String(defaultTermValue.id);
-                additionalTerms.value[termCover].coverSumName = String(defaultTermValue.nameRu);
-              }
-            }
+            await setDefaultForPolicyholderDeathTerm();
           }
         }
       }
@@ -1792,13 +1793,25 @@ export default defineComponent({
 
       if (whichProduct.value === 'lifebusiness' || whichProduct.value === 'gns') {
         if (termValue.value && item.code === 'fixedinssum') {
-          if (termValue.value.coverTypeCode === 11 || termValue.value.coverTypeCode === 4) {
-            subPanelList.value = constants.fixInsAmount.slice(0, 5);
-          } else if (termValue.value.coverTypeCode !== 19) {
-            subPanelList.value = constants.fixInsAmount.slice(0, 10);
+          const amounts = constants.fixInsAmount as Record<string, any>;
+          const code = termValue.value.coverTypeCode;
+          let baseList = [];
+
+          //11 и 20 - Госпитализация Застрахованного в результате несчастного случая
+          //4 - Получение Застрахованным телесной травмы в результате несчастного случая
+          //19 - CI- авансовая выплата в части основной выплаты
+          if (code === 4) {
+            baseList = [500000, 1000000, 1500000, 2000000, 2500000].map(k => amounts[k]);
+          } else if ((code === 20 || code === 11) && whichProduct.value === 'gns') {
+            baseList = [300000, 500000, 1000000, 1500000, 2000000, 2500000, 3000000, 3500000, 4000000, 4500000, 5000000].map(k => amounts[k]);
+          } else if (code === 19) {
+            baseList = Object.values(amounts).filter(a => a.code !== '300000');
           } else {
-            subPanelList.value = constants.fixInsAmount;
+            baseList = [500000, 1000000, 1500000, 2000000, 2500000, 3000000, 3500000, 4000000, 4500000, 5000000].map(k => amounts[k]);
           }
+
+          subPanelList.value = baseList;
+
           subTermValue.value = String(termValue.value.amount);
         } else {
           additionalTerms.value[currentIndex.value].amount = 0;
@@ -2151,12 +2164,17 @@ export default defineComponent({
               : formatDate(i.transferContractFirstPaymentDate)?.toISOString() ?? '',
             // @ts-ignore
             transferContractCompany:
-              typeof i.transferContractCompany !== 'string' && 'nameRu' in i.transferContractCompany ? i.transferContractCompany.nameRu : i.transferContractCompany,
+              i.transferContractCompany && typeof i.transferContractCompany !== 'string' && 'nameRu' in i.transferContractCompany
+                ? i.transferContractCompany.nameRu
+                : i.transferContractCompany,
             transferContractCompanyId:
-              // @ts-ignore
-              typeof i.transferContractCompany !== 'string' && 'ids' in i.transferContractCompany ? i.transferContractCompany.ids : i.transferContractCompanyId,
+              i.transferContractCompany && typeof i.transferContractCompany !== 'string' && 'ids' in i.transferContractCompany
+                ? i.transferContractCompany.ids
+                // @ts-ignore
+                : i.transferContractCompanyId,
             id: i.id ?? null,
             transferContractAmount: String(i.transferContractAmount).replace(/\s/g, ''),
+            transferContractNumber: getFullGlobalId(i),
           });
         });
       }
@@ -2189,6 +2207,11 @@ export default defineComponent({
       return needFile;
     };
 
+    const syncNullableNumberPair = (source: unknown, target: unknown) => {
+      if (source === null || source === undefined || source === '') return null;
+      return Number(target ?? 0);
+    };
+
     const submitForm = async () => {
       if (whichProduct.value === 'pensionannuitynew') {
         const needsEnpfNoteFile = doesNeedEnpfNoteFile();
@@ -2243,7 +2266,7 @@ export default defineComponent({
                 }
               });
             }
-            if (!pensionForm.value.compulsoryProfContractAmount) pensionForm.value.compulsoryProfMonthCount = 0;
+            // if (!isCompulsoryProfContractAmount.value && !transferContractsHasOppv.value) pensionForm.value.compulsoryProfMonthCount = null;
             const pensionData = {
               ...pensionForm.value,
               ...{
@@ -2251,6 +2274,7 @@ export default defineComponent({
                 voluntaryContractAmount: formatSpacedNumber(pensionForm.value.voluntaryContractAmount),
                 ownFundsRaisAmount: formatSpacedNumber(pensionForm.value.ownFundsRaisAmount),
                 compulsoryProfContractAmount: formatSpacedNumber(pensionForm.value.compulsoryProfContractAmount),
+                compulsoryProfMonthCount: syncNullableNumberPair(formatSpacedNumber(pensionForm.value.compulsoryProfContractAmount), pensionForm.value.compulsoryProfMonthCount),
                 transferContractAmount: formatSpacedNumber(pensionForm.value.transferContractAmount),
                 transferContractCompany: pensionForm.value?.transferContractCompany?.nameRu ?? '',
               },
@@ -2267,6 +2291,7 @@ export default defineComponent({
                   voluntaryContractAmount: formatSpacedNumber(formStore.pensionApp?.voluntaryContractAmount),
                   ownFundsRaisAmount: formatSpacedNumber(formStore.pensionApp?.ownFundsRaisAmount),
                   compulsoryProfContractAmount: formatSpacedNumber(formStore.pensionApp?.compulsoryProfContractAmount),
+                  compulsoryProfMonthCount: syncNullableNumberPair(formatSpacedNumber(formStore.pensionApp?.compulsoryProfContractAmount), formStore.pensionApp?.compulsoryProfMonthCount),
                   transferContractAmount: formatSpacedNumber(formStore.pensionApp?.transferContractAmount),
                   transferContractCompany: pensionForm.value?.transferContractCompany?.nameRu ?? '',
                 }
@@ -2282,6 +2307,7 @@ export default defineComponent({
                         voluntaryContractAmount: formatSpacedNumber(formStore.pensionApp?.slave?.voluntaryContractAmount),
                         ownFundsRaisAmount: formatSpacedNumber(formStore.pensionApp?.slave?.ownFundsRaisAmount),
                         compulsoryProfContractAmount: formatSpacedNumber(formStore.pensionApp?.slave?.compulsoryProfContractAmount),
+                        compulsoryProfMonthCount: syncNullableNumberPair(formatSpacedNumber(formStore.pensionApp?.slave?.compulsoryProfContractAmount), formStore.pensionApp?.slave?.compulsoryProfMonthCount),
                         transferContractAmount: formatSpacedNumber(formStore.pensionApp?.slave?.transferContractAmount),
                         transferContractCompany: pensionForm.value?.transferContractCompany?.nameRu ?? '',
                       }
@@ -2409,6 +2435,9 @@ export default defineComponent({
                 additionalTerms.value = formStore.additionalInsuranceTerms;
               }
             }
+            if (whichProduct.value === 'bolashak') {
+              await trySetDefaultPolicyholderDeathTerm();
+            }
             isCalculating.value = true;
             if (props.isCalculator) {
               //@ts-ignore
@@ -2545,6 +2574,64 @@ export default defineComponent({
         await dataStore.getSignedDocList(formStore.applicationData.processInstanceId, formStore.applicationData.slave?.processInstanceId);
       }
     };
+    const globalIdMaska = (contract: TransferContract) => {
+      const asbId = String(contract.transferContractCompany?.asbId ?? '');
+      const remainingDigitsCount = Math.max(constants.globalIdFirstDigitsCount - asbId.length, 0);
+
+      const maskaDigits = '#'.repeat(remainingDigitsCount);
+
+      return {
+        mask: `${maskaDigits}XX######A`,
+        tokens: {
+          X: { pattern: /[A-Z0-9]/ },
+        },
+      };
+    };
+    const globalIdPrefix = (contract: TransferContract) => {
+      const asbId = contract.transferContractCompany?.asbId;
+
+      if (asbId !== undefined && asbId !== null) {
+        return String(asbId);
+      }
+      return '';
+    };
+    const getFullGlobalId = (contract: any) => {
+      if (contract.transferContractNumber) {
+        const asbId = String(contract.transferContractCompany?.asbId ?? '');
+        return asbId + contract.transferContractNumber;
+      }
+      return null;
+    };
+    const findTransferContractCompany = (companyId: string | number | null) => {
+      return dictionariesStore.transferContractCompanies.find(i => i.ids === companyId) ?? null;
+    };
+    const normalizeTransferContractNumber = (number: string | null, company: TransferContractCompany | null) => {
+      if (!number) return null;
+
+      const asbId = String(company?.asbId ?? '');
+
+      return asbId && number.startsWith(asbId) ? number.slice(asbId.length) : number;
+    };
+    const trySetDefaultPolicyholderDeathTerm = async () => {
+      const isSinglePeriod = productConditionsForm.paymentPeriod?.code === 'single';
+      const policyholderIsInsured = formStore.insuredForm.find((member: Member) => member.iin === formStore.policyholderForm.iin);
+
+      if (policyholderIsInsured && isSinglePeriod) {
+        await setDefaultForPolicyholderDeathTerm();
+      }
+    };
+    const setDefaultForPolicyholderDeathTerm = async () => {
+      //coverTypeCode === 10 - Страхование на случай смерти Страхователя
+      const termCover = additionalTerms.value?.findIndex(i => i.coverTypeCode === 10);
+      if (termCover !== -1) {
+        const termList = await formStore.getAdditionalInsuranceTermsAnswers(additionalTerms.value[termCover].coverTypeId);
+        const defaultTermValue = termList?.find(i => i.isDefault === true);
+        if (defaultTermValue) {
+          additionalTerms.value[termCover].coverSumId = String(defaultTermValue.id);
+          additionalTerms.value[termCover].coverSumName = String(defaultTermValue.nameRu);
+        }
+      }
+    };
 
     onMounted(async () => {
       try {
@@ -2594,7 +2681,7 @@ export default defineComponent({
         if (!!productConditionsForm.insurancePremiumPerMonth) {
           whichSum.value = 'insurancePremiumPerMonth';
         }
-        if (whichProduct.value === 'lifebusiness') {
+        if (whichProduct.value === 'lifebusiness' || whichProduct.value === 'gns') {
           whichSum.value = 'requestedSumInsured';
         }
         if (whichProduct.value === 'lifebusiness' || whichProduct.value === 'gns') {
@@ -2645,14 +2732,17 @@ export default defineComponent({
           }
           if (!transferContracts.value.length && pensionForm.value.transferContracts && pensionForm.value.transferContracts.length) {
             pensionForm.value.transferContracts.forEach((contract: TransferContract) => {
+              const transferContractCompany =
+                typeof contract.transferContractCompany === 'string' ? findTransferContractCompany(contract.transferContractCompanyId) : contract.transferContractCompany;
+
               transferContracts.value.push({
                 ...contract,
                 transferContractDate: constants.regex.isoDate.test(contract.transferContractDate) ? reformatDate(contract.transferContractDate)! : contract.transferContractDate,
                 transferContractFirstPaymentDate: constants.regex.isoDate.test(contract.transferContractFirstPaymentDate)
                   ? reformatDate(contract.transferContractFirstPaymentDate)!
                   : contract.transferContractFirstPaymentDate,
-                transferContractCompany:
-                  typeof contract.transferContractCompany === 'string' ? ({ nameRu: contract.transferContractCompany } as any) : contract.transferContractCompany,
+                transferContractCompany: transferContractCompany,
+                transferContractNumber: normalizeTransferContractNumber(contract.transferContractNumber, transferContractCompany),
                 transferContractAmount: getNumberWithSpaces(contract.transferContractAmount) ?? '',
               });
             });
@@ -3042,6 +3132,8 @@ export default defineComponent({
       openFileActionsPanel,
       removeTransferContract,
       checkTransferContractDate,
+      globalIdMaska,
+      globalIdPrefix,
     };
   },
 });