hl-core 0.0.8-beta.29 → 0.0.8-beta.30

package/api/index.ts

@@ -161,6 +161,10 @@ export class ApiClass {
     });
   }
 
+  async getInsurancePay(): Promise<Value[]> {
+    return this.axiosCall({ method: Methods.GET, url: '/Arm/api/Dictionary/GetDictionaryItems/DicBeneficiaryInsurancePay' });
+  }
+
   async getQuestionList(surveyType: string, processInstanceId: string, insuredId: number | string): Promise<AnketaFirst> {
     return this.axiosCall({
       method: Methods.GET,
@@ -168,6 +172,13 @@ export class ApiClass {
     });
   }
 
+  async getClientQuestionList(surveyType: string, processInstanceId: string, insuredId: number | string): Promise<AnketaFirst> {
+    return this.axiosCall({
+      method: Methods.GET,
+      url: `/${this.productUrl}/api/Application/AnketaClient/${surveyType}/${processInstanceId}/${insuredId}`,
+    });
+  }
+
   async getQuestionListSecond(surveyType: string, processInstanceId: string, insuredId: number | string): Promise<AnketaSecond[]> {
     return this.axiosCall({
       method: Methods.GET,
@@ -175,6 +186,13 @@ export class ApiClass {
     });
   }
 
+  async getClientQuestionListSecond(surveyType: string, processInstanceId: string, insuredId: number | string): Promise<AnketaSecond[]> {
+    return this.axiosCall({
+      method: Methods.GET,
+      url: `/${this.productUrl}/api/Application/AnketaClient/${surveyType}/${processInstanceId}/${insuredId}`,
+    });
+  }
+
   async definedAnswers(filter: string) {
     return this.axiosCall({
       method: Methods.GET,

package/components/Form/ManagerAttachment.vue

@@ -52,7 +52,7 @@
     <Teleport v-if="isPanelOpen" to="#panel-actions">
       <div :class="[$libStyles.scrollPage]" class="flex flex-col items-center">
         <base-rounded-input
-          v-model="searchQuery"
+          v-model.trim="searchQuery"
           :label="$t('labels.search')"
           class="w-full p-2"
           :hide-details="true"

package/components/Pages/Anketa.vue

@@ -69,7 +69,13 @@
           </base-form-text-section>
         </section>
       </v-form>
-      <base-btn class="my-[14px] self-center" :loading="isButtonLoading" :disabled="formStore.isDisabled[whichSurvey] || !$dataStore.isTask()" @click="submitForm" :text="$t('buttons.save')"></base-btn>
+      <base-btn
+        class="my-[14px] self-center"
+        :loading="isButtonLoading"
+        :disabled="formStore.isDisabled[whichSurvey] || !$dataStore.isTask()"
+        @click="submitForm"
+        :text="$t('buttons.save')"
+      ></base-btn>
     </section>
     <v-btn
       v-if="secondQuestionList && secondQuestionList.length && firstPanel"
@@ -136,7 +142,15 @@ export default defineComponent({
     const firstPanel = ref<boolean>(false);
     const secondPanel = ref<boolean>(false);
     const surveyType = ref<'health' | 'critical'>('tab' in route.query && route.query.tab === 'criticalBase' ? 'critical' : 'health');
-    const whichSurvey = computed(() => (surveyType.value === 'health' ? 'surveyByHealthBase' : 'surveyByCriticalBase'));
+    const whichSurvey = computed(() =>
+      surveyType.value === 'health'
+        ? whichMember.value === 'insured'
+          ? 'surveyByHealthBase'
+          : 'surveyByHealthBasePolicyholder'
+        : whichMember.value === 'insured'
+        ? 'surveyByCriticalBase'
+        : 'surveyByCriticalBasePolicyholder',
+    );
     const firstQuestionList = ref<AnketaBody[]>();
     const secondQuestionList = ref<AnketaSecond[]>([]);
     const currentQuestion = ref<AnketaBody>();
@@ -144,6 +158,7 @@ export default defineComponent({
     const isPanelLoading = ref<boolean>(false);
     const searchQuery = ref<string>('');
 
+    const whichMember = computed(() => ('member' in route.query && !!route.query.member ? (route.query.member as string) : 'insured'));
     const scrollForm = (direction: 'up' | 'down') => {
       const scrollObject = { top: direction === 'up' ? 0 : screen.height * 10, behavior: 'smooth' };
       if (firstPanel.value) {
@@ -259,9 +274,10 @@ export default defineComponent({
       await dataStore.getQuestionList(
         surveyType.value,
         formStore.applicationData.processInstanceId,
-        formStore.applicationData.insuredApp[0].id,
+        whichMember.value === 'insured' ? formStore.applicationData.insuredApp[0].id : formStore.applicationData.clientApp.id,
         whichSurvey.value,
         surveyType.value === 'health' ? 'surveyByHealthSecond' : 'surveyByCriticalSecond',
+        whichMember.value,
       );
       firstQuestionList.value = formStore[whichSurvey.value]!.body;
       secondQuestionList.value = formStore[surveyType.value === 'health' ? 'surveyByHealthSecond' : 'surveyByCriticalSecond']!;
@@ -275,9 +291,6 @@ export default defineComponent({
           await dataStore.definedAnswers(question.first.id, whichSurvey.value);
         }),
       );
-      if (formStore.isDisabled.surveyByHealthBase) {
-        dataStore.showToaster('error', dataStore.t('toaster.viewErrorText'));
-      }
     };
 
     onMounted(async () => {

package/components/Pages/Auth.vue

@@ -26,7 +26,7 @@
       <v-form ref="vForm" class="w-2/3 lg:w-[25vw] self-center">
         <base-rounded-input
           class="mb-1"
-          v-model="login"
+          v-model.trim="login"
           :rules="$rules.required"
           :loading="authLoading"
           :placeholder="$t('buttons.userLogin')"
@@ -35,7 +35,7 @@
         ></base-rounded-input>
         <base-rounded-input
           class="mb-1"
-          v-model="password"
+          v-model.trim="password"
           :rules="$rules.required"
           :loading="authLoading"
           :placeholder="$t('buttons.password')"
@@ -64,7 +64,7 @@
       <v-form ref="vForm" class="w-2/3 lg:w-[25vw] self-center">
         <base-rounded-input
           v-if="resetPasswordType === 'phone'"
-          v-model="phone"
+          v-model.trim="phone"
           :maska="$maska.phone"
           :rules="$rules.required.concat($rules.phoneFormat)"
           :loading="authLoading"
@@ -74,7 +74,7 @@
         ></base-rounded-input>
         <base-rounded-input
           v-if="resetPasswordType === 'email'"
-          v-model="email"
+          v-model.trim="email"
           :rules="$rules.required.concat($rules.email)"
           :loading="authLoading"
           :placeholder="$t('form.email')"

package/components/Pages/MemberForm.vue

@@ -49,25 +49,25 @@
           :rules="$rules.required.concat($rules.iinRight)"
         ></base-form-input>
         <base-form-input
-          v-model="member.lastName"
+          v-model.trim="member.lastName"
           :readonly="isDisabled || isFromGBD"
           :clearable="!isDisabled"
           :label="$t('form.lastName')"
           :rules="$rules.required.concat($rules.cyrillic)"
         ></base-form-input>
         <base-form-input
-          v-model="member.firstName"
+          v-model.trim="member.firstName"
           :readonly="isDisabled || isFromGBD"
           :clearable="!isDisabled"
           :label="$t('form.firstName')"
           :rules="$rules.required.concat($rules.cyrillic)"
         ></base-form-input>
         <base-form-input
-          v-model="member.middleName"
+          v-model.trim="member.middleName"
           :readonly="isDisabled || isFromGBD"
           :clearable="!isDisabled"
           :label="$t('form.middleName')"
-          :rules="$rules.required.concat($rules.cyrillic)"
+          :rules="$rules.cyrillicNonRequired"
         ></base-form-input>
         <base-form-input
           v-model="member.birthDate"
@@ -90,6 +90,7 @@
           @append="openPanel($t('form.gender'), $dataStore.gender, 'gender')"
         ></base-panel-input>
         <base-panel-input
+          v-if="hasFamilyStatus"
           v-model="member.familyStatus"
           :value="member.familyStatus.nameRu"
           :readonly="isDisabled"
@@ -113,8 +114,8 @@
         <base-form-input
           v-if="whichForm === formStore.beneficiaryFormKey"
           v-model="member.percentageOfPayoutAmount"
-          :readonly="isDisabled"
-          :clearable="!isDisabled"
+          :readonly="memberSetting.isMultiple === false ? true : isDisabled"
+          :clearable="memberSetting.isMultiple === false ? false : !isDisabled"
           :label="$t('form.percentageOfPayoutAmount')"
           :rules="$rules.required.concat($rules.numbers)"
         ></base-form-input>
@@ -122,35 +123,35 @@
       </base-form-section>
       <base-form-section :title="$t('policyholdersRepresentative.PowerOfAttorney')" v-if="whichForm === formStore.policyholdersRepresentativeFormKey">
         <base-form-input
-          v-model="member.fullNameRod"
+          v-model.trim="member.fullNameRod"
           :label="$t('policyholdersRepresentative.NameParentCase')"
           :readonly="isDisabled"
           :clearable="!isDisabled"
           :rules="$rules.required"
         ></base-form-input>
         <base-form-input
-          v-model="member.confirmDocTypeKz"
+          v-model.trim="member.confirmDocTypeKz"
           :label="$t('policyholdersRepresentative.basisDocKz')"
           :readonly="isDisabled"
           :clearable="!isDisabled"
           :rules="$rules.required"
         ></base-form-input>
         <base-form-input
-          v-model="member.confirmDocType"
+          v-model.trim="member.confirmDocType"
           :label="$t('policyholdersRepresentative.basisDocRu')"
           :readonly="isDisabled"
           :clearable="!isDisabled"
           :rules="$rules.required"
         ></base-form-input>
         <base-form-input
-          v-model="member.confirmDocTypeRod"
+          v-model.trim="member.confirmDocTypeRod"
           :label="$t('policyholdersRepresentative.basisDocRuParentCase')"
           :readonly="isDisabled"
           :clearable="!isDisabled"
           :rules="$rules.required"
         ></base-form-input>
         <base-form-input
-          v-model="member.confirmDocNumber"
+          v-model.trim="member.confirmDocNumber"
           :label="$t('policyholdersRepresentative.numberDoc')"
           :readonly="isDisabled"
           :clearable="!isDisabled"
@@ -174,7 +175,7 @@
           :maska="$maska.date"
           append-inner-icon="mdi mdi-calendar-blank-outline"
         ></base-form-input>
-        <base-form-input v-model="member.migrationCard" :label="$t('policyholdersRepresentative.numberVisa')"></base-form-input>
+        <base-form-input v-model.trim="member.migrationCard" :label="$t('policyholdersRepresentative.numberVisa')"></base-form-input>
         <base-form-input
           v-model="member.migrationCardIssueDate"
           :label="$t('form.documentDate')"
@@ -200,21 +201,21 @@
           :title="$t('policyholdersRepresentative.confirmAuthority')"
         ></base-form-toggle>
         <base-form-input
-          v-model="member.notaryLongName"
+          v-model.trim="member.notaryLongName"
           :label="$t('policyholdersRepresentative.name')"
           :readonly="isDisabled"
           :clearable="!isDisabled"
           :rules="formStore.policyholdersRepresentativeForm.isNotary ? $rules.required : []"
         ></base-form-input>
         <base-form-input
-          v-model="member.notaryLicenseNumber"
+          v-model.trim="member.notaryLicenseNumber"
           :label="$t('policyholdersRepresentative.numberLicense')"
           :readonly="isDisabled"
           :clearable="!isDisabled"
           :rules="formStore.policyholdersRepresentativeForm.isNotary ? $rules.required : []"
         ></base-form-input>
         <base-form-input
-          v-model="member.notaryLicenseIssuer"
+          v-model.trim="member.notaryLicenseIssuer"
           :label="$t('policyholdersRepresentative.documentIssuers')"
           :readonly="isDisabled"
           :clearable="!isDisabled"
@@ -231,9 +232,9 @@
         ></base-form-input>
       </base-form-section>
       <base-form-section :title="$t('form.jobData')" v-if="$dataStore.hasJobSection(whichForm)">
-        <base-form-input v-model="member.job" :label="$t('form.job')" :readonly="isDisabled" :clearable="!isDisabled" :rules="$rules.required"></base-form-input>
-        <base-form-input v-model="member.jobPosition" :label="$t('form.jobPosition')" :readonly="isDisabled" :clearable="!isDisabled" :rules="$rules.required"></base-form-input>
-        <base-form-input v-model="member.jobPlace" :label="$t('form.jobPlace')" :readonly="isDisabled" :clearable="!isDisabled" :rules="$rules.required"></base-form-input>
+        <base-form-input v-model.trim="member.job" :label="$t('form.job')" :readonly="isDisabled" :clearable="!isDisabled" :rules="$rules.required"></base-form-input>
+        <base-form-input v-model.trim="member.jobPosition" :label="$t('form.jobPosition')" :readonly="isDisabled" :clearable="!isDisabled" :rules="$rules.required"></base-form-input>
+        <base-form-input v-model.trim="member.jobPlace" :label="$t('form.jobPlace')" :readonly="isDisabled" :clearable="!isDisabled" :rules="$rules.required"></base-form-input>
       </base-form-section>
       <base-form-section :title="$t('form.placeRegistration')" v-if="$dataStore.hasPlaceSection(whichForm)">
         <base-form-toggle
@@ -298,23 +299,23 @@
             ></base-panel-input>
             <!-- <base-form-input v-if="$dataStore.isGons" v-model="member.postIndex" :readonly="isDisabled"
           :clearable="!isDisabled" :label="$t('form.postIndex')" :maska="$maska.post"></base-form-input> -->
-            <base-form-input v-model="member.registrationQuarter" :readonly="isDisabled" :clearable="!isDisabled" :label="$t('form.Quarter')"></base-form-input>
-            <base-form-input v-model="member.registrationMicroDistrict" :readonly="isDisabled" :clearable="!isDisabled" :label="$t('form.MicroDistrict')"></base-form-input>
+            <base-form-input v-model.trim="member.registrationQuarter" :readonly="isDisabled" :clearable="!isDisabled" :label="$t('form.Quarter')"></base-form-input>
+            <base-form-input v-model.trim="member.registrationMicroDistrict" :readonly="isDisabled" :clearable="!isDisabled" :label="$t('form.MicroDistrict')"></base-form-input>
             <base-form-input
-              v-model="member.registrationStreet"
+              v-model.trim="member.registrationStreet"
               :rules="$rules.required"
               :readonly="isDisabled"
               :clearable="!isDisabled"
               :label="$t('form.Street')"
             ></base-form-input>
             <base-form-input
-              v-model="member.registrationNumberHouse"
+              v-model.trim="member.registrationNumberHouse"
               :rules="$rules.required"
               :readonly="isDisabled"
               :clearable="!isDisabled"
               :label="$t('form.NumberHouse')"
             ></base-form-input>
-            <base-form-input v-model="member.registrationNumberApartment" :readonly="isDisabled" :clearable="!isDisabled" :label="$t('form.NumberApartment')"></base-form-input>
+            <base-form-input v-model.trim="member.registrationNumberApartment" :readonly="isDisabled" :clearable="!isDisabled" :label="$t('form.NumberApartment')"></base-form-input>
           </div>
         </base-fade-transition>
       </base-form-section>
@@ -353,7 +354,7 @@
           @append="openPanel($t('form.documentType'), [], 'documentType', $dataStore.getDocumentTypes)"
         ></base-panel-input>
         <base-form-input
-          v-model="member.documentNumber"
+          v-model.trim="member.documentNumber"
           :label="$t('form.documentNumber')"
           :readonly="isDisabled"
           :clearable="!isDisabled"
@@ -458,6 +459,17 @@
           append-inner-icon="mdi mdi-chevron-right"
           @append="openPanel($t('form.economySectorCode'), [], 'economySectorCode', $dataStore.getSectorCodeList)"
         ></base-panel-input>
+        <base-panel-input
+          v-if="hasInsurancePay"
+          v-model="member.insurancePay"
+          :value="member.insurancePay.nameRu"
+          :readonly="isDisabled"
+          :clearable="!isDisabled"
+          :rules="$rules.objectRequired"
+          :label="$t('form.insurancePay')"
+          append-inner-icon="mdi mdi-chevron-right"
+          @append="openPanel($t('form.insurancePay'), $dataStore.insurancePay, 'insurancePay', $dataStore.getInsurancePay)"
+        ></base-panel-input>
       </base-form-section>
       <base-form-section :title="$t('form.contactsData')" v-if="$dataStore.hasContactSection(whichForm)">
         <base-form-input
@@ -636,6 +648,23 @@ export default {
       return dataStore.controls.hasGKB && !!dataStore.isTask() && perMemberCondition();
     });
 
+    const hasFamilyStatus = computed(() => {
+      if (whichForm.value === formStore.beneficiaryFormKey) {
+        if (dataStore.isBolashak) {
+          return false;
+        }
+      }
+      return true;
+    });
+    const hasInsurancePay = computed(() => {
+      if (whichForm.value === formStore.beneficiaryFormKey) {
+        if (dataStore.isBolashak || dataStore.isLiferenta) {
+          return true;
+        }
+      }
+      return false;
+    });
+
     const birthDateRule = computed(() => {
       const baseDateRule = dataStore.rules.required.concat(dataStore.rules.birthDate);
       const byMemverAndProductRule = () => {
@@ -1216,15 +1245,21 @@ export default {
     watch(
       () => member.value.percentageOfPayoutAmount,
       val => {
-        if (isChangingMember.value === false) {
+        if (whichForm.value === formStore.beneficiaryFormKey && !isDisabled.value) {
           const percentage = typeof val === 'string' ? Number(val) : val;
-          if (percentage) {
-            if (percentage < 0) {
-              member.value.percentageOfPayoutAmount = 0;
-              dataStore.showToaster('error', dataStore.t('toaster.incorrectInput'), 1000);
-            } else if (percentage > 100) {
-              member.value.percentageOfPayoutAmount = 100;
-              dataStore.showToaster('error', dataStore.t('toaster.incorrectInput'), 1000);
+          if (typeof percentage === 'number') {
+            if (memberSetting.value.isMultiple) {
+              if (percentage < 0) {
+                member.value.percentageOfPayoutAmount = 0;
+                dataStore.showToaster('error', dataStore.t('toaster.incorrectInput'), 1000);
+              } else if (percentage > 100) {
+                member.value.percentageOfPayoutAmount = 100;
+                dataStore.showToaster('error', dataStore.t('toaster.incorrectInput'), 1000);
+              }
+            } else {
+              if (member.value.percentageOfPayoutAmount !== 100) {
+                member.value.percentageOfPayoutAmount = 100;
+              }
             }
           }
         }
@@ -1234,7 +1269,7 @@ export default {
     watch(
       () => member.value.birthDate,
       val => {
-        if (val && val.length === useMask().date.length && isChangingMember.value === false) {
+        if (val && val.length === useMask().date.length) {
           const calculatedAge = member.value.getAgeByBirthDate();
           if (calculatedAge) member.value.age = calculatedAge;
         }
@@ -1315,6 +1350,8 @@ export default {
       hasGBDFL,
       hasInsis,
       hasGKB,
+      hasFamilyStatus,
+      hasInsurancePay,
 
       // Rules
       ageRule,

package/components/Pages/ProductConditions.vue

@@ -13,6 +13,30 @@
           subtitle="Если несовершеннолетний не достиг возраста 14 лет - законному представителю в соответствии с законодательством Республики Казахстан"
         ></base-form-text-section>
       </base-form-section>
+      <base-form-section v-if="isUnderwriterRole && $dataStore.hasClientAnketa && $dataStore.isClientAnketaCondition" :title="$t('policyholderForm')">
+        <base-form-input
+          v-model="productConditionsForm.lifeMultiplyClient"
+          :maska="$maska.numbers"
+          :clearable="isRecalculationDisabled === false"
+          :label="$t('percent') + `Life Multiply`"
+          :readonly="isRecalculationDisabled"
+          :rules="$dataStore.rules.recalculationMultiply"
+        ></base-form-input>
+        <base-form-input
+          v-model="productConditionsForm.lifeAdditiveClient"
+          :maska="$maska.numbers"
+          :clearable="isRecalculationDisabled === false"
+          :label="$t('percent') + `Life Additive`"
+          :readonly="isRecalculationDisabled"
+          :rules="$dataStore.rules.recalculationAdditive"
+        ></base-form-input>
+        <base-form-input v-model="formStore.policyholderForm.longName" :label="$t('labels.policyholderLongName')" :readonly="true"> </base-form-input>
+        <base-form-input v-model="formStore.policyholderForm.job" :label="$t('form.job')" :readonly="true"> </base-form-input>
+        <base-form-input v-model="formStore.policyholderForm.jobPosition" :label="$t('form.jobPosition')" :readonly="true"> </base-form-input>
+        <base-form-input v-model="formStore.policyholderForm.birthDate" :label="$t('form.birthDate')" :readonly="true"> </base-form-input>
+        <base-form-input v-model="formStore.policyholderForm.age" :label="$t('form.age')" :readonly="true"> </base-form-input>
+        <base-form-input v-model="formStore.policyholderForm.gender.nameRu" class="mb-4" :label="$t('form.gender')" :readonly="true"> </base-form-input>
+      </base-form-section>
       <base-form-section v-if="isUnderwriterRole && $dataStore.members.insuredApp.has === true" :title="$t('insuredForm')">
         <div v-for="(insured, index) of formStore.insuredForm" :key="index">
           <base-form-input v-model="insured.longName" :label="$t('labels.insurerLongName')" :readonly="true"> </base-form-input>
@@ -208,7 +232,11 @@
           v-model="productConditionsForm.guaranteedPeriod"
           :readonly="isDisabled"
           :clearable="!isDisabled"
-          :rules="productConditionsForm.termAnnuityPayments ? [$dataStore.rules.guaranteedPeriodLimit(productConditionsForm.guaranteedPeriod, productConditionsForm.termAnnuityPayments)] : []"
+          :rules="
+            productConditionsForm.termAnnuityPayments
+              ? [$dataStore.rules.guaranteedPeriodLimit(productConditionsForm.guaranteedPeriod, productConditionsForm.termAnnuityPayments)]
+              : []
+          "
           :label="$t('productConditionsForm.guaranteedPeriod')"
         ></base-form-input>
         <base-panel-input
@@ -237,7 +265,9 @@
           :rules="$rules.objectRequired"
           :label="$t('productConditionsForm.periodAnnuityPayment')"
           append-inner-icon="mdi mdi-chevron-right"
-          @append="openPanel($t('productConditionsForm.processPaymentPeriod'), $dataStore.processAnnuityPaymentPeriod, 'periodAnnuityPayment', $dataStore.getProcessAnnuityPaymentPeriod)"
+          @append="
+            openPanel($t('productConditionsForm.processPaymentPeriod'), $dataStore.processAnnuityPaymentPeriod, 'periodAnnuityPayment', $dataStore.getProcessAnnuityPaymentPeriod)
+          "
         ></base-panel-input>
         <base-form-input
           v-model="productConditionsForm.amountAnnuityPayments"
@@ -250,6 +280,7 @@
       <base-form-section v-if="additionalTerms && additionalTerms.length" :title="$t('productConditionsForm.additional')">
         <div v-for="(term, index) of additionalTerms" :key="index">
           <base-panel-input
+            v-if="filterTermConditions(term)"
             v-model="additionalTerms[index]"
             :value="term.coverSumName"
             :readonly="isDisabled"
@@ -275,7 +306,7 @@
     </div>
     <Teleport v-if="isPanelOpen" to="#panel-actions">
       <div :class="[$libStyles.scrollPage]" class="flex flex-col items-center">
-        <base-rounded-input v-model="searchQuery" :label="$t('labels.search')" class="w-full p-2" :hide-details="true"></base-rounded-input>
+        <base-rounded-input v-model.trim="searchQuery" :label="$t('labels.search')" class="w-full p-2" :hide-details="true"></base-rounded-input>
         <div v-if="panelList && isPanelLoading === false" class="w-full flex flex-col gap-2 p-2">
           <base-panel-select-item :text="$t('form.notChosen')" :selected="panelValue.nameRu === null" @click="pickPanelValue(new Value())"></base-panel-select-item>
           <base-panel-select-item
@@ -291,7 +322,7 @@
     </Teleport>
     <Teleport v-if="isTermsPanelOpen" to="#panel-actions">
       <div :class="[$libStyles.scrollPage]" class="flex flex-col items-center">
-        <base-rounded-input v-model="searchQuery" :label="$t('labels.search')" class="w-full p-2" :hide-details="true"></base-rounded-input>
+        <base-rounded-input v-model.trim="searchQuery" :label="$t('labels.search')" class="w-full p-2" :hide-details="true"></base-rounded-input>
         <div v-if="panelList && isPanelLoading === false" class="w-full flex flex-col gap-2 p-2">
           <base-panel-select-item
             v-for="(item, index) of panelList.filter(i => i.nameRu && (i.nameRu as string).match(new RegExp(searchQuery, 'i')))"
@@ -498,7 +529,7 @@ export default defineComponent({
     };
 
     const filterList = (list: Value[], key: string) => {
-      if (dataStore.isBaiterek) {
+      if (whichProduct.value === 'baiterek') {
         if (dataStore.isManagerHalykBank()) {
           if (key === 'paymentPeriod') return list.filter(i => i.code !== 'single');
         }
@@ -615,6 +646,13 @@ export default defineComponent({
       productConditionsForm.insurancePremiumPerMonthInDollar = null;
     };
 
+    const filterTermConditions = (term: AddCover) => {
+      if (term.coverTypeCode === 10) {
+        return !!formStore.insuredForm.find(member => member.iin === formStore.policyholderForm.iin) === false;
+      }
+      return true;
+    };
+
     const submitForm = async () => {
       vForm.value.validate().then(async (v: { valid: Boolean; errors: any }) => {
         if (v.valid) {
@@ -642,6 +680,8 @@ export default defineComponent({
             type recalculationInfo = {
               lifeMultiply: string | null;
               lifeAdditive: string | null;
+              lifeMultiplyClient?: number | null;
+              lifeAdditiveClient?: number | null;
               adbMultiply: string | null;
               adbAdditive: string | null;
               disabilityMultiply: string | null;
@@ -662,6 +702,16 @@ export default defineComponent({
               // @ts-ignore
               recalculationData[key] = formatProcents(recalculationData[key]);
             });
+            recalculationData.lifeMultiplyClient = dataStore.isClientAnketaCondition
+              ? formStore.productConditionsForm.lifeMultiplyClient === null
+                ? null
+                : formatProcents(formStore.productConditionsForm.lifeMultiplyClient)
+              : null;
+            recalculationData.lifeAdditiveClient = dataStore.isClientAnketaCondition
+              ? formStore.productConditionsForm.lifeAdditiveClient === null
+                ? null
+                : formatProcents(formStore.productConditionsForm.lifeAdditiveClient)
+              : null;
             recalculationData.amount = Number((productConditionsForm.requestedSumInsured as string)?.replace(/\s/g, ''));
             recalculationData.premium = Number((productConditionsForm.insurancePremiumPerMonth as string)?.replace(/\s/g, ''));
             recalculationData.riskGroup = productConditionsForm.riskGroup?.id ? productConditionsForm.riskGroup.id : 1;
@@ -858,6 +908,7 @@ export default defineComponent({
       onClearPremiumDollar,
       clearFields,
       formatTermValue,
+      filterTermConditions,
     };
   },
 });

package/components/Panel/PanelHandler.vue

@@ -2,7 +2,7 @@
   <section v-if="sendingActions">
     <div :class="[$libStyles.flexColNav]">
       <v-form ref="vForm">
-        <base-rounded-input v-model="actionCause" placeholder="Причина" :rules="$rules.required"></base-rounded-input>
+        <base-rounded-input v-model.trim="actionCause" placeholder="Причина" :rules="$rules.required"></base-rounded-input>
       </v-form>
       <base-btn :text="buttonText" :loading="loading" @click="submitForm"></base-btn>
     </div>
@@ -93,7 +93,7 @@
     <div :class="[$libStyles.flexColNav]">
       <v-form ref="vForm">
         <base-content-block class="flex flex-col gap-3">
-          <base-form-input v-model="formStore.affilationResolution.number" :rules="$rules.required" :label="$t('form.documentNumber')"></base-form-input>
+          <base-form-input v-model.trim="formStore.affilationResolution.number" :rules="$rules.required" :label="$t('form.documentNumber')"></base-form-input>
           <base-form-input
             v-model="formStore.affilationResolution.date"
             :maska="$maska.date"

package/composables/classes.ts

@@ -899,6 +899,7 @@ export class DataStoreClass {
   documentIssuers: Value[];
   familyStatuses: Value[];
   relations: Value[];
+  insurancePay: Value[];
   questionRefs: Value[];
   residents: Value[];
   ipdl: Value[];
@@ -1040,6 +1041,7 @@ export class DataStoreClass {
     this.documentIssuers = [];
     this.familyStatuses = [];
     this.relations = [];
+    this.insurancePay = [];
     this.residents = [];
     this.ipdl = [new Value(1, null), new Value(2, 'Да'), new Value(3, 'Нет')];
     this.economySectorCode = [];
@@ -1119,12 +1121,16 @@ export class FormStoreClass {
   };
   signedDocumentList: IDocument[];
   surveyByHealthBase: AnketaFirst | null;
+  surveyByHealthBasePolicyholder: AnketaFirst | null;
   surveyByCriticalBase: AnketaFirst | null;
+  surveyByCriticalBasePolicyholder: AnketaFirst | null;
   surveyByHealthSecond: AnketaSecond[] | null;
   surveyByCriticalSecond: AnketaSecond[] | null;
   definedAnswersId: {
     surveyByHealthBase: any;
     surveyByCriticalBase: any;
+    surveyByHealthBasePolicyholder: any;
+    surveyByCriticalBasePolicyholder: any;
   };
   birthInfos: BirthInfoGKB[];
   SaleChanellPolicy: Value;
@@ -1199,12 +1205,16 @@ export class FormStoreClass {
     };
     this.signedDocumentList = [];
     this.surveyByHealthBase = null;
+    this.surveyByHealthBasePolicyholder = null;
     this.surveyByCriticalBase = null;
+    this.surveyByCriticalBasePolicyholder = null;
     this.surveyByHealthSecond = null;
     this.surveyByCriticalSecond = null;
     this.definedAnswersId = {
       surveyByHealthBase: {},
       surveyByCriticalBase: {},
+      surveyByHealthBasePolicyholder: {},
+      surveyByCriticalBasePolicyholder: {},
     };
     this.birthInfos = [];
     this.SaleChanellPolicy = new Value();

package/locales/en.json

@@ -453,6 +453,7 @@
     "iin&bin": "IIN/BIN",
     "insurerIin": "Insured IIN",
     "insurerLongName": "Insured Full Name",
+    "policyholderLongName": "Policyholder Full Name",
     "jsonObject": "JSON value",
     "epayPage": "ePay page"
   },
@@ -572,7 +573,8 @@
     "salesChanell": "Sales Channel",
     "manager": "Manager",
     "attachManager": "Manager",
-    "agent": "Agent"
+    "agent": "Agent",
+    "insurancePay": "Insurance payment is subject to implementation"
   },
   "agreementBlock": {
     "title": "Consent to the collection and processing of personal data",

package/locales/kz.json

@@ -453,6 +453,7 @@
     "iin&bin": "ІИН/БИН",
     "insurerIin": "Cақтанушының ІИН",
     "insurerLongName": "Cақтанушының толық аты-жөні",
+    "policyholderLongName": "Cақтандырушының толық аты-жөні",
     "jsonObject": "JSON мәні",
     "epayPage": "ePay беті"
   },
@@ -572,7 +573,8 @@
     "salesChanell": "Сатып алу каналы",
     "manager": "Менеджер",
     "attachManager": "Менеджерге байланысу",
-    "agent": "Агент"
+    "agent": "Агент",
+    "insurancePay": "Сақтандыру төлемі жүзеге асырылуға жатады"
   },
   "agreementBlock": {
     "title": "Жеке деректерді топтай жинау мен өңдеу туралы келісім",

package/locales/ru.json

@@ -198,7 +198,8 @@
     "timer": "Вы создали счет на оплату, через 00:59 сек счет станет не активным"
   },
   "questionnaireType": {
-    "byHealth": "Анкета по здоровью застрахованного",
+    "byHealth": "Анкета по здоровью Застрахованного",
+    "byHealthPolicyholder": "Анкета по здоровью Страхователя",
     "byCritical": "Анкета по критической болезни Застрахованного",
     "answerAllNo": "Ответить везде \"Нет\"",
     "pleaseAnswer": "Пожалуйста ответьте на {text} вопросов"
@@ -453,6 +454,7 @@
     "iin&bin": "ИИН/БИН",
     "insurerIin": "ИИН застрахованного",
     "insurerLongName": "ФИО застрахованного",
+    "policyholderLongName": "ФИО страхователя",
     "jsonObject": "JSON значение",
     "epayPage": "Страница на ePay"
   },
@@ -573,7 +575,8 @@
     "salesChanell": " Канал продаж",
     "manager": "Менеджер",
     "attachManager": "Менеджер",
-    "agent": "Агент"
+    "agent": "Агент",
+    "insurancePay": "Страховая выплата подлежит осуществлению"
   },
   "agreementBlock": {
     "title": "Согласие на сбор и обработку пресональных данных",

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "hl-core",
-  "version": "0.0.8-beta.29",
+  "version": "0.0.8-beta.30",
   "license": "MIT",
   "private": false,
   "main": "nuxt.config.ts",

package/store/data.store.js

@@ -45,6 +45,10 @@ export const useDataStore = defineStore('data', {
     isCalculator: state => state.product === 'calculator',
     isComplianceWindow: state => state.product === 'compliance',
     isEveryFormDisabled: state => Object.values(state.formStore.isDisabled).every(i => i === true),
+    hasClientAnketa: state => state.formStore.additionalInsuranceTerms.find(i => i.coverTypeCode === 10),
+    isClientAnketaCondition: state =>
+      !state.formStore.insuredForm.find(member => member.iin === state.formStore.policyholderForm.iin) &&
+      !!state.formStore.additionalInsuranceTerms.find(i => i.coverTypeCode === 10 && i.coverSumCode === 'included'),
   },
   actions: {
     isIframe() {
@@ -511,7 +515,7 @@ export const useDataStore = defineStore('data', {
           if (contact.type === 'EMAIL' && contact.value) {
             member.email = contact.value;
           }
-          if (contact.type === 'MOBILE' && contact.value) {
+          if (contact.type === 'MOBILE' && contact.value && !member.phoneNumber) {
             let phoneNumber = contact.value.substring(1);
             member.phoneNumber = `+7 (${phoneNumber.slice(0, 3)}) ${phoneNumber.slice(3, 6)} ${phoneNumber.slice(6, 8)} ${phoneNumber.slice(8)}`;
           }
@@ -825,15 +829,9 @@ export const useDataStore = defineStore('data', {
           data.isNotary = member.isNotary;
         }
         if (whichMember === 'Insured') {
-          if (
-            this.formStore.applicationData &&
-            this.formStore.applicationData.insuredApp &&
-            this.formStore.applicationData.insuredApp.length 
-          ) {
+          if (this.formStore.applicationData && this.formStore.applicationData.insuredApp && this.formStore.applicationData.insuredApp.length) {
             await this.deleteInsuredLogic();
-            if(
-              this.formStore.applicationData.insuredApp.every(i => i.iin !== data.iin) &&
-              data.id !== null) {
+            if (this.formStore.applicationData.insuredApp.every(i => i.iin !== data.iin) && data.id !== null) {
               await this.api.deleteMember('Insured', data.id);
               delete data.id;
             }
@@ -862,6 +860,9 @@ export const useDataStore = defineStore('data', {
           data.percentage = Number(member.percentageOfPayoutAmount);
           data.relationId = member.relationDegree.ids;
           data.relationName = member.relationDegree.nameRu;
+          if (this.isLiferenta || this.isBolashak) {
+            data.beneficiaryInsurancePayId = member.insurancePay.id;
+          }
         }
         if (whichMember === 'BeneficialOwner') {
           if (data.id === 0) {
@@ -1066,6 +1067,9 @@ export const useDataStore = defineStore('data', {
     async getProcessAnnuityPaymentPeriod() {
       return await this.getFromApi('processAnnuityPaymentPeriod', 'getProcessAnnuityPaymentPeriod', this.processCode);
     },
+    async getInsurancePay() {
+      return await this.getFromApi('insurancePay', 'getInsurancePay');
+    },
     async getCurrencies() {
       try {
         const currencies = await this.api.getCurrencies();
@@ -1083,15 +1087,25 @@ export const useDataStore = defineStore('data', {
         console.log(err);
       }
     },
-    async getQuestionList(surveyType, processInstanceId, insuredId, baseField, secondaryField) {
+    async getQuestionList(surveyType, processInstanceId, insuredId, baseField, secondaryField, whichMember = 'insured') {
       if (!this.formStore[baseField] || (this.formStore[baseField] && !this.formStore[baseField].length)) {
         try {
-          const [{ value: baseQuestions }, { value: secondaryQuestions }] = await Promise.allSettled([
-            this.api.getQuestionList(surveyType, processInstanceId, insuredId),
-            this.api.getQuestionListSecond(`${surveyType}second`, processInstanceId, insuredId),
-          ]);
-          this.formStore[baseField] = baseQuestions;
-          this.formStore[secondaryField] = secondaryQuestions;
+          if (whichMember === 'insured') {
+            const [{ value: baseQuestions }, { value: secondaryQuestions }] = await Promise.allSettled([
+              this.api.getQuestionList(surveyType, processInstanceId, insuredId),
+              this.api.getQuestionListSecond(`${surveyType}second`, processInstanceId, insuredId),
+            ]);
+            this.formStore[baseField] = baseQuestions;
+            this.formStore[secondaryField] = secondaryQuestions;
+          }
+          if (whichMember === 'policyholder') {
+            const [{ value: baseQuestions }, { value: secondaryQuestions }] = await Promise.allSettled([
+              this.api.getClientQuestionList(surveyType, processInstanceId, insuredId),
+              this.api.getClientQuestionListSecond(`${surveyType}second`, processInstanceId, insuredId),
+            ]);
+            this.formStore[baseField] = baseQuestions;
+            this.formStore[secondaryField] = secondaryQuestions;
+          }
         } catch (err) {
           console.log(err);
         }
@@ -1194,6 +1208,7 @@ export const useDataStore = defineStore('data', {
         this.getDicFileTypeList(),
         this.getDicAnnuityTypeList(),
         this.getProcessAnnuityPaymentPeriod(),
+        this.getInsurancePay(),
         this.getDictionaryItems('RegionPolicy'),
         this.getDictionaryItems('SaleChanellPolicy'),
       ]);
@@ -1329,7 +1344,7 @@ export const useDataStore = defineStore('data', {
         this.formStore.definedAnswersId[whichSurvey][filter] = await this.api.definedAnswers(filter);
       }
       if (value !== null && this.formStore.definedAnswersId[whichSurvey][filter].length) {
-        const answer = this.formStore.definedAnswersId[whichSurvey][filter].find(answer => answer.nameRu === value);
+        const answer = this.formStore.definedAnswersId[whichSurvey][filter].find(answer => answer.nameRu.match(new RegExp(value, 'i')));
         this.formStore[whichSurvey].body[index].first.answerId = answer.ids;
       }
       return this.formStore.definedAnswersId[whichSurvey];
@@ -1378,6 +1393,7 @@ export const useDataStore = defineStore('data', {
     },
     async clearAddCovers(coverCode, coverValue) {
       if (!coverCode || !coverValue) return;
+      const applicationData = this.getConditionsData();
       const termCoverIndex = applicationData.addCoversDto.findIndex(i => i.coverTypeCode === coverCode);
       if (termCoverIndex !== -1) {
         const answers = await this.getAdditionalInsuranceTermsAnswers(applicationData.addCoversDto[termCoverIndex].coverTypeId);
@@ -1656,6 +1672,10 @@ export const useDataStore = defineStore('data', {
               const relationDegree = this.relations.find(i => i.ids == each.relationId);
               this.formStore.beneficiaryForm[index].relationDegree = relationDegree ? relationDegree : new Value();
               this.formStore.beneficiaryForm[index].percentageOfPayoutAmount = each.percentage;
+              if (this.isLiferenta || this.isBolashak) {
+                const insurancePay = this.insurancePay.find(i => i.id == each.beneficiaryInsurancePayId);
+                this.formStore.beneficiaryForm[index].insurancePay = insurancePay ? insurancePay : new Value();
+              }
             });
           }
 
@@ -1691,6 +1711,8 @@ export const useDataStore = defineStore('data', {
           // this.formStore.productConditionsForm.annualIncome = applicationData.policyAppDto.annualIncome?.toString();
           this.formStore.productConditionsForm.lifeMultiply = parseProcents(applicationData.policyAppDto.lifeMultiply);
           this.formStore.productConditionsForm.lifeAdditive = parseProcents(applicationData.policyAppDto.lifeAdditive);
+          this.formStore.productConditionsForm.lifeMultiplyClient = parseProcents(applicationData.policyAppDto.lifeMultiplyClient);
+          this.formStore.productConditionsForm.lifeAdditiveClient = parseProcents(applicationData.policyAppDto.lifeAdditiveClient);
           this.formStore.productConditionsForm.adbMultiply = parseProcents(applicationData.policyAppDto.adbMultiply);
           this.formStore.productConditionsForm.adbAdditive = parseProcents(applicationData.policyAppDto.adbAdditive);
           this.formStore.productConditionsForm.disabilityMultiply = parseProcents(applicationData.policyAppDto.disabilityMultiply);
@@ -2171,7 +2193,7 @@ export const useDataStore = defineStore('data', {
       if (areMembersValid) {
         if (!!this.formStore.productConditionsForm.insurancePremiumPerMonth && !!this.formStore.productConditionsForm.requestedSumInsured) {
           const hasCritical = this.formStore.additionalInsuranceTerms?.find(cover => cover.coverTypeName === 'Критическое заболевание Застрахованного');
-          if (hasCritical && hasCritical.coverSumName !== 'не включено') {
+          if (hasCritical && hasCritical.coverSumName.match(new RegExp('не включено', 'i'))) {
             await Promise.allSettled([
               this.getQuestionList(
                 'health',
@@ -2187,15 +2209,36 @@ export const useDataStore = defineStore('data', {
                 'surveyByCriticalBase',
                 'surveyByCriticalSecond',
               ),
+              this.isClientAnketaCondition &&
+                this.getQuestionList(
+                  'health',
+                  this.formStore.applicationData.processInstanceId,
+                  this.formStore.applicationData.clientApp.id,
+                  'surveyByHealthBasePolicyholder',
+                  'surveyByHealthSecond',
+                  'policyholder',
+                ),
             ]);
-            await Promise.allSettled([
-              ...this.formStore.surveyByHealthBase.body.map(async question => {
-                await this.definedAnswers(question.first.id, 'surveyByHealthBase');
-              }),
-              ...this.formStore.surveyByCriticalBase.body.map(async question => {
-                await this.definedAnswers(question.first.id, 'surveyByCriticalBase');
-              }),
-            ]);
+            this.isClientAnketaCondition
+              ? await Promise.allSettled([
+                  ...this.formStore.surveyByHealthBase.body.map(async question => {
+                    await this.definedAnswers(question.first.id, 'surveyByHealthBase');
+                  }),
+                  ...this.formStore.surveyByCriticalBase.body.map(async question => {
+                    await this.definedAnswers(question.first.id, 'surveyByCriticalBase');
+                  }),
+                  ...this.formStore.surveyByHealthBasePolicyholder.body.map(async question => {
+                    await this.definedAnswers(question.first.id, 'surveyByHealthBasePolicyholder');
+                  }),
+                ])
+              : await Promise.allSettled([
+                  ...this.formStore.surveyByHealthBase.body.map(async question => {
+                    await this.definedAnswers(question.first.id, 'surveyByHealthBase');
+                  }),
+                  ...this.formStore.surveyByCriticalBase.body.map(async question => {
+                    await this.definedAnswers(question.first.id, 'surveyByCriticalBase');
+                  }),
+                ]);
           } else {
             await Promise.allSettled([
               this.getQuestionList(
@@ -2205,14 +2248,32 @@ export const useDataStore = defineStore('data', {
                 'surveyByHealthBase',
                 'surveyByHealthSecond',
               ),
+              this.isClientAnketaCondition &&
+                this.getQuestionList(
+                  'health',
+                  this.formStore.applicationData.processInstanceId,
+                  this.formStore.applicationData.clientApp.id,
+                  'surveyByHealthBasePolicyholder',
+                  'surveyByHealthSecond',
+                  'policyholder',
+                ),
+              ,
             ]);
-            await Promise.allSettled(
-              this.formStore.surveyByHealthBase.body.map(async question => {
-                await this.definedAnswers(question.first.id, 'surveyByHealthBase');
-              }),
-            );
+            this.isClientAnketaCondition
+              ? await Promise.allSettled([
+                  ...this.formStore.surveyByHealthBase.body.map(async question => {
+                    await this.definedAnswers(question.first.id, 'surveyByHealthBase');
+                  }),
+                  ...this.formStore.surveyByHealthBasePolicyholder.body.map(async question => {
+                    await this.definedAnswers(question.first.id, 'surveyByHealthBasePolicyholder');
+                  }),
+                ])
+              : await Promise.allSettled(
+                  this.formStore.surveyByHealthBase.body.map(async question => {
+                    await this.definedAnswers(question.first.id, 'surveyByHealthBase');
+                  }),
+                );
           }
-
           if (this.validateAnketa('surveyByHealthBase')) {
             let hasCriticalAndItsValid = null;
             if (hasCritical && hasCritical.coverSumName !== 'не включено') {
@@ -2226,6 +2287,11 @@ export const useDataStore = defineStore('data', {
               hasCriticalAndItsValid = null;
             }
             if (hasCriticalAndItsValid === true || hasCriticalAndItsValid === null) {
+              if (this.isClientAnketaCondition && this.validateAnketa('surveyByHealthBasePolicyholder') === false) {
+                this.showToaster('error', this.t('toaster.emptyHealthAnketaPolicyholder'), 3000);
+                this.isLoading = false;
+                return false;
+              }
               this.isLoading = false;
               return true;
             }

package/store/rules.js

@@ -35,6 +35,14 @@ export const rules = {
     },
   ],
   cyrillic: [v => v === null || /^[\u0400-\u04FF ]+$/.test(v) || t('rules.cyrillic')],
+  cyrillicNonRequired: [
+    v => {
+      if (!v) return true;
+      else {
+        return /^[\u0400-\u04FF ]+$/.test(v) || t('rules.cyrillic');
+      }
+    },
+  ],
   email: [
     v => {
       if (v === '' || v === null) {