hl-core 0.0.10-beta.81 → 0.0.10-beta.83

package/api/base.api.ts

@@ -1227,6 +1227,14 @@ export class ApiClass {
         params: { processInstanceId },
       });
     },
+    checkContractDsPension: async (processInstanceId: string | number) => {
+      return await this.axiosCall<Types.CheckContractDsPensionResponse>({
+        method: Methods.GET,
+        baseURL: getStrValuePerEnv('efoBaseApi'),
+        url: `${this.pensionannuityNew.base}/SetContractDsPensionAsync`,
+        params: { processInstanceId },
+      });
+    },
   };
 
   externalServices = {

package/api/interceptors.ts

@@ -1,4 +1,23 @@
 import { AxiosError, type AxiosInstance, type InternalAxiosRequestConfig, isAxiosError } from 'axios';
+
+const INTERCEPTOR_HANDLED_STATUSES = new Set([401, 403, 404, 413, 500]);
+
+function markErrorAsHandled(err: unknown, status?: number): void {
+  if (typeof status === 'number' && !INTERCEPTOR_HANDLED_STATUSES.has(status)) return;
+
+  const axiosError = err as { config?: Record<string, unknown>; handledByInterceptor?: boolean; handledStatus?: number };
+  axiosError.handledByInterceptor = true;
+  if (typeof status === 'number') {
+    axiosError.handledStatus = status;
+  }
+
+  if (axiosError.config) {
+    axiosError.config.handledByInterceptor = true;
+    if (typeof status === 'number') {
+      axiosError.config.handledStatus = status;
+    }
+  }
+}
 /**
  * Обновляет baseURL в зависимости от текущего хоста
  */
@@ -118,6 +137,7 @@ export default function setupInterceptors(axios: AxiosInstance): void {
 
       // 1) Не-Axios ошибка (например, thrown Error)
       if (!isAxiosError(err)) {
+        markErrorAsHandled(err);
         showToaster('error', appContextStore.t('toaster.unknownError'), 5000);
         return Promise.reject(err);
       }
@@ -126,6 +146,7 @@ export default function setupInterceptors(axios: AxiosInstance): void {
 
       // 2) Нет ответа вообще (timeout, сеть, CORS)
       if (!response) {
+        markErrorAsHandled(err);
         const isTimeout = code === 'ECONNABORTED' || /timeout/i.test(String(message));
         showToaster('error', isTimeout ? appContextStore.t('toaster.timeout') : appContextStore.t('toaster.networkError'), 5000);
         return Promise.reject(err);
@@ -137,12 +158,14 @@ export default function setupInterceptors(axios: AxiosInstance): void {
 
       // 3) 401 — простая обработка, показываем ошибку
       if (status === 401) {
+        markErrorAsHandled(err, status);
         showToaster('error', appContextStore.t('error.401'), 5000);
         return Promise.reject(err);
       }
 
       // 4) 403 — вытаскиваем только path без query/hash
       if (status === 403) {
+        markErrorAsHandled(err, status);
         try {
           const rawUrl = response.config?.url ?? '';
           const urlObj = new URL(rawUrl, window.location.origin);
@@ -157,18 +180,21 @@ export default function setupInterceptors(axios: AxiosInstance): void {
 
       // 5) 404
       if (status === 404 && !isSilent) {
+        markErrorAsHandled(err, status);
         showToaster('error', appContextStore.t('error.404'), 5000);
         return Promise.reject(err);
       }
 
       // 6) 413
       if (status === 413) {
+        markErrorAsHandled(err, status);
         showToaster('error', appContextStore.t('error.exceedUploadLimitFile'), 5000);
         return Promise.reject(err);
       }
 
       // 7) 500 — явная обработка
       if (status === 500) {
+        markErrorAsHandled(err, status);
         const errorMessage = extractErrorMessage(data, status, appContextStore);
         showToaster('error', String(errorMessage), 5000);
         return Promise.reject(err);

package/components/Dialog/Dialog.vue

@@ -1,6 +1,16 @@
 <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]" :class="innerClass">
+      <v-btn
+        v-if="showCloseButton"
+        icon="mdi-close"
+        variant="text"
+        rounded="0"
+        :size="smAndDown ? 'small' : 'default'"
+        :ripple="false"
+        class="no-hover position-absolute right-0 top-0"
+        @click="$emit('update:modelValue', false)"
+      />
       <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">
@@ -79,8 +89,23 @@ export default defineComponent({
       type: String,
       default: '',
     },
+    showCloseButton: {
+      type: Boolean,
+      default: false,
+    },
   },
   emits: ['update:modelValue', 'yes', 'no'],
+  setup() {
+    const display = useDisplayInfo();
+
+    const smAndDown = computed(() => {
+      return display.smAndDown.value;
+    });
+
+    return {
+      smAndDown,
+    };
+  },
 });
 </script>
 <style>
@@ -90,6 +115,14 @@ export default defineComponent({
 .base-dialog .v-card-subtitle {
   font-size: 14px;
 }
+
+.no-hover:hover {
+  background: transparent !important;
+}
+
+.no-hover .v-btn__overlay {
+  opacity: 0 !important;
+}
 @media (max-width: 640px) {
   .base-dialog .v-card-title {
     margin-top: 10px;

package/components/Form/FormTextSection.vue

@@ -1,7 +1,7 @@
 <template>
   <div class="flex flex-col justify-between rounded-lg transition-all" :class="[$styles.whiteBg]">
-    <span v-if="title" class="p-4" :class="[titleClass ?? $styles.textTitle]">{{ title }}</span>
-    <span v-if="subtitle" class="p-4 text-[#99A3B3] border-t-[1px]" :class="[subtitleClass ?? $styles.textSimple]">{{ subtitle }}</span>
+    <span v-if="title" class="p-4 text-section-label" :class="[titleClass ?? $styles.textTitle]">{{ title }}</span>
+    <span v-if="subtitle" class="p-4 text-[#99A3B3] border-t-[1px] text-section-label" :class="[subtitleClass ?? $styles.textSimple]">{{ subtitle }}</span>
     <slot></slot>
   </div>
 </template>

package/components/Layout/Header.vue

@@ -1,7 +1,16 @@
 <template>
   <header class="relative w-full min-h-[70px] text-center font-medium align-middle flex items-center border-b-[1px]" :class="[$styles.blueBgLight, $styles.textSimple]">
     <i v-if="hasBack" @click="$emit('onBack')" class="absolute left-5 mdi text-xl cursor-pointer transition-all" :class="[backIcon, backIconAnim]"></i>
-    <span class="mx-10">{{ title }}</span>
+    <span class="mx-10">
+      <v-tooltip v-if="hasMore" :text="$dataStore.isSupport() ? `Нажатий: ${homeClickCount}` : ''" :disabled="!$dataStore.isSupport()">
+        <template #activator="{ props: tooltipProps }">
+          <v-btn v-bind="tooltipProps" variant="text" size="32" :ripple="false" class="absolute z-10" @click="onHomeClick" @mouseenter="onHomeHover">
+            <img src="../../../efo/public/favicon.svg" class="w-6 h-6" alt="home" />
+          </v-btn>
+        </template>
+      </v-tooltip>
+      {{ title }}
+    </span>
     <i
       v-if="hasInfo && infoItems && infoItems.length && infoItems.filter(i => (typeof i.show === 'boolean' ? i.show : true)).length"
       class="mdi text-xl cursor-pointer transition-all opacity-70"
@@ -65,6 +74,22 @@ export default defineComponent({
   setup(props) {
     const dataStore = useDataStore();
 
+    const homeClickCount = ref(0);
+    const COUNTER_URL = `${import.meta.env.VITE_COUNTER_URL ?? 'http://localhost:3001'}/counter`;
+
+    const onHomeClick = async () => {
+      // umTrackEvent('click-logo', {
+      //   user: dataStore.user.fullName,
+      //   branch: dataStore.user.branchCode,
+      // });
+    };
+
+    const onHomeHover = async () => {
+      if (!dataStore.isSupport()) return;
+      try {
+      } catch {}
+    };
+
     const onClickOutside = () => {
       dataStore.settings.open = false;
     };
@@ -97,7 +122,12 @@ export default defineComponent({
       backIconAnim,
       moreIconAnim,
 
+      // Counter
+      homeClickCount,
+
       // Functions
+      onHomeClick,
+      onHomeHover,
       onClickOutside,
     };
   },

package/components/Menu/MenuHover.vue

@@ -1,8 +1,8 @@
 <template>
   <v-menu v-if="items.length" :activator="activator" location="bottom center" :offset="top" transition="scale-transition">
     <base-form-text-section class="p-4 border-[1px] flex flex-col gap-3 elevation-3 w-[250px]">
-      <div v-for="item of items.filter(i => $dataStore.filters.show(i))" :key="item.id">
-        <base-menu-nav-item :class="[$styles.textSimple]" :menu-item="item" @click="$emit(item.id)" />
+      <div v-for="item of items.filter(i => $dataStore.filters.show(i))" :key="(item as any).id">
+        <base-menu-nav-item :class="[$styles.textSimple]" :menu-item="item" @click="$emit((item as any).id)" />
       </div>
     </base-form-text-section>
   </v-menu>

package/components/Pages/Anketa.vue

@@ -18,15 +18,25 @@
         :class="[$styles.blueBgLight, $styles.rounded]"
         class="mx-[10px] p-4 flex flex-col gap-4"
       >
-        <base-form-input
-          v-for="(question, index) in firstQuestionList.filter(i => i.first.definedAnswers === 'N')"
-          :key="index"
-          v-model="question.first.answerText"
-          :label="question.first.name"
-          :maska="$maska.threeDigit"
-          :readonly="formStore.isDisabled[whichSurvey] || !$dataStore.isTask()"
-          :rules="$rules.required"
-        />
+        <div v-for="(question, index) in firstQuestionList.filter(i => i.first.definedAnswers === 'N')" :key="index">
+          <base-form-input
+            v-if="question.first.answerType === 'N'"
+            v-model="question.first.answerText"
+            :label="getQuestionLabel(question)"
+            :maska="$maska.threeDigit"
+            :readonly="formStore.isDisabled[whichSurvey] || !$dataStore.isTask()"
+            :rules="$rules.required"
+          />
+          <base-form-input
+            v-if="question.first.answerType === 'T'"
+            v-model="question.first.answerText"
+            :label="getQuestionLabel(question)"
+            :readonly="formStore.isDisabled[whichSurvey] || !$dataStore.isTask()"
+            :rules="$rules.required"
+            @input="question.first.answerText = formatPressure($event)"
+            placeholder="###/##"
+          />
+        </div>
       </section>
       <section
         v-if="surveyType === 'critical' && ($appContextStore.isBaiterek || $appContextStore.isMycar || $appContextStore.isBolashak || $appContextStore.isLiferenta)"
@@ -170,7 +180,7 @@
       ref="vSecondaryForm"
       @submit="submitSecondaryForm"
     >
-      <base-form-text-section v-for="question in currentQuestion.second" :title="question.name" :key="question.name">
+      <base-form-text-section class="text-section" v-for="question in currentQuestion.second" :title="question.name" :key="question.name">
         <div v-if="question.definedAnswers === 'N'">
           <base-form-input
             v-if="question.answerType === 'T' || question.answerType === 'N'"
@@ -311,6 +321,53 @@ export default defineComponent({
     const firstQuestions = computed(() =>
       filterType.value !== null ? firstQuestionList.value.filter(i => i.first.answerName?.includes(filterType.value === 'Иә/Да' ? 'Да' : 'Нет')) : firstQuestionList.value,
     );
+
+    function formatPressure(event: any) {
+      const raw = event.target.value;
+      const isDeleting = event.inputType?.startsWith('delete');
+
+      let cleaned = raw.replace(/[^\d/]/g, '');
+
+      if ((cleaned.match(/\//g) || []).length > 1) {
+        const idx = cleaned.indexOf('/');
+        const noSlash = cleaned.replace(/\//g, '');
+        cleaned = noSlash.slice(0, idx) + '/' + noSlash.slice(idx);
+      }
+
+      const hasSlash = cleaned.includes('/');
+
+      if (hasSlash) {
+        const slashIdx = cleaned.indexOf('/');
+        const left = cleaned.slice(0, slashIdx);
+        const right = cleaned.slice(slashIdx + 1);
+
+        const leftPart = left.slice(0, 3);
+
+        if (leftPart.length < 2) {
+          return leftPart;
+        }
+
+        const maxRight = leftPart.length === 2 ? 2 : 3;
+        const rightPart = right.slice(0, maxRight);
+
+        return `${leftPart}/${rightPart}`;
+      }
+
+      if (cleaned.length > 3 && !isDeleting) {
+        const leftPart = cleaned.slice(0, 3);
+        const rightPart = cleaned.slice(3, 6);
+        return `${leftPart}/${rightPart}`;
+      }
+
+      const digits = cleaned.slice(0, 3);
+
+      if (digits.length === 3 && !isDeleting) {
+        return `${digits}/`;
+      }
+
+      return digits;
+    }
+
     const scrollForm = (direction: 'up' | 'down') => {
       const scrollObject = { top: direction === 'up' ? 0 : screen.height * 10, behavior: 'smooth' };
       if (firstPanel.value) {
@@ -320,6 +377,13 @@ export default defineComponent({
       }
     };
 
+    const getQuestionLabel = (question: AnketaBody) => {
+      if (question.first.unitOfMeasurement) {
+        return `${question.first.name} (${question.first.unitOfMeasurement})`;
+      }
+      return question.first.name;
+    };
+
     const submitForm = async () => {
       await vForm.value.validate().then(async (v: { valid: Boolean; errors: any }) => {
         if (v.valid) {
@@ -399,18 +463,23 @@ export default defineComponent({
           firstPanel.value = false;
           secondPanel.value = false;
         } else {
-          const errors = document.querySelector('.v-input--error');
-          if (errors) {
-            const errorText = errors.parentElement?.children[0].innerHTML;
-            if (errorText) {
-              showToaster('error', appContextStore.t('toaster.errorFormField', { text: errorText?.replace(/[-<>!//.]/g, '') }));
-            }
-            errors.scrollIntoView({
-              behavior: 'smooth',
-              block: 'center',
-              inline: 'nearest',
-            });
+          const errorElement = document.querySelector<HTMLElement>('.v-input--error');
+
+          if (!errorElement) {
+            return;
           }
+
+          const section = errorElement.closest<HTMLElement>('.text-section');
+          const label = section?.querySelector<HTMLElement>('.text-section-label');
+          const errorText = label?.textContent?.replace(/[-<>!/.]/g, '');
+
+          showToaster('error', errorText ? appContextStore.t('toaster.errorFormField', { text: errorText }) : 'Заполните все необходимые поля');
+
+          errorElement.scrollIntoView({
+            behavior: 'smooth',
+            block: 'center',
+            inline: 'nearest',
+          });
         }
       });
     };
@@ -564,6 +633,8 @@ export default defineComponent({
       openFirstPanel,
       openSecondPanel,
       closeSecondPanel,
+      getQuestionLabel,
+      formatPressure,
     };
   },
 });

package/components/Pages/ContragentForm.vue

@@ -1,6 +1,6 @@
 <template>
   <section v-show="showForm" class="flex flex-col gap-4 px-[10px]">
-    <v-form v-if="member" ref="vForm" @submit="submitForm" class="max-h-[75svh] overflow-y-scroll">
+    <v-form v-if="member" ref="vForm" @submit="submitForm">
       <base-form-section :title="$appContextStore.t('form.personalData')" class="mt-[14px]">
         <base-form-input
           v-model="member.phoneNumber"

package/components/Pages/Documents.vue

@@ -118,19 +118,27 @@
         <base-form-input v-model="formStore.contractDate" :label="$appContextStore.t('form.date')" :readonly="true" append-inner-icon="mdi mdi-calendar-blank-outline" />
         <base-file-input :readonly="isDisabled" @input.prevent="onFileChange($event)" />
       </base-content-block>
-      <base-content-block v-for="document of documentListFiltered" :key="document.id" :class="[$styles.textSimple]">
-        <h5 class="text-center font-medium mb-4">
-          {{ document.fileTypeName }}
-        </h5>
-        <div :class="[$styles.whiteBg, $styles.rounded]" class="p-2 h-12 flex items-center relative">
-          <span class="ml-2">{{ document.fileName }}</span>
-          <i
-            class="transition-all cursor-pointer mdi mdi-dots-vertical pl-2 mr-3 border-l-[1px] text-xl absolute right-0"
-            :class="[$styles.greenTextHover]"
-            @click="openPanel(document)"
-          ></i>
-        </div>
-      </base-content-block>
+      <template v-for="group of documentListGrouped" :key="group.name">
+        <base-content-block :class="[$styles.textSimple]">
+          <h5 class="text-center font-medium mb-4">{{ group.name }}</h5>
+          <div
+            v-for="document of group.items"
+            :key="document.id"
+            :class="[$styles.whiteBg, $styles.rounded]"
+            class="p-2 h-12 flex items-center relative mb-2 last:mb-0"
+          >
+            <div class="flex justify-between w-full items-center">
+              <span class="ml-2 block">{{ document.fileName }}</span>
+              <p class="mr-12">{{ reformatDateWithHours(document.createdDate!, true) }}</p>
+            </div>
+            <i
+              class="transition-all cursor-pointer mdi mdi-dots-vertical pl-2 mr-3 border-l-[1px] text-xl absolute right-0"
+              :class="[$styles.greenTextHover]"
+              @click="openPanel(document)"
+            ></i>
+          </div>
+        </base-content-block>
+      </template>
     </section>
     <section class="w-full px-[10px] pt-[14px]" v-if="$appContextStore.isPension && formStore.hasRepresentative">
       <base-form-section
@@ -281,7 +289,12 @@
               @click="getDoc('view')"
             />
           </base-animation>
-          <base-btn :disabled="documentLoading" :loading="documentLoading" :text="$appContextStore.t('download')" @click="getDoc('download', $dataStore.isSupport() ? downloadType : undefined)" />
+          <base-btn
+            :disabled="documentLoading"
+            :loading="documentLoading"
+            :text="$appContextStore.t('download')"
+            @click="getDoc('download', $dataStore.isSupport() ? downloadType : undefined)"
+          />
           <base-animation>
             <base-btn v-if="canDeleteFiles" :disabled="documentLoading" :loading="documentLoading" :text="$appContextStore.t('buttons.delete')" @click="deletionDialog = true" />
           </base-animation>
@@ -547,6 +560,15 @@ export default defineComponent({
     const beneficiaryFiltered = computed(() => formStore.beneficiaryForm.filter(i => i.iin !== formStore.policyholderForm.iin) as Base.Document.Digital[]);
     const slaveInsuredForm = computed(() => formStore.slaveInsuredForm as Base.Document.Digital);
     const documentListFiltered = computed(() => formStore.signedDocumentList.filter(i => !['1', '2', '3', '4'].includes(String(i.fileTypeCode))));
+    const documentListGrouped = computed(() => {
+      const groups = new Map<string, typeof documentListFiltered.value>();
+      for (const doc of documentListFiltered.value) {
+        const key = doc.fileTypeNameRu || 'Без категории';
+        if (!groups.has(key)) groups.set(key, []);
+        groups.get(key)!.push(doc);
+      }
+      return Array.from(groups.entries()).map(([name, items]) => ({ name, items }));
+    });
     const jointMembers = ref<Member[]>([formStore.insuredForm[0]]);
 
     const openPanel = async (document: DocumentItem) => {
@@ -968,6 +990,7 @@ export default defineComponent({
       beneficiaryFiltered,
       hasDigitalDocuments,
       documentListFiltered,
+      documentListGrouped,
       isDigitalDocDisabled,
       isUnderwriterDocuments,
 

package/components/Pages/MemberForm.vue

@@ -252,6 +252,7 @@
         </base-animation>
       </base-form-section>
       <base-form-section :title="$appContextStore.t('policyholdersRepresentative.PowerOfAttorney')" v-if="whichForm === formStore.policyholdersRepresentativeFormKey">
+        <h2 :class="[$styles.textTitle]" class="pt-[14px] pb-3 pl-4 font-medium text-[#071222]">{{ $appContextStore.t('policyholdersRepresentative.mainData') }}</h2>
         <base-form-input
           v-model.trim="member.fullNameRod"
           :label="$appContextStore.t('policyholdersRepresentative.NameParentCase')"
@@ -280,6 +281,7 @@
           :clearable="!isDisabled"
           :rules="$rules.required"
         />
+        <h2 :class="[$styles.textTitle]" class="pt-[14px] pb-3 pl-4 font-medium text-[#071222]">{{ $appContextStore.t('policyholdersRepresentative.doc') }}</h2>
         <base-form-input
           v-model.trim="member.confirmDocNumber"
           :label="$appContextStore.t('policyholdersRepresentative.numberDoc')"
@@ -289,7 +291,7 @@
         />
         <base-form-input
           v-model="member.confirmDocIssueDate"
-          :label="$appContextStore.t('form.documentDate')"
+          :label="$appContextStore.t('policyholdersRepresentative.issueDateDoc')"
           :readonly="isDisabled"
           :clearable="!isDisabled"
           :rules="$rules.date.concat($rules.checkPastOrToday)"
@@ -299,7 +301,7 @@
         />
         <base-form-input
           v-model="member.confirmDocExpireDate"
-          :label="$appContextStore.t('form.documentExpire')"
+          :label="$appContextStore.t('policyholdersRepresentative.expiryDateDoc')"
           :readonly="isDisabled"
           :clearable="!isDisabled"
           :rules="$rules.date.concat($rules.checkTodayOrFuture)"
@@ -307,25 +309,27 @@
           :min-date="getToday()"
           append-inner-icon="mdi mdi-calendar-blank-outline"
         />
+        <h2 :class="[$styles.textTitle]" class="pt-[14px] pb-3 pl-4 font-medium text-[#071222]">{{ $appContextStore.t('policyholdersRepresentative.visa') }}</h2>
         <base-form-input v-model.trim="member.migrationCard" :label="$appContextStore.t('policyholdersRepresentative.numberVisa')" />
         <base-form-input
           v-model="member.migrationCardIssueDate"
-          :label="$appContextStore.t('form.documentDate')"
+          :label="$appContextStore.t('policyholdersRepresentative.issueDateVisa')"
           :readonly="isDisabled"
           :clearable="!isDisabled"
-          :rules="$rules.date"
+          :rules="member.migrationCard ? $rules.required.concat($rules.date) : $rules.date"
           :maska="$maska.date"
           append-inner-icon="mdi mdi-calendar-blank-outline"
         />
         <base-form-input
           v-model="member.migrationCardExpireDate"
-          :label="$appContextStore.t('form.documentExpire')"
+          :label="$appContextStore.t('policyholdersRepresentative.expiryDateVisa')"
           :readonly="isDisabled"
           :clearable="!isDisabled"
-          :rules="$rules.date"
+          :rules="member.migrationCard ? $rules.required.concat($rules.date) : $rules.date"
           :maska="$maska.date"
           append-inner-icon="mdi mdi-calendar-blank-outline"
         />
+        <h2 :class="[$styles.textTitle]" class="pt-[14px] pb-3 pl-4 font-medium text-[#071222]">{{ $appContextStore.t('policyholdersRepresentative.notary') }}</h2>
         <base-form-toggle
           v-model="formStore.policyholdersRepresentativeForm.isNotary"
           :disabled="isDisabled"
@@ -2267,6 +2271,17 @@ export default {
       }
     };
 
+    const norm = (s?: string) => s?.trim().toLowerCase().replace(/ё/g, 'е').replace(/\s+/g, ' ') ?? '';
+
+    const normalizeDate = (d?: string) => d?.slice(0, 10) ?? '';
+
+    const containsAllWords = (source: string, target: string) => {
+      const sourceWords = source.split(' ');
+      const targetWords = target.split(' ');
+
+      return targetWords.every(w => sourceWords.includes(w));
+    };
+
     const getDigitalDocument = async (otpCode: string) => {
       if (!digitalDocumentOwnerType.value) return;
       let iin = '';
@@ -2301,15 +2316,23 @@ 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 first = norm(firstName);
+            const last = norm(lastName);
+
+            const respFirst = norm(responseData.firstName);
+            const respLast = norm(responseData.lastName);
+            const respFull = norm(responseData.fullName);
 
-            const firstNameMatch = norm(firstName) === norm(responseData.firstName);
-            const lastNameMatch = norm(lastName) === norm(responseData.lastName);
             const birthDateMatch =
               normalizeDate(birthDate) !== '' && normalizeDate(responseData.birthDate) !== '' && normalizeDate(birthDate) === normalizeDate(responseData.birthDate);
 
-            if (!firstNameMatch || !lastNameMatch || !birthDateMatch) {
+            const strictMatch = first === respFirst && last === respLast;
+
+            const fullNameMatch = containsAllWords(respFull, `${first} ${last}`);
+
+            const nameMatch = strictMatch || fullNameMatch;
+
+            if (!nameMatch) {
               let message;
               if (currentLocale.value === 'kz') {
                 message = `Таңдалған бала (${lastName} ${firstName}) мен алынған деректер (${responseData.lastName} ${responseData.firstName}) өзара сәйкес келмейді.`;
@@ -2319,6 +2342,9 @@ export default {
               showToaster('error', message);
               return;
             }
+            if (!birthDateMatch) {
+              showToaster('warning', 'Проверьте дату рождения');
+            }
           }
 
           if (appContextStore.isLifetrip) {
@@ -2336,8 +2362,13 @@ export default {
             member.value.chooseChild = `${responseData.lastName} ${responseData.firstName} ${responseData.middleName ? responseData.middleName : ''}`;
           }
           if (responseData.iin) member.value.iin = reformatIin(responseData.iin);
-          if (responseData.firstName) member.value.firstName = responseData.firstName;
-          if (responseData.lastName) member.value.lastName = responseData.lastName;
+          if (digitalDocumentOwnerType.value === 'child' && selectedChild.value) {
+            if (selectedChild.value.firstName) member.value.firstName = selectedChild.value.firstName;
+            if (selectedChild.value.lastName) member.value.lastName = selectedChild.value.lastName;
+          } else {
+            if (responseData.firstName) member.value.firstName = responseData.firstName;
+            if (responseData.lastName) member.value.lastName = responseData.lastName;
+          }
           if (responseData.firstNameLatin && appContextStore.isLifetrip) member.value.firstNameLat = responseData.firstNameLatin;
           if (responseData.lastNameLatin && appContextStore.isLifetrip) member.value.lastNameLat = responseData.lastNameLatin;
           if (responseData.middleName) member.value.middleName = responseData.middleName;