hl-core 0.0.9-beta.4 → 0.0.9-beta.40

package/components/Pages/MemberForm.vue

@@ -1,32 +1,65 @@
 <template>
   <section class="flex flex-col gap-4 px-[10px]">
-    <v-form v-if="member" ref="vForm" @submit="submitForm" class="max-h-[82svh] overflow-y-scroll">
-      <div v-if="memberSetting && memberSetting.has === true && memberSetting.isMultiple === true" class="flex items-center mt-[14px] min-h-[54px]">
-        <div :class="[$styles.blueBgLight]" class="flex flex-wrap items-center gap-2 p-1 rounded-t-[8px] h-full">
+    <v-form v-if="member" ref="vForm" @submit="submitForm" class="max-h-[80svh] overflow-y-scroll">
+      <div
+        v-if="memberSetting && memberSetting.has === true && whichForm !== 'policyholderForm' && whichForm !== 'policyholdersRepresentativeForm'"
+        class="flex items-center mt-[14px] min-h-[54px]"
+      >
+        <div :class="[$styles.blueBgLight]" class="flex flex-wrap items-center gap-2 p-2 rounded-t-[8px] h-full">
           <div
             v-for="(each, index) of formStore[whichForm]"
             :key="index"
-            class="pl-3 pr-1 py-1 rounded-[8px] cursor-pointer flex items-center"
-            :class="[Number(whichIndex) === index ? `${$styles.blueBg} ${$styles.whiteText}` : '', $styles.textSimple]"
+            class="rounded-[8px] cursor-pointer flex items-center"
+            :class="[Number(whichIndex) === index ? `${$styles.blueBg} ${$styles.whiteText}` : '', $styles.textSimple, isDisabled ? 'py-2 px-3' : 'py-1 pr-1 pl-3']"
             @click.self="index !== Number(whichIndex) ? selectMember(index) : null"
           >
             {{ `${$dataStore.menu.selectedItem.title} ${index + 1}` }}
             <v-btn
+              v-if="!isDisabled"
               icon="mdi-close !text-[20px]"
               size="x-small"
               :disabled="!memberStore.canMemberDeleted(whichForm, index) && !memberStore.canMemberCleared(whichForm, index)"
               variant="plain"
               :color="Number(whichIndex) === index ? '#FFF' : '#A0B3D8'"
-              @click.prevent="memberStore.canMemberDeleted(whichForm, index) || memberStore.canMemberCleared(whichForm, index) ? deleteMember(index) : null"
+              @click.prevent="memberStore.canMemberDeleted(whichForm, index) || memberStore.canMemberCleared(whichForm, index) ? openDeletionDialog(index) : null"
             />
           </div>
         </div>
-        <v-btn class="ml-2" icon="mdi-plus !text-[24px]" @click="memberStore.addMember(whichForm)" size="small" color="#A0B3D8" variant="tonal" />
+        <v-btn
+          v-if="!isDisabled && memberSetting.isMultiple === true"
+          class="ml-2"
+          icon="mdi-plus !text-[24px]"
+          @click="memberStore.addMember(whichForm)"
+          size="small"
+          color="#A0B3D8"
+          variant="tonal"
+        />
       </div>
       <base-form-section
         :title="$dataStore.t('form.personalData')"
-        :class="[memberSetting && memberSetting.has === true && memberSetting.isMultiple === true ? 'rounded-t-0 !mt-[-5px]' : 'mt-[14px]']"
+        :class="[
+          memberSetting && memberSetting.has === true && whichForm !== 'policyholderForm' && whichForm !== 'policyholdersRepresentativeForm'
+            ? 'rounded-t-0 !mt-[-5px]'
+            : 'mt-[14px]',
+        ]"
       >
+        <base-panel-input
+          v-if="$dataStore.isLifetrip"
+          v-model="member.signOfResidency"
+          :value="member.signOfResidency?.nameRu"
+          :label="$dataStore.t('form.signOfResidency')"
+          :readonly="isDisabled"
+          :clearable="!isDisabled"
+          :rules="residencyRule"
+          append-inner-icon="mdi mdi-chevron-right"
+          @append="openPanel($dataStore.t('form.signOfResidency'), [], 'signOfResidency', $dataStore.getResidents)"
+        />
+        <base-form-toggle
+          v-if="$dataStore.isLifetrip && whichForm === 'insuredForm'"
+          v-model="member.isInsuredUnderage"
+          :title="$dataStore.t('isInsuredUnderage')"
+          :has-border="false"
+        />
         <base-form-input
           v-model="member.phoneNumber"
           :label="$dataStore.t('form.phoneNumber')"
@@ -44,7 +77,7 @@
           :maska="$maska.iin"
           :readonly="!!isDisabled || !!isIinPhoneDisabled"
           :clearable="!isDisabled"
-          :append-inner-icon="showSaveButton ? 'mdi mdi-magnify' : ''"
+          :append-inner-icon="hasMemberSearch ? 'mdi mdi-magnify' : ''"
           @append="searchMember"
           @input="onIinInput"
           :rules="$rules.required.concat($rules.iinRight)"
@@ -64,12 +97,31 @@
           :rules="$rules.required.concat($rules.cyrillic)"
         />
         <base-form-input
