hl-core 0.0.10-beta.71 → 0.0.10-beta.72

package/api/base.api.ts

@@ -467,13 +467,6 @@ export class ApiClass {
     });
   }
 
-  async getCalculation(id: string) {
-    return await this.axiosCall<number>({
-      method: Methods.POST,
-      url: `/${this.productUrl}/api/Application/Calculator?processInstanceId=${id}`,
-    });
-  }
-
   async setApplication(data: Types.SetApplicationRequest) {
     return await this.axiosCall<void>({
       method: Methods.POST,
@@ -804,14 +797,6 @@ export class ApiClass {
     });
   }
 
-  async getCalculator(data: Types.SetApplicationRequest) {
-    return await this.axiosCall<number>({
-      method: Methods.POST,
-      url: `/${this.productUrl}/api/Application/Calculator`,
-      data: data,
-    });
-  }
-
   async saveClient(processInstanceId: string | number, clientId: string | null, data: any) {
     return await this.axiosCall({
       method: Methods.POST,
@@ -976,13 +961,13 @@ export class ApiClass {
     });
   }
 
-  async calculate(processInstanceId: string) {
-    return await this.axiosCall({
+  async calculateApplication(processInstanceIdOrData: string | Types.SetApplicationRequest) {
+    return await this.axiosCall<number>({
       method: Methods.POST,
       url: `/${this.productUrl}/api/Application/Calculator`,
-      params: {
-        processInstanceId,
-      },
+      ...(typeof processInstanceIdOrData === 'string'
+        ? { params: { processInstanceId: processInstanceIdOrData } }
+        : { data: processInstanceIdOrData }),
     });
   }
 

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 !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]">
       <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">

package/components/Dialog/DigitalDocumentsDialog.vue

@@ -2,9 +2,7 @@
   <div class="flex flex-col gap-[10px] w-full align-center">
     <v-expansion-panels :flat="true">
       <v-expansion-panel class="!rounded-[8px]">
-        <v-expansion-panel-title class="!text-[12px] border border-[#00000014]">
-          Как получить цифровой документ
-        </v-expansion-panel-title>
+        <v-expansion-panel-title class="!text-[12px] border border-[#00000014]"> Как получить цифровой документ </v-expansion-panel-title>
         <v-expansion-panel-text class="text-[12px] text-[#464f60]">
           1. Выберите тип документа.<br /><br />
           2. Через приложение eGov mobile и другие приложения: <br />
@@ -21,42 +19,18 @@
       </v-expansion-panel>
     </v-expansion-panels>
     <div class="d-flex flex-col gap-0.5 w-full">
-      <base-rounded-select
-        v-model="documentType"
-        class="document-type-select"
-        :items="documentItems"
-        :label="$dataStore.t('form.documentType')"
-        hide-details
-      />
+      <base-rounded-select v-model="documentType" class="document-type-select" :items="documentItems" :label="$dataStore.t('form.documentType')" hide-details />
       <div class="digital-document-otp flex flex-col">
-        <base-otp-input
-          v-model="otpCode"
-          @keyup.enter.prevent="otpCode.length === otpLength && emitGetCode()"
-        />
-        <span
-          v-if="!loading && otpSendDisabled"
-          class="text-center"
-          :class="[$styles.mutedText]"
-        >
-            Введите код цифрового документа из <span class="underline underline-offset-2">eGov Mobile</span> или <span class="underline underline-offset-2">банковского приложения</span>.
-          </span>
+        <base-otp-input v-model="otpCode" @keyup.enter.prevent="otpCode.length === otpLength && emitGetCode()" />
+        <span v-if="!loading && otpSendDisabled" class="text-center" :class="[$styles.mutedText]">
+          Введите код цифрового документа из <span class="underline underline-offset-2">eGov Mobile</span> или
+          <span class="underline underline-offset-2">банковского приложения</span>.
+        </span>
       </div>
     </div>
-    <div class="w-full d-flex gap-4">
-      <base-btn
-        v-if="!otpSendDisabled"
-        :disabled="loading"
-        :loading="loading"
-        :btn="$styles.whiteBorderBtn"
-        text="Отправить SMS-код"
-        @click="emitGetCode"
-      />
-      <base-btn
-        :disabled="loading"
-        :loading="loading"
-        text="Получить документ"
-        @click="emitGetDocument"
-      />
+    <div class="w-full d-flex flex-col sm:flex-row gap-4">
+      <base-btn v-if="!otpSendDisabled" :disabled="loading" :loading="loading" :btn="$styles.whiteBorderBtn" text="Отправить SMS-код" @click="emitGetCode" />
+      <base-btn :disabled="loading" :loading="loading" text="Получить документ" @click="emitGetDocument" />
     </div>
   </div>
 </template>
@@ -80,7 +54,7 @@ const props = defineProps({
   otpSendDisabled: {
     type: Boolean,
     default: false,
-  }
+  },
 });
 const emit = defineEmits(['getCode', 'getDigitalDocument', 'updateDigitalDocuments']);
 
@@ -95,7 +69,7 @@ const emitGetCode = () => {
   }
 
   emit('getCode', documentType.value);
-}
+};
 
 const emitGetDocument = () => {
   if (!otpCode.value) {
@@ -104,16 +78,20 @@ const emitGetDocument = () => {
   }
 
   emit('getDigitalDocument', otpCode.value);
-}
+};
 </script>
 
 <style scoped>
 :deep(.v-otp-input__content) {
   max-width: 360px;
-  gap: 12px!important;
+  gap: 12px !important;
+  @media (max-width: 768px) {
+    max-width: 100%;
+    gap: 8px !important;
+  }
 }
 .v-expansion-panel-title {
-  height: 60px!important;
+  height: 60px !important;
 }
 .v-expansion-panel--active > .v-expansion-panel-title {
   border-bottom-left-radius: inherit;
@@ -121,9 +99,9 @@ const emitGetDocument = () => {
 }
 .document-type-select:deep(.v-field) {
   height: 60px;
-  border: 1px solid #dadada!important;
+  border: 1px solid #dadada !important;
 }
 .document-type-select:deep(.v-label.v-field-label--floating) {
   top: 0;
 }
-</style>
+</style>

package/components/Menu/MenuNavItem.vue

@@ -9,10 +9,13 @@
     ]"
     class="h-[60px] flex items-center justify-between hover:bg-[#A0B3D8] hover:!text-white pl-4 cursor-pointer transition-all group"
   >
-    <span>{{ menuItem.title }}</span>
+    <div class="flex items-center gap-3">
+      <i v-if="icon || menuItem.icon" class="mdi text-xl" :class="[icon || menuItem.icon]"></i>
+      <span>{{ menuItem.title }}</span>
+    </div>
     <div class="flex items-center">
-      <i v-if="menuItem.icon" class="mdi text-xl pr-4" :class="[menuItem.icon]"></i>
       <base-chip :chip="menuItem.chip" />
+       <i v-if="typeof menuItem.link == 'object' || menuItem.chip" class="mdi mdi-folder-outline text-xl pl-4 pr-4"></i>
     </div>
     <v-tooltip v-if="menuItem.description" activator="parent" location="bottom">{{ menuItem.description }}</v-tooltip>
   </div>
@@ -35,6 +38,10 @@ export default defineComponent({
       type: Boolean,
       default: false,
     },
+    icon: {
+      type: String,
+      default: '',
+    },
   },
 });
 </script>