+          v-if="hasMiddleName"
           v-model.trim="member.middleName"
           :readonly="isDisabled || isFromGBD"
           :clearable="!isDisabled"
           :label="$dataStore.t('form.middleName')"
           :rules="$rules.cyrillicNonRequired"
         />
+        <base-form-input
+          v-if="$dataStore.isLifetrip"
+          v-model.trim="member.lastNameLat"
+          :readonly="isDisabled || isFromGBD"
+          :clearable="!isDisabled"
+          :label="$dataStore.t('form.lastNameLat')"
+          :rules="$rules.required.concat($rules.latin)"
+          :hint="$dataStore.t('labels.checkWithDoc')"
+        />
+        <base-form-input
+          v-if="$dataStore.isLifetrip"
+          v-model.trim="member.firstNameLat"
+          :readonly="isDisabled || isFromGBD"
+          :clearable="!isDisabled"
+          :label="$dataStore.t('form.firstNameLat')"
+          :rules="$rules.required.concat($rules.latin)"
+          :hint="$dataStore.t('labels.checkWithDoc')"
+        />
         <base-form-input
           v-model="member.birthDate"
           :readonly="isDisabled || isFromGBD"
@@ -82,9 +134,9 @@
         <base-form-input v-model="member.age" :label="$dataStore.t('form.age')" :readonly="true" :clearable="!isDisabled" :rules="ageRule" />
         <base-panel-input
           v-model="member.gender"
-          :value="member.gender.nameRu"
+          :value="member.gender?.nameRu"
           :readonly="isDisabled || isFromGBD"
-          :clearable="!isDisabled"
+          :clearable="!isDisabled && !isFromGBD"
           :label="$dataStore.t('form.gender')"
           :rules="$rules.objectRequired"
           append-inner-icon="mdi mdi-chevron-right"
@@ -93,7 +145,7 @@
         <base-panel-input
           v-if="hasFamilyStatus"
           v-model="member.familyStatus"
-          :value="member.familyStatus.nameRu"
+          :value="member.familyStatus?.nameRu"
           :readonly="isDisabled"
           :clearable="!isDisabled"
           :label="$dataStore.t('form.familyStatus')"
@@ -102,9 +154,9 @@
           @append="openPanel($dataStore.t('form.familyStatus'), [], 'familyStatus', $dataStore.getFamilyStatuses)"
         />
         <base-panel-input
-          v-if="(whichForm === formStore.beneficiaryFormKey || whichForm === formStore.insuredFormKey) && member.iin !== formStore.policyholderForm.iin"
+          v-if="hasRelationDegree"
           v-model="member.relationDegree"
-          :value="member.relationDegree.nameRu"
+          :value="member.relationDegree?.nameRu"
           :readonly="isDisabled"
           :clearable="!isDisabled"
           :label="$dataStore.t('form.relations')"
@@ -231,7 +283,7 @@
           append-inner-icon="mdi mdi-calendar-blank-outline"
         />
       </base-form-section>
-      <base-form-section :title="$dataStore.t('form.jobData')" v-if="$dataStore.hasJobSection(whichForm)">
+      <base-form-section v-if="$dataStore.hasJobSection(whichForm)" :title="$dataStore.t('form.jobData')">
         <base-form-input v-model.trim="member.job" :label="$dataStore.t('form.job')" :readonly="isDisabled" :clearable="!isDisabled" :rules="$rules.required" />
         <base-form-input v-model.trim="member.jobPosition" :label="$dataStore.t('form.jobPosition')" :readonly="isDisabled" :clearable="!isDisabled" :rules="$rules.required" />
         <base-form-input v-model.trim="member.jobPlace" :label="$dataStore.t('form.jobPlace')" :readonly="isDisabled" :clearable="!isDisabled" :rules="$rules.required" />
@@ -240,11 +292,11 @@
         <base-form-toggle v-if="hasSameAddressToggle" v-model="sameAddress" :disabled="isDisabled" :has-border="false" :title="$dataStore.t('form.sameAddress')" />
         <base-panel-input
           v-model="member.registrationCountry"
-          :value="member.registrationCountry.nameRu"
+          :value="member.registrationCountry?.nameRu"
           :readonly="isDisabled"
           :clearable="!isDisabled"
           :label="$dataStore.t('form.Country')"
-          :rules="$rules.objectRequired"
+          :rules="member.isInsuredUnderage ? [] : $rules.objectRequired"
           append-inner-icon="mdi mdi-chevron-right"
           @append="openPanel($dataStore.t('form.Country'), [], 'registrationCountry', $dataStore.getCountries)"
         />
@@ -252,42 +304,42 @@
           <div class="flex flex-col gap-[1px]" v-if="member.registrationCountry.nameRu === 'Казахстан' || member.registrationCountry.nameRu === null">
             <base-panel-input
               v-model="member.registrationProvince"
-              :value="member.registrationProvince.nameRu"
+              :value="member.registrationProvince?.nameRu"
               :label="$dataStore.t('form.Province')"
               :readonly="isDisabled"
               :clearable="!isDisabled"
-              :rules="$rules.objectRequired"
+              :rules="member.isInsuredUnderage ? [] : $rules.objectRequired"
               append-inner-icon="mdi mdi-chevron-right"
               @append="openPanel($dataStore.t('form.Province'), [], 'registrationProvince', $dataStore.getStates, 'registrationCountry')"
             />
             <base-panel-input
               v-model="member.registrationRegionType"
-              :value="member.registrationRegionType.nameRu"
+              :value="member.registrationRegionType?.nameRu"
               :label="$dataStore.t('form.RegionType')"
               :readonly="isDisabled"
               :clearable="!isDisabled"
-              :rules="$rules.objectRequired"
+              :rules="member.isInsuredUnderage ? [] : $rules.objectRequired"
               append-inner-icon="mdi mdi-chevron-right"
               @append="openPanel($dataStore.t('form.RegionType'), [], 'registrationRegionType', $dataStore.getLocalityTypes)"
             />
             <base-panel-input
               v-if="member.registrationRegionType.nameRu !== 'город'"
               v-model="member.registrationRegion"
-              :value="member.registrationRegion.nameRu"
+              :value="member.registrationRegion?.nameRu"
               :label="$dataStore.t('form.Region')"
               :readonly="isDisabled"
               :clearable="!isDisabled"
-              :rules="$rules.objectRequired"
+              :rules="member.isInsuredUnderage ? [] : $rules.objectRequired"
               append-inner-icon="mdi mdi-chevron-right"
               @append="openPanel($dataStore.t('form.Region'), [], 'registrationRegion', $dataStore.getRegions, 'registrationProvince')"
             />
             <base-panel-input
               v-model="member.registrationCity"
-              :value="member.registrationCity.nameRu"
+              :value="member.registrationCity?.nameRu"
               :label="$dataStore.t('form.City')"
               :readonly="isDisabled"
               :clearable="!isDisabled"
-              :rules="$rules.objectRequired"
+              :rules="member.isInsuredUnderage ? [] : $rules.objectRequired"
               append-inner-icon="mdi mdi-chevron-right"
               @append="openPanel($dataStore.t('form.City'), [], 'registrationCity', $dataStore.getCities, 'registrationProvince')"
             />
@@ -297,14 +349,14 @@
             <base-form-input v-model.trim="member.registrationMicroDistrict" :readonly="isDisabled" :clearable="!isDisabled" :label="$dataStore.t('form.MicroDistrict')" />
             <base-form-input
               v-model.trim="member.registrationStreet"
-              :rules="$rules.required"
+              :rules="member.isInsuredUnderage ? [] : $rules.required"
               :readonly="isDisabled"
               :clearable="!isDisabled"
               :label="$dataStore.t('form.Street')"
             />
             <base-form-input
               v-model.trim="member.registrationNumberHouse"
-              :rules="$rules.required"
+              :rules="member.isInsuredUnderage ? [] : $rules.required"
               :readonly="isDisabled"
               :clearable="!isDisabled"
               :label="$dataStore.t('form.NumberHouse')"
@@ -316,7 +368,7 @@
       <base-form-section :title="$dataStore.t('form.birthData')" v-if="$dataStore.hasBirthSection(whichForm)">
         <base-panel-input
           v-model="member.birthPlace"
-          :value="member.birthPlace.nameRu"
+          :value="member.birthPlace?.nameRu"
           :label="$dataStore.t('form.Country')"
           :readonly="isDisabled"
           :clearable="!isDisabled"
@@ -327,7 +379,7 @@
         <!-- TODO -->
         <!-- <base-panel-input
           v-model="member.birthRegion"
-          :value="member.birthRegion.nameRu"
+          :value="member.birthRegion?.nameRu"
           :label="$dataStore.t('form.Region')"
           :readonly="isDisabled"
           :clearable="!isDisabled"
@@ -339,7 +391,7 @@
       <base-form-section :title="$dataStore.t('form.documentData')" v-if="$dataStore.hasDocumentSection(whichForm)">
         <base-panel-input
           v-model="member.documentType"
-          :value="member.documentType.nameRu"
+          :value="member.documentType?.nameRu"
           :label="$dataStore.t('form.documentType')"
           :readonly="isDisabled"
           :clearable="!isDisabled"
@@ -361,7 +413,7 @@
         </base-empty-form-field> -->
         <base-panel-input
           v-model="member.documentIssuers"
-          :value="member.documentIssuers.nameRu"
+          :value="member.documentIssuers?.nameRu"
           :label="$dataStore.t('form.documentIssuers')"
           :readonly="isDisabled"
           :clearable="!isDisabled"
@@ -391,8 +443,9 @@
           />
         </base-fade-transition>
         <base-panel-input
+          v-if="!$dataStore.isLifetrip"
           v-model="member.signOfResidency"
-          :value="member.signOfResidency.nameRu"
+          :value="member.signOfResidency?.nameRu"
           :label="$dataStore.t('form.signOfResidency')"
           :readonly="isDisabled"
           :clearable="!isDisabled"
@@ -402,7 +455,7 @@
         />
         <base-panel-input
           v-model="member.countryOfTaxResidency"
-          :value="member.countryOfTaxResidency.nameRu"
+          :value="member.countryOfTaxResidency?.nameRu"
           :label="$dataStore.t('form.countryOfTaxResidency')"
           :readonly="isDisabled"
           :clearable="!isDisabled"