package/components/Pages/Auth.vue

@@ -20,7 +20,7 @@
       :class="{ '!hidden': !$display().lgAndUp.value }"
       class="w-full lg:w-1/4 bg-white flex flex-col justify-between border-r-2 relative px-8"
     >
-      <img draggable="false" class="w-[50%] mt-8" src="~/assets/auth-logo.svg" />
+      <img draggable="false" class="w-[50%] mt-8" src="~/assets/logo.svg" />
       <div class="self-center flex flex-col items-center justify-center base-auth">
         <v-carousel :show-arrows="false" color="#009C73">
           <v-carousel-item v-for="(item, index) of carouselItems" :key="index">
@@ -41,7 +41,7 @@
         :class="{ '!block': !$display().lgAndUp.value }"
         draggable="false"
         class="hidden w-2/4 sm:w-1/3 mb-10 self-center"
-        src="~/assets/auth-logo.svg"
+        src="~/assets/logo.svg"
       />
       <div class="flex flex-col items-center mb-8 text-center">
         <h1 class="text-[28px] font-medium mb-1">
@@ -173,6 +173,9 @@ export default defineComponent({
         }
       }
     });
+    onUnmounted(() => {
+      authLoading.value = false;
+    });
 
     const submitAuthForm = async () => {
       await vForm.value.validate().then(async (v: { valid: Boolean; errors: any }) => {
@@ -181,17 +184,17 @@ export default defineComponent({
             authLoading.value = true;
             await dataStore.loginUser(login.value, password.value, numAttempts.value);
             numAttempts.value++;
-            authLoading.value = false;
             try {
               const redirectUrl = redirectUtils.getAndClearRedirectUrl();
-
               if (redirectUrl) {
                 await router.push(redirectUrl);
               } else {
                 await router.push({ name: 'index' });
               }
+              authLoading.value = false;
             } catch (error) {
               console.error('Redirect error:', error);
+              authLoading.value = false;
               await router.push({ name: 'index' });
             }
           }

package/components/Pages/MemberForm.vue

@@ -685,23 +685,9 @@
         />
         <base-form-input v-model.trim="member.email" :label="$dataStore.t('form.email')" :readonly="isDisabled" :clearable="!isDisabled" :rules="$rules.email" />
       </base-form-section>
-      <base-form-section
-        v-if="$dataStore.isMycar && whichForm === formStore.beneficiaryFormKey"
-        :title="$dataStore.t('form.personalData')"
-      >
-        <base-form-input
-          v-model="member.iin"
-          :label="$dataStore.t('form.bin')"
-          :maska="$maska.iin"
-          :readonly="true"
-          :clearable="false"
-        />
-        <base-form-input
-          v-model.trim="member.lastName"
-          :readonly="true"
-          :clearable="false"
-          :label="$dataStore.t('aml.legalName')"
-        />
+      <base-form-section v-if="$dataStore.isMycar && whichForm === formStore.beneficiaryFormKey" :title="$dataStore.t('form.personalData')">
+        <base-form-input v-model="member.iin" :label="$dataStore.t('form.bin')" :maska="$maska.iin" :readonly="true" :clearable="false" />
+        <base-form-input v-model.trim="member.lastName" :readonly="true" :clearable="false" :label="$dataStore.t('aml.legalName')" />
       </base-form-section>
     </v-form>
     <base-btn v-if="showSaveButton" :loading="isButtonLoading || isSubmittingForm" :text="$dataStore.t('buttons.save')" @click="submitForm" />
@@ -843,7 +829,7 @@
             </v-list-item>
           </v-list>
           <base-list-empty v-if="isEmpty" />
-          <div class="flex gap-4">
+          <div class="flex flex-col sm:flex-row gap-4">
             <base-btn class="px-6" size="sm" :text="$dataStore.t('confirm.cancel')" :btn="$styles.whiteBorderBtn" :classes="$styles.blueText" @click="closeFamilyDialog" />
             <base-btn
               v-if="isOwnChild || (!isOwnChild && childrenLoaded)"
@@ -2325,6 +2311,7 @@ export default {
           if (responseData.firstNameLatin && dataStore.isLifetrip) member.value.firstNameLat = responseData.firstNameLatin;
           if (responseData.lastNameLatin && dataStore.isLifetrip) member.value.lastNameLat = responseData.lastNameLatin;
           if (responseData.middleName) member.value.middleName = responseData.middleName;
+          member.value.longName = [responseData.lastName, responseData.firstName, responseData.middleName].filter(Boolean).join(' ');
           if (responseData.birthDate) member.value.birthDate = reformatDate(responseData.birthDate);
           if (responseData.sex) {
             const sex = responseData.sex.toUpperCase();

package/components/Pages/ProductConditions.vue

@@ -347,13 +347,7 @@
           :clearable="!isDisabledAgentCommission"
           :rules="agencyPartRule"
         />
-        <base-form-input
-          v-if="hasTariffName"
-          v-model="productConditionsForm.tariffName"
-          :readonly="true"
-          :clearable="false"
-          label="Тариф"
-        />
+        <base-form-input v-if="hasTariffName" v-model="productConditionsForm.tariffName" :readonly="true" :clearable="false" label="Тариф" />
       </base-form-section>
       <section v-if="whichProduct === 'pensionannuitynew'">
         <base-animation>
@@ -518,12 +512,7 @@
                 >до {{ transferMaxDate }} включительно</span
               >
             </div>
-            <base-form-input
-              v-model="contract.transferContractNumber"
-              :label="$dataStore.t('pension.globalId')"
-              :readonly="isDisabled"
-              :clearable="!isDisabled"
-            />
+            <base-form-input v-model="contract.transferContractNumber" :label="$dataStore.t('pension.globalId')" :readonly="isDisabled" :clearable="!isDisabled" />
             <base-form-input
               v-model="contract.transferContractRegNumber"
               :label="$dataStore.t('pension.transferRegNumber')"
@@ -557,13 +546,13 @@
                 Если выкупная сумма содержит ОППВ, необходимо приложить развернутую выписку из ЕНПФ.
               </p>
             </div>
-<!--            <base-form-input-->
-<!--              v-if="contract.transferContractIsOppv"-->
-<!--              v-model="contract.transferContractMonthCount"-->
-<!--              :disabled="$dataStore.isLoading"-->
-<!--              :rules="$rules.required.concat($rules.notZero, $rules.numbers)"-->
-<!--              :label="$dataStore.t('pension.compulsoryProfMonthCount')"-->
-<!--            />-->
+            <!--            <base-form-input-->
+            <!--              v-if="contract.transferContractIsOppv"-->
+            <!--              v-model="contract.transferContractMonthCount"-->
+            <!--              :disabled="$dataStore.isLoading"-->
+            <!--              :rules="$rules.required.concat($rules.notZero, $rules.numbers)"-->
+            <!--              :label="$dataStore.t('pension.compulsoryProfMonthCount')"-->
+            <!--            />-->
             <base-btn
               v-if="!isDisabled"
               class="mt-3"
@@ -846,12 +835,7 @@
           />
         </div>
         <template v-if="whichProduct === 'halykkazyna'">
-          <base-form-toggle
-            v-model="productConditionsForm.managerHelped"
-            :has-border="false"
-            :title="$dataStore.t('Вам помогал менеджер?')"
-            height="min-h-[56px]"
-          />
+          <base-form-toggle v-model="productConditionsForm.managerHelped" :has-border="false" :title="$dataStore.t('Вам помогал менеджер?')" height="min-h-[56px]" />
           <base-panel-input
             v-if="isDisabled"
             v-model="productConditionsForm.hasEnhancedGift"
@@ -873,7 +857,8 @@
           <div class="flex items-center gap-[8px] mt-2">
             <v-icon class="text-[#99A3B3] text-[20px]">mdi-information-outline</v-icon>
             <p class="font-normal text-[14px] leading-[20px] tracking-[0.25px] text-[#99A3B3]">
-              Доступно, если размер страховой премии больше {{ $dataStore.getNumberWithSpaces(minEnhancedGiftSum) }} тенге или {{ $dataStore.getNumberWithSpaces(minEnhancedGiftSumInUsd) }} долларов.
+              Доступно, если размер страховой премии больше {{ $dataStore.getNumberWithSpaces(minEnhancedGiftSum) }} тенге или
+              {{ $dataStore.getNumberWithSpaces(minEnhancedGiftSumInUsd) }} долларов.
             </p>
           </div>
         </template>
@@ -1163,10 +1148,10 @@ export default defineComponent({
       }
     });
     const enpfNoteFile = computed(() => {
-      if(useEnv().isProduction) {
-        return formStore.signedDocumentList.find(i => i.fileTypeCode === '8' && i.iin === contragentData.value?.iin)
+      if (useEnv().isProduction) {
+        return formStore.signedDocumentList.find(i => i.fileTypeCode === '8' && i.iin === contragentData.value?.iin);
       } else {
-        return formStore.signedDocumentList.find(i => i.fileTypeCode === '8')
+        return formStore.signedDocumentList.find(i => i.fileTypeCode === '8');
       }
     });
     const isEnpfSum = pensionForm.value?.isEnpfSum ?? false;
@@ -1185,7 +1170,7 @@ export default defineComponent({
     const firstAmount = ref<boolean>(true);
     const isHalykBank = formStore.lfb.policyholder.clientData.iin.replace(/-/g, '') === '940140000385';
     const closeDate = ref<any>('');
-    const minEnhancedGiftSum = 10_000_000
+    const minEnhancedGiftSum = 10_000_000;
 
     const checkTransferContractDate = (val: any) => {
       if (val) {
@@ -1200,16 +1185,21 @@ export default defineComponent({
     };
 
     const minEnhancedGiftSumInUsd = computed(() => {
-      if(typeof dataStore.currencies.usd === 'number') {
-        return Math.round(minEnhancedGiftSum / dataStore.currencies.usd)
+      if (typeof dataStore.currencies.usd === 'number') {
+        return Math.round(minEnhancedGiftSum / dataStore.currencies.usd);
       }
-    })
+    });
     const enhancedGiftDisabled = computed(() => {
-      const insurancePremium = parseAmount(productConditionsForm.insurancePremiumPerMonth)
+      const insurancePremium = parseAmount(productConditionsForm.insurancePremiumPerMonth);
 
-      return (!insurancePremium || insurancePremium < minEnhancedGiftSum) ||
-        (!productConditionsForm.coverPeriod || productConditionsForm.coverPeriod < 1 || productConditionsForm.coverPeriod > 5)
-    })
+      return (
+        !insurancePremium ||
+        insurancePremium < minEnhancedGiftSum ||
+        !productConditionsForm.coverPeriod ||
+        productConditionsForm.coverPeriod < 1 ||
+        productConditionsForm.coverPeriod > 5
+      );
+    });
     const isShownAdditionalTerms = computed(() => {
       if (whichProduct.value === 'gons') {
         return false;
@@ -1277,7 +1267,7 @@ export default defineComponent({
         return !!productConditionsForm.insurancePremiumPerMonth;
       }
       if (whichProduct.value === 'gons') {
-        return false
+        return false;
       }
       return !!productConditionsForm.requestedSumInsured && !!productConditionsForm.insurancePremiumPerMonth;
     });
@@ -1592,7 +1582,7 @@ export default defineComponent({
       return dataStore.t('generalConditions');
     });
     const hasInsStartDate = computed(() => {
-      if (whichProduct.value === 'lifebusiness' || whichProduct.value === 'gns'  || whichProduct.value === 'halykmycar') {
+      if (whichProduct.value === 'lifebusiness' || whichProduct.value === 'gns' || whichProduct.value === 'halykmycar') {
         return true;
       }
       return false;
@@ -1630,12 +1620,12 @@ export default defineComponent({
     );
 
     const isCompulsoryProfContractAmount = computed(() => {
-      return Number(cleanWhiteSpace(pensionForm.value.compulsoryProfContractAmount)) > 0
-    })
+      return Number(cleanWhiteSpace(pensionForm.value.compulsoryProfContractAmount)) > 0;
+    });
 
     const transferContractsHasOppv = computed(() => {
-      return transferContracts.value.length && transferContracts.value.some(item => item.transferContractIsOppv)
-    })
+      return transferContracts.value.length && transferContracts.value.some(item => item.transferContractIsOppv);
+    });
 
     const getContragent = async () => {
       const data = await dataStore.api.getContragentById(
@@ -2154,35 +2144,36 @@ export default defineComponent({
     const isTruthyNumber = (value: any): boolean => {
       const num = Number(value?.toString().replace(/\s/g, ''));
       return !!num;
-    }
+    };
 
     const doesNeedEnpfNoteFile = (): boolean => {
-      let needFile = false
+      let needFile = false;
 
-      if(
+      if (
         dataStore.isProcessEditable(formStore.applicationData.statusCode) &&
-        (isTruthyNumber(pensionForm.value.compulsoryProfContractAmount) ||
-          isTruthyNumber(pensionForm.value.compulsoryContractAmount) ||
-          transferContractsHasOppv.value
-        )
+        (isTruthyNumber(pensionForm.value.compulsoryProfContractAmount) || isTruthyNumber(pensionForm.value.compulsoryContractAmount) || transferContractsHasOppv.value)
       ) {
-        needFile = true
+        needFile = true;
       }
 
       return needFile;
-    }
+    };
 
     const submitForm = async () => {
       if (whichProduct.value === 'pensionannuitynew') {
-        const needsEnpfNoteFile = doesNeedEnpfNoteFile()
-        if(needsEnpfNoteFile && !enpfNoteFile.value) {
+        const needsEnpfNoteFile = doesNeedEnpfNoteFile();
+        if (needsEnpfNoteFile && !enpfNoteFile.value) {
           dataStore.showToaster('error', 'Необходимо вложить Выписка ЕНПФ');
           return;
         }
-        const isValid = !!(formatSpacedNumber(pensionForm.value.compulsoryContractAmount) || formatSpacedNumber(pensionForm.value.compulsoryProfContractAmount) || transferContracts.value?.length)
-        if(formStore.applicationData.processCode !== 24 && !isValid) {
-          dataStore.showToaster('error', 'Отказ')
-          return
+        const isValid = !!(
+          formatSpacedNumber(pensionForm.value.compulsoryContractAmount) ||
+          formatSpacedNumber(pensionForm.value.compulsoryProfContractAmount) ||
+          transferContracts.value?.length
+        );
+        if (formStore.applicationData.processCode !== 24 && !isValid) {
+          dataStore.showToaster('error', 'Отказ');
+          return;
         }
       }
       vForm.value.validate().then(async (v: { valid: Boolean; errors: any }) => {
@@ -2450,10 +2441,10 @@ export default defineComponent({
           }
           dataStore.isLoading = true;
           try {
-            if(isCompulsoryProfContractAmount.value || transferContractsHasOppv.value) {
-              await setOppvCount(file)
+            if (isCompulsoryProfContractAmount.value || transferContractsHasOppv.value) {
+              await setOppvCount(file);
             } else {
-              await uploadFile(file)
+              await uploadFile(file);
             }
             await dataStore.getSignedDocList(formStore.applicationData.processInstanceId, formStore.applicationData.slave?.processInstanceId);
             dataStore.showToaster('success', dataStore.t('toaster.successOperation'));
@@ -2471,7 +2462,7 @@ export default defineComponent({
       if (typeof result === 'number') {
         pensionForm.value.compulsoryProfMonthCount = result;
       }
-    }
+    };
     const uploadFile = async (file: File) => {
       const formData = new FormData();
       const information: any = [];
@@ -2482,14 +2473,14 @@ export default defineComponent({
       information.push({
         identifier: `${uuidV4}${ext}`,
         iin: contragentData.value?.iin ? contragentData.value?.iin.replaceAll('-', '') : null,
-        processInstanceId: formStore.applicationData.processInstanceId,
+        processInstanceId: isSlavePensionForm.value ? formStore.applicationData.slave.processInstanceId : formStore.applicationData.processInstanceId,
         fileTypeCode: selectedDocument ? selectedDocument.code : null,
         fileTypeId: selectedDocument ? selectedDocument.id : null,
         fileName: file.name,
       });
       formData.append('fileData', JSON.stringify(information));
       await dataStore.uploadFiles(formData, false);
-    }
+    };
     const openFileActionsPanel = async (document: DocumentItem) => {
       dataStore.rightPanel.title = document.fileTypeName!;
       dataStore.rightPanel.open = true;
@@ -2512,12 +2503,14 @@ export default defineComponent({
           iin: enpfNoteFile.value.iin ?? '',
         };
         await dataStore.deleteFile(data);
-        formStore.signedDocumentList = formStore.signedDocumentList.filter(doc => doc.id !== data.id)
+        formStore.signedDocumentList = formStore.signedDocumentList.filter(doc => doc.id !== data.id);
         deletionDialog.value = false;
         isFileActionsPanelOpen.value = false;
         dataStore.rightPanel.open = false;
         dataStore.panelAction = null;
-        await dataStore.api.pensionannuityNew.resetApplicationData(formStore.applicationData.processInstanceId);
+        await dataStore.api.pensionannuityNew.resetApplicationData(
+          isSlavePensionForm.value ? formStore.applicationData.slave.processInstanceId : formStore.applicationData.processInstanceId,
+        );
         await dataStore.getApplicationData(String(route.params.taskId), false, false, false, true);
         await dataStore.getSignedDocList(formStore.applicationData.processInstanceId, formStore.applicationData.slave?.processInstanceId);
       }
@@ -2571,6 +2564,9 @@ export default defineComponent({
         if (!!productConditionsForm.insurancePremiumPerMonth) {
           whichSum.value = 'insurancePremiumPerMonth';
         }
+        if (whichProduct.value === 'lifebusiness') {
+          whichSum.value = 'requestedSumInsured';
+        }
         if (whichProduct.value === 'lifebusiness' || whichProduct.value === 'gns') {
           if (!productConditionsForm.requestedSumInsured) {
             whichSum.value = 'requestedSumInsured';
@@ -2825,23 +2821,23 @@ export default defineComponent({
       );
     }
 
-    if(whichProduct.value === 'halykkazyna') {
+    if (whichProduct.value === 'halykkazyna') {
       watch(
         () => productConditionsForm.coverPeriod,
-        (val) => {
-          if(!val || val > 5) {
-            productConditionsForm.hasEnhancedGift = false
+        val => {
+          if (!val || val > 5) {
+            productConditionsForm.hasEnhancedGift = false;
           }
-        }
+        },
       );
       watch(
         () => productConditionsForm.insurancePremiumPerMonth,
-        (val) => {
-          if(!val || Number(val) < minEnhancedGiftSum) {
-            productConditionsForm.hasEnhancedGift = false
+        val => {
+          if (!val || Number(val) < minEnhancedGiftSum) {
+            productConditionsForm.hasEnhancedGift = false;
           }
-        }
-      )
+        },
+      );
     }
 
     const copyRedirect = async () => {

package/components/Panel/PanelHandler.vue

@@ -23,8 +23,8 @@
         >
       </base-content-block>
       <div class="flex flex-col gap-3" v-if="hasConditionsAction">
-        <base-btn :text="$dataStore.t('confirm.yes')" :loading="$dataStore.isButtonsLoading" @click="handleTask" />
-        <base-btn :btn="$styles.blueLightBtn" :loading="$dataStore.isButtonsLoading" :text="$dataStore.t('confirm.no')" @click="closePanel" />
+        <base-btn :text="$dataStore.t('confirm.yes')" :loading="loading" @click="handleTask" />
+        <base-btn :btn="$styles.blueLightBtn" :loading="loading" :text="$dataStore.t('confirm.no')" @click="closePanel" />
       </div>
     </div>
   </section>
@@ -36,12 +36,12 @@
       <base-btn v-if="!useEnv().isProduction" :text="$dataStore.t('buttons.sendEgovMob')" :disabled="isQrDisabled" :loading="loading" @click="handleSignAction('qr')" />
     </div>
     <div v-if="isPaperContract" :class="[$styles.flexColNav]">
-      <base-btn :text="$dataStore.t('buttons.downloadContract')" :loading="$dataStore.isButtonsLoading" @click="generateDocument" />
+      <base-btn :text="$dataStore.t('buttons.downloadContract')" :loading="loading" @click="generateDocument" />
     </div>
     <div v-if="isScansDocuments" :class="[$styles.flexColNav]">
       <div v-if="isNewSign">
         <div class="flex flex-col gap-2">
-          <base-btn v-for="file in getFilesDownloadButtons" :text="`Скачать ${file.fileName}`" :loading="$dataStore.isButtonsLoading" @click="getDocNew(file)" />
+          <base-btn v-for="file in getFilesDownloadButtons" :text="`Скачать ${file.fileName}`" :loading="loading" @click="getDocNew(file)" />
           <base-form-section class="mt-4 flex flex-col !gap-2" :title="$dataStore.t('clients.attachScansSignDocs')">
             <base-file-input v-for="file in signingFiles" :label="`Вложить ${file.fileName}`" @input.prevent="onFileChangeScansNew($event, file)" @onClear="onClearFileNew(file)" />
           </base-form-section>
@@ -58,7 +58,7 @@
           <base-file-input :label="$dataStore.t('labels.attachPowerOfAttorney')" @input.prevent="onFileChangeScans($event, 'attorney')" @onClear="onClearFile('attorney')" />
         </base-form-section>
       </div>
-      <base-btn :text="$dataStore.t('buttons.sign')" :loading="$dataStore.isButtonsLoading || loading" @click="isNewSign ? sendFilesNew() : sendFiles()" />
+      <base-btn :text="$dataStore.t('buttons.sign')" :loading="loading || loading" @click="isNewSign ? sendFilesNew() : sendFiles()" />
       <base-btn :text="$dataStore.t('buttons.cancel')" :btn="$styles.whiteBtn" @click="isScansDocuments = false" />
       <base-btn
         v-if="isOnlineEnpf === false && $dataStore.isPension && formStore.applicationData.statusCode === 'AttachAppContractForm'"
@@ -144,7 +144,7 @@
           <i class="mdi mdi-download text-2xl text-[#A0B3D8]"></i
         ></base-panel-item>
       </base-form-section>
-      <base-btn :text="$dataStore.t('buttons.send')" :loading="$dataStore.isButtonsLoading" @click="sendInvoiceToEmail" />
+      <base-btn :text="$dataStore.t('buttons.send')" :loading="loading" @click="sendInvoiceToEmail" />
     </div>
   </section>
   <section v-if="signingActions" class="relative">
@@ -450,6 +450,7 @@ export default defineComponent({
         dataStore.showToaster('warning', dataStore.t('toaster.notAllDocumentsAttached'));
         return;
       }
+      loading.value = true;
       try {
         await Promise.allSettled(
           Object.values(scansFiles.value).map(async f => {
@@ -461,16 +462,18 @@ export default defineComponent({
         isScansDocuments.value = false;
         dataStore.showToaster('info', 'Документы загружены успешно');
       } catch (err) {
+        loading.value = false;
         return ErrorHandler(err);
       }
+      loading.value = false;
     };
 
     const sendFiles = async () => {
-      loading.value = true;
       if (scansFiles.value.length !== 4) {
         dataStore.showToaster('warning', dataStore.t('toaster.notAllDocumentsAttached'));
         return;
       }
+      loading.value = true;
       for (const item of scansFiles.value) {
         scansFormData.value.append('file', item.file);
         scansFormData.value.append('fileData', item.fileData);
@@ -540,7 +543,7 @@ export default defineComponent({
 
     const onInit = async () => {
       if (dataStore.controls.hasChooseSign) {
-        if (dataStore.isBaiterek  || dataStore.isMycar || dataStore.isGons || dataStore.isLifeBusiness || dataStore.isPension || dataStore.isGns) {
+        if (dataStore.isBaiterek || dataStore.isMycar || dataStore.isGons || dataStore.isLifeBusiness || dataStore.isPension || dataStore.isGns) {
           isElectronicContract.value = false;
         }
       }

package/composables/constants.ts

@@ -76,6 +76,49 @@ export const constants = Object.freeze({
     Statuses.ContractSignedFrom,
     Statuses.AttachAppContractForm,
   ],
+  taskSuccessStatuses: [
+    Statuses.Completed,
+    Statuses.ClientApplicationAccept,
+    Statuses.InsurancePremiumOnlinePaid,
+    Statuses.SetStatusInsurancePremiumPaid,
+    Statuses.SetStatusInsurancePremiumOnlinePaid,
+    Statuses.AccumulationTransferCompletedByENPF,
+  ],
+  taskFailureStatuses: [
+    Statuses.RejectClientEdit,
+    Statuses.RejectClientSanctionList,
+    Statuses.RejectForeginList,
+    Statuses.RejectExpired,
+    Statuses.CanceledAttachAppContractForm,
+    Statuses.RejectActuary,
+    Statuses.RejectUsns,
+    Statuses.ApplicationOtpCancel,
+    Statuses.RejectUnderwriter,
+    Statuses.InsurancePremiumOnlineNotPaid,
+    Statuses.Rejected,
+    Statuses.RejectFinCenter,
+    Statuses.RejectContractCompliance,
+    Statuses.AccumulationTransferDeniedByENPF,
+    Statuses.RejectOSNS,
+    Statuses.CancelStart,
+    Statuses.ClientRejectBeneficiaryEdit,
+    Statuses.CanceledPreparationDossierForm,
+    Statuses.RejectAccountant,
+    Statuses.RejectClientNonSigned,
+    Statuses.RejectClientNonSignedContract,
+    Statuses.RegistryFinCenterReject,
+    Statuses.RejectInputData,
+    Statuses.RejectInsurerNonSigned,
+    Statuses.RejectHeadManager,
+    Statuses.RejectInsuredNotValid,
+    Statuses.RejectContragentCompliance,
+    Statuses.RejectNotMeetRequirements,
+    Statuses.NorecordEsbd,
+    Statuses.TimeTransferDenied,
+    Statuses.NoRecord,
+    Statuses.RejectMtsznNotificationMissing,
+    Statuses.RejectPush1DateMismatch,
+  ],
   gbdErrors: ['INVALID', 'TIMEOUT', 'ERROR', 'NOT_FOUND'],
   roles: Roles,
   actions: Actions,

package/composables/index.ts

@@ -897,6 +897,7 @@ export class RoleController {
   isSanctioner1 = () => this.isRole(constants.roles.Sanctioner1);
   isSanctioner2 = () => this.isRole(constants.roles.Sanctioner2);
   isSanctioner3 = () => this.isRole(constants.roles.Sanctioner3);
+  isRegisterSanctioner = () => this.isRole(constants.roles.RegisterSanctioner);
   hasAccess = () => {
     const baseAccessRoles = this.isAdmin() || this.isSupport() || this.isAnalyst() || this.isDrn() || this.isDsuioOrv() || this.isAuditor();
     return {
@@ -917,10 +918,12 @@ export class RoleController {
         this.isHeadAdjuster() ||
         this.isArchivist() ||
         this.isSecurity() ||
+        this.isReInsurer() ||
         this.isUnderwriter() ||
         this.isSanctioner1() ||
         this.isSanctioner2() ||
         this.isSanctioner3() ||
+        this.isRegisterSanctioner() ||
         baseAccessRoles,
       toReinsurance: this.isReInsurer() || this.isAdjuster() || this.isHeadAdjuster() || baseAccessRoles,
       toReporting: this.isServiceManager() || this.isManager() || this.isSalesManager() || this.isChiefSalesManager() || this.isChiefManagerNSZH() || baseAccessRoles,
@@ -936,6 +939,7 @@ export class RoleController {
         this.isServiceManager() ||
         this.isUSNSsanctioner() ||
         this.isAccountantDirector() ||
+        this.isRegisterSanctioner() ||
         baseAccessRoles,
       toEFO:
         this.isAgentAuletti() ||
@@ -1027,7 +1031,7 @@ export const redirectUtils = {
       currentPath = window.location.pathname + window.location.search;
     }
 
-    const excludedPaths = ['/auth', '/login', '/logout'];
+    const excludedPaths = ['/Auth'];
 
     console.log('Saving redirect URL:', currentPath);
 

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "hl-core",
-  "version": "0.0.10-beta.71",
+  "version": "0.0.10-beta.72",
   "license": "MIT",
   "private": false,
   "main": "nuxt.config.ts",
@@ -43,7 +43,7 @@
     "nuxt": "3.10.3",
     "prettier": "3.2.5",
     "vue": "3.4.19",
-    "vue-tsc": "3.0.5",
+    "vue-tsc": "1.8.27",
     "vue-router": "4.3.0"
   },
   "dependencies": {

package/plugins/head.ts

@@ -5,7 +5,7 @@ export default defineNuxtPlugin(() => {
       {
         rel: 'icon',
         type: 'image/x-icon',
-        href: import.meta.env.VITE_PARENT_PRODUCT === 'auletti' || String(import.meta.env.VITE_PRODUCT).includes('auletti') ? '/logo-auletti.svg' : '/logo.svg',
+        href: import.meta.env.VITE_PARENT_PRODUCT === 'auletti' || String(import.meta.env.VITE_PRODUCT).includes('auletti') ? '/logo-auletti.svg' : '/favicon.svg',
       },
       { rel: 'preconnect', href: 'https://fonts.googleapis.com' },
       { rel: 'preconnect', href: 'https://fonts.gstatic.com' },

package/store/data.store.ts

@@ -703,7 +703,7 @@ export const useDataStore = defineStore('data', {
           id: Number(user.id),
           type: Number(user.type),
           iin: user.iin ? user.iin.replace(/-/g, '') : '',
-          longName: user.longName !== null ? user.longName : (user.lastName ?? '') + (user.firstName ?? '') + (user.middleName ?? ''),
+          longName: user.longName !== null ? user.longName : [user.lastName, user.firstName, user.middleName].filter(Boolean).join(' '),
           lastName: user.lastName ?? '',
           firstName: user.firstName ?? '',
           middleName: user.middleName ?? '',
@@ -1624,20 +1624,15 @@ export const useDataStore = defineStore('data', {
     ) {
       try {
         const basePromise: Promise<Types.AnketaFirst> =
-          whichMember === 'insured'
-            ? this.api.getQuestionList(surveyType, processInstanceId, insuredId)
-            : this.api.getClientQuestionList(surveyType, processInstanceId, insuredId);
+          whichMember === 'insured' ? this.api.getQuestionList(surveyType, processInstanceId, insuredId) : this.api.getClientQuestionList(surveyType, processInstanceId, insuredId);
 
         const secondPromise: Promise<Types.AnketaSecond[] | null> = !this.isMycar
-          ? (whichMember === 'insured'
+          ? whichMember === 'insured'
             ? this.api.getQuestionListSecond(`${surveyType}second`, processInstanceId, insuredId)
-            : this.api.getClientQuestionListSecond(`${surveyType}second`, processInstanceId, insuredId))
+            : this.api.getClientQuestionListSecond(`${surveyType}second`, processInstanceId, insuredId)
           : Promise.resolve(null);
 
-        const [baseQuestions, secondaryQuestions] = await Promise.allSettled([
-          basePromise,
-          secondPromise,
-        ]);
+        const [baseQuestions, secondaryQuestions] = await Promise.allSettled([basePromise, secondPromise]);
         if (baseQuestions.status === 'fulfilled') {
           this.formStore[baseField] = baseQuestions.value;
         }
@@ -2054,7 +2049,7 @@ export const useDataStore = defineStore('data', {
         if (!this.isPension && !(this.formStore.lfb.add && (this.isLifeBusiness || this.isGns))) await this.api.setApplication(this.getConditionsData());
         const result = ref();
         let applicationData = null;
-        if (!isHalykBank) result.value = await this.api.getCalculation(String(id));
+        if (!isHalykBank) result.value = await this.api.calculateApplication(String(id));
         if (this.isLifeBusiness || this.isGns) {
           await this.getApplicationDataV2(taskId);
           return;
@@ -2235,12 +2230,12 @@ export const useDataStore = defineStore('data', {
         }
         if (this.isTask() && taskId) {
           await this.api.setApplication(priceForm);
-          await this.api.getCalculator(priceForm);
+          await this.api.calculateApplication(priceForm);
           const applicationData = await this.api.getApplicationData(taskId);
           this.formStore.applicationData = applicationData;
           this.formStore.productConditionsForm.calculatorForm.price = `${Math.ceil(applicationData.lifeTripApp.totalPremiumKZT)} тг`;
         } else {
-          const result = await this.api.getCalculator(priceForm);
+          const result = await this.api.calculateApplication(priceForm);
           this.formStore.productConditionsForm.calculatorForm.price = `${Math.ceil(result)} тг`;
         }
         this.showToaster('success', this.t('toaster.calculated'), 1000);
@@ -3566,9 +3561,9 @@ export const useDataStore = defineStore('data', {
       try {
         const res = await this.api.externalServices.getOnlineChildAccess({
           iinBin: iin.replace(/-/g, ''),
-          methodName: "CHILDREN"
-        })
-        if(res.children && res.children.length) {
+          methodName: 'CHILDREN',
+        });
+        if (res.children && res.children.length) {
           this.formStore.children = res.children;
         }
       } catch (err) {
@@ -4258,7 +4253,7 @@ export const useDataStore = defineStore('data', {
           iinBin: iin.replaceAll('-', ''),
           documentType: documentType,
           childId: childId,
-        }
+        };
         return await this.api.externalServices.getOnlineChildAccess(data);
       } catch (err) {
         ErrorHandler(err);

package/types/enum.ts

@@ -136,6 +136,7 @@ export enum Roles {
   Sanctioner1 = 'Sanctioner1',
   Sanctioner2 = 'Sanctioner2',
   Sanctioner3 = 'Sanctioner3',
+  RegisterSanctioner = 'RegisterSanctioner',
 }
 
 export enum Statuses {
@@ -163,6 +164,72 @@ export enum Statuses {
   AccountantForm = 'AccountantForm',
   HeadManagerForm = 'HeadManagerForm',
   DeferredContract = 'DeferredContract',
+  ComplianceSanctionListForm = 'ComplianceSanctionListForm',
+  ComplianceIpdlForm = 'ComplianceIpdlForm',
+  EditAddressForm = 'EditAddressForm',
+  RejectClientEdit = 'RejectClientEdit',
+  Registration = 'Registration',
+  ClientRejectBeneficiaryEdit = 'ClientRejectBeneficiaryEdit',
+  RejectClientSanctionList = 'RejectClientSanctionList',
+  RejectForeginList = 'RejectForeginList',
+  ComplianceForm = 'ComplianceForm',
+  RejectExpired = 'RejectExpired',
+  CanceledAttachAppContractForm = 'CanceledAttachAppContractForm',
+  CanceledPreparationDossierForm = 'CanceledPreparationDossierForm',
+  RejectActuary = 'RejectActuary',
+  RejectUsns = 'RejectUsns',
+  RejectAccountant = 'RejectAccountant',
+  ApplicationOtpCancel = 'ApplicationOtpCancel',
+  ApplicationOtpForm = 'ApplicationOtpForm',
+  ClientApplicationAccept = 'ClientApplicationAccept',
+  Autounderwriting = 'Autounderwriting',
+  RejectUnderwriter = 'RejectUnderwriter',
+  InsurancePremiumOnlineNotPaid = 'InsurancePremiumOnlineNotPaid',
+  RejectClientNonSigned = 'RejectClientNonSigned',
+  NoticeRegistrationForm = 'NoticeRegistrationForm',
+  SigningResponseLetterForm = 'SigningResponseLetterForm',
+  ReponseLetterRegistrationForm = 'ReponseLetterRegistrationForm',
+  RejectClientNonSignedContract = 'RejectClientNonSignedContract',
+  ChooseAdjusterForm = 'ChooseAdjusterForm',
+  AdjusterForm = 'AdjusterForm',
+  Rejected = 'Rejected',
+  CreateReserveForm = 'CreateReserveForm',
+  AcceptAdjusterRejectForm = 'AcceptAdjusterRejectForm',
+  RejectFinCenter = 'RejectFinCenter',
+  RegistryFinCenterReject = 'RegistryFinCenterReject',
+  AssignRiskLevel = 'AssignRiskLevel',
+  FinancialMonitoring = 'FinancialMonitoring',
+  RejectContractCompliance = 'RejectContractCompliance',
+  RejectInputData = 'RejectInputData',
+  SetStatusInsurancePremiumPaid = 'SetStatusInsurancePremiumPaid',
+  SetStatusInsurancePremiumOnlinePaid = 'SetStatusInsurancePremiumOnlinePaid',
+  InvoicePaymentIssued = 'InvoicePaymentIssued',
+  RejectInsurerNonSigned = 'RejectInsurerNonSigned',
+  RejectHeadManager = 'RejectHeadManager',
+  ContractProcessingByENPF = 'ContractProcessingByENPF',
+  AccumulationTransferDeniedByENPF = 'AccumulationTransferDeniedByENPF',
+  AccumulationTransferCompletedByENPF = 'AccumulationTransferCompletedByENPF',
+  RejectOSNS = 'RejectOSNS',
+  RejectInsuredNotValid = 'RejectInsuredNotValid',
+  RejectContragentCompliance = 'RejectContragentCompliance',
+  CheckFinCenter = 'CheckFinCenter',
+  RegistryFinCenter = 'RegistryFinCenter',
+  AutoSign = 'AutoSign',
+  RejectNotMeetRequirements = 'RejectNotMeetRequirements',
+  RejectOCRMNotFound = 'RejectOCRMNotFound',
+  RejectContragentNotAlive = 'RejectContragentNotAlive',
+  RejectContragenNotAlive = 'RejectContragenNotAlive',
+  RejectBINNotMatch = 'RejectBINNotMatch',
+  CancelStart = 'CancelStart',
+  NorecordEsbd = 'NorecordEsbd',
+  TimeTransferDenied = 'TimeTransferDenied',
+  Processing = 'Processing',
+  NoRecord = 'NoRecord',
+  RejectMtsznNotificationMissing = 'RejectMtsznNotificationMissing',
+  UpdatingContragentData = 'UpdatingContragentData',
+  RejectPush1DateMismatch = 'RejectPush1DateMismatch',
+  ExportData = 'ExportData',
+  ExportDataForm = 'ExportDataForm',
 }
 
 export enum MemberCodes {