@@ -414,7 +467,7 @@
           <base-panel-input
             v-if="member.countryOfTaxResidency.ids === '500014.3'"
             v-model="member.addTaxResidency"
-            :value="member.addTaxResidency.nameRu"
+            :value="member.addTaxResidency?.nameRu"
             :label="$dataStore.t('form.addTaxResidency')"
             :readonly="isDisabled"
             :clearable="!isDisabled"
@@ -426,7 +479,7 @@
         <base-panel-input
           v-if="hasSignOfIPDL"
           v-model="member.signOfIPDL"
-          :value="member.signOfIPDL.nameRu"
+          :value="member.signOfIPDL?.nameRu"
           :label="$dataStore.t('form.signOfIPDL')"
           :readonly="isDisabled"
           :clearable="!isDisabled"
@@ -436,7 +489,7 @@
         />
         <base-panel-input
           v-model="member.countryOfCitizenship"
-          :value="member.countryOfCitizenship.nameRu"
+          :value="member.countryOfCitizenship?.nameRu"
           :label="$dataStore.t('form.countryOfCitizenship')"
           :readonly="isDisabled"
           :clearable="!isDisabled"
@@ -446,7 +499,7 @@
         />
         <base-panel-input
           v-model="member.economySectorCode"
-          :value="member.economySectorCode.nameRu"
+          :value="member.economySectorCode?.nameRu"
           :label="$dataStore.t('form.economySectorCode')"
           :readonly="isDisabled"
           :clearable="!isDisabled"
@@ -457,7 +510,7 @@
         <base-panel-input
           v-if="hasInsurancePay"
           v-model="member.insurancePay"
-          :value="member.insurancePay.nameRu"
+          :value="member.insurancePay?.nameRu"
           :readonly="isDisabled"
           :clearable="!isDisabled"
           :rules="$rules.objectRequired"
@@ -474,13 +527,13 @@
           :label="$dataStore.t('form.homePhone')"
           :readonly="isDisabled"
           :clearable="!isDisabled"
-          :rules="whichForm === formStore.beneficiaryFormKey ? [] : $rules.phoneFormat"
+          :rules="whichForm === formStore.beneficiaryFormKey || member.isInsuredUnderage ? [] : $rules.phoneFormat"
         />
-        <base-form-input v-model.trim="member.email" :label="$dataStore.t('form.email')" :rules="$rules.email" />
+        <base-form-input v-model.trim="member.email" :label="$dataStore.t('form.email')" :readonly="isDisabled" :clearable="!isDisabled" :rules="$rules.email" />
       </base-form-section>
     </v-form>
     <base-btn v-if="showSaveButton" :loading="isButtonLoading || isSubmittingForm" :text="$dataStore.t('buttons.save')" @click="submitForm" />
-    <Teleport v-if="isPanelOpen" to="#panel-actions">
+    <Teleport v-if="isPanelOpen" to="#right-panel-actions">
       <div :class="[$styles.scrollPage]" class="flex flex-col items-center">
         <base-rounded-input v-model="searchQuery" :label="$dataStore.t('labels.search')" class="w-full p-2" :hide-details="true" />
         <div v-if="panelList && isPanelLoading === false" class="w-full flex flex-col gap-2 p-2">
@@ -496,20 +549,20 @@
         <base-loader v-if="isPanelLoading" class="absolute mt-10" :size="50" />
       </div>
     </Teleport>
-    <Teleport v-if="isSearchOpen" to="#panel-actions">
+    <Teleport v-if="isSearchOpen" to="#right-panel-actions">
       <div :class="[$styles.flexColNav]">
         <base-btn v-if="hasGBDFL" :loading="isButtonLoading" :text="$dataStore.t('buttons.fromGBDFL')" @click="getContragentFromGBDFL" />
         <base-btn v-if="hasInsis" :loading="isButtonLoading" :text="$dataStore.t('buttons.fromInsis')" @click="getContragent" />
         <base-btn v-if="hasGKB" :loading="isButtonLoading" :text="$dataStore.t('buttons.fromGKB')" @click="getFamilyInfo" />
       </div>
     </Teleport>
-    <Teleport v-if="isDocumentOpen" to="#panel-actions">
+    <Teleport v-if="isDocumentOpen" to="#right-panel-actions">
       <div :class="[$styles.flexColNav]">
         <base-btn :disabled="documentLoading" :loading="documentLoading" text="Открыть" @click="getFile('view')" />
         <base-btn :disabled="documentLoading" :loading="documentLoading" text="Скачать" @click="getFile('download')" />
       </div>
     </Teleport>
-    <Teleport v-if="isOtpPanelOpen && !member.hasAgreement" to="#panel-actions">
+    <Teleport v-if="isOtpPanelOpen && !member.hasAgreement" to="#right-panel-actions">
       <div :class="[$styles.flexColNav]">
         <base-fade-transition>
           <base-rounded-input
@@ -527,7 +580,16 @@
         <base-btn v-if="member.otpTokenId" :disabled="otpSending" :loading="otpSending" :text="$dataStore.t('buttons.check')" @click="checkOtp()" />
       </div>
     </Teleport>
-    <base-dialog v-model="familyDialog" :title="$dataStore.t('dialog.familyMember')" actions="familyDialog">
+    <base-dialog
+      v-model="deletionDialog"
+      :title="$dataStore.t('dialog.confirmDelete')"
+      :subtitle="$dataStore.t('dialog.delete')"
+      :confirm="$dataStore.t('confirm.delete')"
+      :icon="{ mdi: 'delete-outline', color: '#FD2D39' }"
+      @yes="deleteMember"
+      @no="deletionDialog = false"
+    />
+    <base-dialog v-model="familyDialog" :subtitle="$dataStore.t('dialog.familyMember')" :icon="{ mdi: 'hand-pointing-up' }" actions="familyDialog">
       <template #actions>
         <base-family-dialog :selected="selectedFamilyMember" @selectFamilyMember="selectFamilyMember" @reset="closeFamilyDialog(true)" />
       </template>
@@ -566,6 +628,8 @@ export default {
     const isPanelLoading = ref<boolean>(false);
     const isChangingMember = ref<boolean>(false);
     const familyDialog = ref<boolean>(false);
+    const deletionDialog = ref<boolean>(false);
+    const selectedIndex = ref<number>(0);
     const sameAddress = ref<boolean>(false);
     const panelValue = ref<Value>(new Value());
     const panelList = ref<Value[]>([]);
@@ -581,7 +645,7 @@ export default {
     const isFromGBD = computed(() => !!member.value.gosPersonData);
     const showSaveButton = computed(() => {
       const generalCondition = !isDisabled.value && !!isTask.value && !!dataStore.isInitiator();
-      const perMemberCondtion = () => {
+      const perMemberCondition = () => {
         switch (whichForm.value) {
           case formStore.policyholderFormKey:
             return true;
@@ -594,7 +658,7 @@ export default {
             return false;
         }
       };
-      return generalCondition && perMemberCondtion();
+      return generalCondition && perMemberCondition();
     });
 
     const hasGBDFL = computed(() => {
@@ -607,9 +671,17 @@ export default {
             if (dataStore.isBolashak || dataStore.isGons) {
               return false;
             }
+            if (member.value.age !== null && Number(member.value.age) < 18) {
+              return false;
+            }
+            return true;
+          }
+          case formStore.insuredFormKey: {
+            if (dataStore.isLifetrip && member.value.isInsuredUnderage) {
+              return false;
+            }
             return true;
           }
-          case formStore.insuredFormKey:
           case formStore.beneficialOwnerFormKey:
           case formStore.policyholdersRepresentativeFormKey:
             return true;
@@ -640,8 +712,26 @@ export default {
       };
       return dataStore.controls.hasGKB && !!dataStore.isTask() && perMemberCondition();
     });
-
+    const hasMemberSearch = computed(() => showSaveButton.value && (hasGBDFL.value || hasGKB.value || hasInsis.value));
+    const hasMiddleName = computed(() => {
+      if (dataStore.isLifetrip) {
+        return false;
+      }
+      return true;
+    });
+    const hasRelationDegree = computed(() => {
+      if (dataStore.isLifetrip) {
+        return false;
+      }
+      if ((whichForm.value === formStore.beneficiaryFormKey || whichForm.value === formStore.insuredFormKey) && member.value.iin !== formStore.policyholderForm.iin) {
+        return true;
+      }
+      return false;
+    });
     const hasFamilyStatus = computed(() => {
+      if (dataStore.isLifetrip) {
+        return false;
+      }
       if (whichForm.value === formStore.beneficiaryFormKey) {
         if (dataStore.isBolashak) {
           return false;
@@ -658,7 +748,7 @@ export default {
       return false;
     });
     const hasSignOfIPDL = computed(() => {
-      if (dataStore.isGons) {
+      if (dataStore.isGons || dataStore.isLifetrip) {
         return false;
       }
       return true;
@@ -667,7 +757,7 @@ export default {
 
     const birthDateRule = computed(() => {
       const baseDateRule = dataStore.rules.required.concat(dataStore.rules.birthDate);
-      const byMemverAndProductRule = () => {
+      const byMemberAndProductRule = () => {
         if (whichForm.value === formStore.policyholderFormKey) {
           if (dataStore.isGons || dataStore.isBolashak || dataStore.isBaiterek) {
             return dataStore.rules.age18ByDate;
@@ -677,10 +767,13 @@ export default {
           if (dataStore.isBolashak || dataStore.isBaiterek) {
             return dataStore.rules.age18ByDate;
           }
+          if (dataStore.isLifetrip) {
+            return dataStore.rules.ageExceeds80ByDate;
+          }
         }
         return [];
       };
-      return baseDateRule.concat(byMemverAndProductRule());
+      return baseDateRule.concat(byMemberAndProductRule());
     });
     const ageRule = computed(() => {
       const baseAgeRule = dataStore.rules.numbers;
@@ -711,10 +804,13 @@ export default {
         if (dataStore.isGons || dataStore.isBolashak) {
           return [];
         }
-        if ((dataStore.isKazyna || dataStore.isLiferenta) && member.value.age < 18) {
+        if (member.value.age !== null && Number(member.value.age) < 18) {
           return [];
         }
       }
+      if (member.value.isInsuredUnderage) {
+        return [];
+      }
       return basePhoneRule;
     });
 
@@ -725,6 +821,9 @@ export default {
           return baseResidencyRule.concat(dataStore.rules.noResident);
         }
       }
+      if (dataStore.isLifetrip) {
+        return baseResidencyRule.concat(dataStore.rules.noResidentOffline);
+      }
       return baseResidencyRule;
     });
 
@@ -742,6 +841,8 @@ export default {
     const otpCondition = computed(() => {
       // Add conditions by product
       if (member.value.hasAgreement) return false;
+      if (whichForm.value === formStore.beneficiaryFormKey && member.value.age !== null && Number(member.value.age) < 18) return false;
+      if (dataStore.isLifetrip && whichForm.value === formStore.insuredFormKey && member.value.isInsuredUnderage) return false;
       if (!member.value.phoneNumber || (member.value.phoneNumber && member.value.phoneNumber.length !== useMask().phone.length)) return false;
       return getOtpConditionByMember();
     });
@@ -749,8 +850,8 @@ export default {
     const searchMember = async () => {
       if (!isDisabled.value) {
         dataStore.panelAction = null;
-        dataStore.panel.title = 'Поиск контрагента';
-        dataStore.panel.open = true;
+        dataStore.rightPanel.title = 'Поиск контрагента';
+        dataStore.rightPanel.open = true;
         isSearchOpen.value = true;
         isDocumentOpen.value = false;
         isOtpPanelOpen.value = false;
@@ -767,20 +868,20 @@ export default {
     const openCustomPanel = (type: 'document' | 'otp' = 'document') => {
       dataStore.panelAction = null;
       if (type === 'document' && memberDocument.value) {
-        dataStore.panel.title = memberDocument.value.fileTypeName!;
+        dataStore.rightPanel.title = memberDocument.value.fileTypeName!;
         isDocumentOpen.value = true;
         isSearchOpen.value = false;
         isPanelOpen.value = false;
         isOtpPanelOpen.value = false;
       }
       if (type === 'otp') {
-        dataStore.panel.title = dataStore.t('form.otpCode');
+        dataStore.rightPanel.title = dataStore.t('form.otpCode');
         isOtpPanelOpen.value = true;
         isDocumentOpen.value = false;
         isSearchOpen.value = false;
         isPanelOpen.value = false;
       }
-      dataStore.panel.open = true;
+      dataStore.rightPanel.open = true;
     };
 
     const openPanel = async (title: string, list: Value[], key: string, asyncFunction?: Function, filterKey?: string) => {
@@ -798,8 +899,8 @@ export default {
         currentPanel.value = key as keyof typeof member.value;
         isPanelOpen.value = true;
         dataStore.panelAction = null;
-        dataStore.panel.open = true;
-        dataStore.panel.title = title;
+        dataStore.rightPanel.open = true;
+        dataStore.rightPanel.title = title;
 
         let newList = list;
         if (asyncFunction) {
@@ -832,7 +933,7 @@ export default {
 
     const pickPanelValue = (item: Value) => {
       if (formStore.isDisabled[whichForm.value as keyof typeof formStore.isDisabled] === false) {
-        dataStore.panel.open = false;
+        dataStore.rightPanel.open = false;
         isPanelOpen.value = false;
         // @ts-ignore
         member.value[currentPanel.value] = item.nameRu === null ? new Value() : item;
@@ -904,7 +1005,7 @@ export default {
       familyDialog.value = false;
       selectedFamilyMember.value = {};
       isButtonLoading.value = false;
-      dataStore.panel.open = false;
+      dataStore.rightPanel.open = false;
       isSearchOpen.value = false;
     };
 
@@ -921,20 +1022,20 @@ export default {
       }
       familyDialog.value = false;
       isButtonLoading.value = false;
-      dataStore.panel.open = false;
+      dataStore.rightPanel.open = false;
       isSearchOpen.value = false;
     };
 
     const getContragentFromGBDFL = async () => {
       if (member.value.hasAgreement !== true) {
         dataStore.showToaster('error', dataStore.t('toaster.needAgreement'), 3000);
-        dataStore.panel.open = false;
+        dataStore.rightPanel.open = false;
         isSearchOpen.value = false;
         return;
       }
       if (!member.value.iin || member.value.iin.length !== useMask().iin.length || !member.value.phoneNumber || member.value.phoneNumber.length !== useMask().phone.length) {
         dataStore.showToaster('error', dataStore.t('toaster.errorFormField', { text: 'Номер телефона, ИИН' }), 5000);
-        dataStore.panel.open = false;
+        dataStore.rightPanel.open = false;
         isSearchOpen.value = false;
         return;
       }
@@ -944,7 +1045,7 @@ export default {
         if (response === true) {
           member.value.gotFromInsis = true;
         }
-        dataStore.panel.open = false;
+        dataStore.rightPanel.open = false;
         isSearchOpen.value = false;
       }
       isButtonLoading.value = false;
@@ -953,20 +1054,20 @@ export default {
     const getContragent = async () => {
       if (member.value.hasAgreement !== true) {
         dataStore.showToaster('error', dataStore.t('toaster.needAgreement'), 3000);
-        dataStore.panel.open = false;
+        dataStore.rightPanel.open = false;
         isSearchOpen.value = false;
         return;
       }
       if (!member.value.iin || member.value.iin.length !== useMask().iin.length) {
         dataStore.showToaster('error', dataStore.t('toaster.errorFormField', { text: 'ИИН' }), 5000);
-        dataStore.panel.open = false;
+        dataStore.rightPanel.open = false;
         isSearchOpen.value = false;
         return;
       }
       isButtonLoading.value = true;
       await dataStore.getContragent(member.value, false);
       isButtonLoading.value = false;
-      dataStore.panel.open = false;
+      dataStore.rightPanel.open = false;
       isSearchOpen.value = false;
     };
 
@@ -1036,14 +1137,17 @@ export default {
       if (!isSaved) return false;
       if (whichForm.value === formStore.policyholderFormKey) {
         if (isInsured === true || remoteIsInsured.value === true) {
-          formStore.insuredForm[0] = formStore.policyholderForm;
-          const isInsuredSaved = await dataStore.saveMember(
-            member.value,
-            memberStore.getMemberCode(formStore.insuredFormKey)!,
-            memberStore.getMemberFromApplication(formStore.insuredFormKey, formStore.insuredFormIndex),
-          );
-          if (!isInsuredSaved) return false;
-          wasInsuredAction.value = true;
+          const insuredFormIndex = remoteIsInsured.value === true ? 0 : isInsured === true ? formStore.insuredForm.findIndex(i => i.iin === formStore.policyholderForm.iin) : -1;
+          if (insuredFormIndex !== -1) {
+            formStore.insuredForm[insuredFormIndex] = formStore.policyholderForm;
+            const isInsuredSaved = await dataStore.saveMember(
+              member.value,
+              memberStore.getMemberCode(formStore.insuredFormKey)!,
+              memberStore.getMemberFromApplication(formStore.insuredFormKey, insuredFormIndex),
+            );
+            if (!isInsuredSaved) return false;
+            wasInsuredAction.value = true;
+          }
         }
       }
       if (whichForm.value === formStore.insuredFormKey) {
@@ -1056,8 +1160,8 @@ export default {
       await dataStore.getApplicationData(route.params.taskId as string, false, false, true, wasInsuredAction.value);
       if (dataStore.controls.hasCalculator) {
         if (formStore.additionalInsuranceTermsWithout && formStore.additionalInsuranceTermsWithout.length !== 0) {
-          formStore.additionalInsuranceTerms.forEach((term: any) => {
-            const defaultTerm = formStore.additionalInsuranceTermsWithout.find((i: any) => i.coverTypeId === term.coverTypeId);
+          formStore.additionalInsuranceTerms.forEach(term => {
+            const defaultTerm = formStore.additionalInsuranceTermsWithout.find(i => i.coverTypeId === term.coverTypeId);
             if (defaultTerm) {
               term.coverSumName = defaultTerm.coverSumName;
               term.coverSumId = defaultTerm.coverSumId;
@@ -1071,14 +1175,13 @@ export default {
     };
 
     const validateAgreement = () => {
-      if (dataStore.isGons || dataStore.isBolashak) {
-        if (whichForm.value === formStore.beneficiaryFormKey) {
-          // TODO уточнить
+      if (whichForm.value === formStore.beneficiaryFormKey) {
+        if (member.value.age !== null && Number(member.value.age) < 18) {
           return true;
         }
       }
-      if (dataStore.isKazyna || dataStore.isLiferenta) {
-        if (whichForm.value === formStore.beneficiaryFormKey && member.value.age < 18) {
+      if (whichForm.value === formStore.insuredFormKey) {
+        if (dataStore.isLifetrip && member.value.isInsuredUnderage) {
           return true;
         }
       }
@@ -1096,9 +1199,14 @@ export default {
         if (v.valid) {
           isSubmittingForm.value = true;
           const docType = member.value.documentType.ids;
-          if (member.value.gotFromInsis === true && (docType === '1UDL' || docType === 'SBI')) {
+          if (member.value.gotFromInsis === true && (docType === '1UDL' || docType === 'SBI' || docType === 'PS')) {
             dataStore.isLoading = true;
-            const ESBDResponse = await validateESBD(docType === '1UDL' ? 1 : 3);
+            const docTypeCodes = {
+              '1UDL': 1,
+              PS: 2,
+              SBI: 3,
+            };
+            const ESBDResponse = await validateESBD(docTypeCodes[docType]);
             if (!ESBDResponse) {
               dataStore.isLoading = false;
               return;
@@ -1153,7 +1261,7 @@ export default {
       }
       otpSending.value = false;
       if (checked === true) {
-        dataStore.panel.open = false;
+        dataStore.rightPanel.open = false;
       }
     };
 
@@ -1163,7 +1271,7 @@ export default {
       if (response) {
         if (member.value.hasAgreement === null) member.value.hasAgreement = response.otpStatus;
         if (response.otpStatus === true) {
-          dataStore.panel.open = false;
+          dataStore.rightPanel.open = false;
         }
       }
       otpSending.value = false;
@@ -1177,6 +1285,15 @@ export default {
       if (setDefaults.percentage) {
         setPercentage();
       }
+      if (setDefaults.signOfResidency) {
+        setSignOfResidency();
+      }
+      if (setDefaults.countryOfTaxResidency) {
+        setCountryOfTaxResidency();
+      }
+      if (setDefaults.countryOfCitizenship) {
+        setCountryOfCitizenship();
+      }
     };
 
     const setSectorCode = async () => {
@@ -1186,7 +1303,27 @@ export default {
         member.value.economySectorCode = defaultValue ? defaultValue : new Value();
       }
     };
-
+    const setSignOfResidency = async () => {
+      if (member.value.id === 0 && route.query.id === '0') {
+        const residents = await dataStore.getResidents();
+        const defaultValue = residents.find(item => String(item.nameRu).match(new RegExp('Резидент', 'i'))) as Value;
+        member.value.signOfResidency = defaultValue ? defaultValue : new Value();
+      }
+    };
+    const setCountryOfTaxResidency = async () => {
+      if (member.value.id === 0 && route.query.id === '0') {
+        const taxCountries = await dataStore.getTaxCountries();
+        const defaultValue = taxCountries.find(item => String(item.nameRu).match(new RegExp('Казахстан', 'i'))) as Value;
+        member.value.countryOfTaxResidency = defaultValue ? defaultValue : new Value();
+      }
+    };
+    const setCountryOfCitizenship = async () => {
+      if (member.value.id === 0 && route.query.id === '0') {
+        const citizenshipCountries = await dataStore.getCitizenshipCountries();
+        const defaultValue = citizenshipCountries.find(item => String(item.nameRu).match(new RegExp('Казахстан', 'i'))) as Value;
+        member.value.countryOfCitizenship = defaultValue ? defaultValue : new Value();
+      }
+    };
     const setPercentage = () => {
       if (whichForm.value === formStore.beneficiaryFormKey && member.value.id === 0 && route.query.id === '0' && member.value.percentageOfPayoutAmount === null) {
         if (dataStore.members.beneficiaryApp.isMultiple) {
@@ -1203,7 +1340,7 @@ export default {
     };
 
     const selectMember = async (index: number, update?: boolean) => {
-      dataStore.panel.open = false;
+      dataStore.rightPanel.open = false;
       isButtonLoading.value = true;
       isChangingMember.value = true;
       //@ts-ignore
@@ -1212,13 +1349,19 @@ export default {
       isButtonLoading.value = false;
     };
 
-    const deleteMember = async (index: number) => {
-      await memberStore.deleteMember(route.params.taskId as string, whichForm.value, index);
+    const openDeletionDialog = (index: number) => {
+      deletionDialog.value = true;
+      selectedIndex.value = index;
+    };
+
+    const deleteMember = async () => {
+      await memberStore.deleteMember(route.params.taskId as string, whichForm.value, selectedIndex.value);
       const currentIndex = Number(whichIndex.value);
-      if (index <= currentIndex) {
+      if (selectedIndex.value <= currentIndex) {
         const newIndex = ref<number>(currentIndex - 1 > 0 ? currentIndex - 1 : 0);
-        await selectMember(newIndex.value, index === currentIndex ? true : undefined);
+        await selectMember(newIndex.value, selectedIndex.value === currentIndex ? true : undefined);
       }
+      deletionDialog.value = false;
     };
 
     const onInit = async () => {
@@ -1302,9 +1445,9 @@ export default {
     };
 
     watch(
-      () => dataStore.panel.open,
+      () => dataStore.rightPanel.open,
       () => {
-        if (dataStore.panel.open === false) {
+        if (dataStore.rightPanel.open === false) {
           isPanelOpen.value = false;
           isDocumentOpen.value = false;
           isSearchOpen.value = false;
@@ -1320,6 +1463,30 @@ export default {
         searchQuery.value = '';
       }
     });
+    if (dataStore.isLifetrip) {
+      watch(
+        () => member.value.age,
+        val => {
+          if (val && Number(val) >= 18) {
+            if (member.value.hasAgreement !== true) {
+              member.value.hasAgreement = false;
+            }
+          } else {
+            member.value.hasAgreement = true;
+          }
+          member.value.isInsuredUnderage = Number(val) >= 18 ? false : true;
+        },
+      );
+      watch(
+        () => member.value.isInsuredUnderage,
+        val => {
+          if (val === true && Number(member.value.age) >= 18) {
+            member.value.isInsuredUnderage = false;
+            return dataStore.showToaster('error', dataStore.t('toaster.underageShouldBeLess18'), 3000);
+          }
+        },
+      );
+    }
 
     return {
       // State
@@ -1342,6 +1509,8 @@ export default {
       Value,
       memberDocument,
       familyDialog,
+      deletionDialog,
+      selectedIndex,
       selectedFamilyMember,
       sameAddress,
 
@@ -1359,10 +1528,13 @@ export default {
       hasGBDFL,
       hasInsis,
       hasGKB,
+      hasMiddleName,
+      hasRelationDegree,
       hasFamilyStatus,
       hasInsurancePay,
       hasSignOfIPDL,
       hasSameAddressToggle,
+      hasMemberSearch,
 
       // Rules
       ageRule,
@@ -1385,6 +1557,7 @@ export default {
       getFile,
       selectFamilyMember,
       closeFamilyDialog,
+      openDeletionDialog,
       scrollForm,
       onIinInput,
       onOtpCodeInput,