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

package/components/Dialog/Dialog.vue

@@ -1,5 +1,5 @@
 <template>
-  <v-dialog v-model="fieldModel" :persistent="true">
+  <v-dialog :model-value="modelValue" @update:modelValue="$emit('update:modelValue', $event)" :persistent="true">
     <v-card class="self-center w-full sm:w-3/4 md:w-2/3 lg:w-2/4 xl:w-[600px] rounded-lg !p-2">
       <v-card-title>
         <slot v-if="!title" name="title"></slot>
@@ -41,39 +41,6 @@ export default defineComponent({
       default: 'default',
     },
   },
-  emits: ['update:modelValue', 'submitted', 'yes', 'no'],
-  setup(props, { emit }) {
-    const fieldModel = ref(props.modelValue);
-
-    const updateValue = (event: boolean) => {
-      fieldModel.value = event;
-    };
-
-    const submitted = (event: any) => {
-      emit('submitted', event);
-    };
-
-    watch(
-      fieldModel,
-      () => {
-        emit('update:modelValue', fieldModel.value);
-      },
-      { immediate: true },
-    );
-
-    watch(
-      () => props.modelValue,
-      () => {
-        fieldModel.value = props.modelValue;
-      },
-      { immediate: true },
-    );
-
-    return {
-      fieldModel,
-      submitted,
-      updateValue,
-    };
-  },
+  emits: ['update:modelValue', 'yes', 'no'],
 });
 </script>

package/components/Form/FormBlock.vue

@@ -119,7 +119,7 @@ export default defineComponent({
     const member: Member = formStore[props.whichForm as MemberKeys];
 
     const isShort = computed(() => props.type === 'short');
-    const isActionsAvailable = computed(() => memberStore.isStatementEditible(props.whichForm) && memberStore.validateInitiator(false));
+    const isActionsAvailable = computed(() => memberStore.isStatementEditible(props.whichForm));
 
     const getMemberInfo = (memberData: Member) => {
       return {

package/components/Form/ManagerAttachment.vue

@@ -117,6 +117,7 @@ export default defineComponent({
       () =>
         props.disabled ||
         route.params.taskId === '0' ||
+        !dataStore.isInitiator() ||
         (route.params.taskId !== '0' && (!dataStore.isProcessEditable(formStore.applicationData.statusCode) || !dataStore.isTask())),
     );
 

package/components/Pages/Anketa.vue

@@ -69,7 +69,7 @@
           </base-form-text-section>
         </section>
       </v-form>
-      <base-btn class="my-[14px] self-center" :loading="isButtonLoading" :disabled="formStore.isDisabled[whichSurvey]" @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"

package/components/Pages/MemberForm.vue

@@ -1,7 +1,31 @@
 <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">
-      <base-form-section :title="$t('form.personalData')">
+      <div v-if="memberSetting.has === true && memberSetting.isMultiple === true" class="flex items-center mt-[14px] min-h-[54px]">
+        <div :class="[$libStyles.blueBgLight]" class="flex flex-wrap items-center gap-2 p-1 rounded-t-[8px] h-full">
+          <div
+            v-for="(each, index) of formStore[whichForm as MemberKeys]"
+            :key="index"
+            class="pl-3 pr-1 py-1 rounded-[8px] cursor-pointer flex items-center"
+            :class="[Number(whichIndex) === index ? `${$libStyles.blueBg} ${$libStyles.whiteText}` : '', $libStyles.textSimple]"
+            @click.self="index !== Number(whichIndex) ? selectMember(index) : null"
+          >
+            {{ `${$dataStore.menu.selectedItem.title} ${index + 1}` }}
+            <v-btn
+              icon="mdi-close !text-[20px]"
+              size="x-small"
+              :disabled="!memberStore.canMemberDeleted((whichForm as MemberKeys), index) && !memberStore.canMemberCleared((whichForm as MemberKeys), index)"
+              variant="plain"
+              :color="Number(whichIndex) === index ? '#FFF' : '#A0B3D8'"
+              @click.prevent="
+                memberStore.canMemberDeleted(whichForm as MemberKeys, index) || memberStore.canMemberCleared(whichForm as MemberKeys, index) ? deleteMember(index) : null
+              "
+            ></v-btn>
+          </div>
+        </div>
+        <v-btn class="ml-2" icon="mdi-plus !text-[24px]" @click="memberStore.addMember(whichForm as MemberKeys)" size="small" color="#A0B3D8" variant="tonal"></v-btn>
+      </div>
+      <base-form-section :title="$t('form.personalData')" :class="[memberSetting.has === true && memberSetting.isMultiple === true ? 'rounded-t-0 !mt-[-5px]' : 'mt-[14px]']">
         <base-form-input
           v-model="member.phoneNumber"
           :label="$t('form.phoneNumber')"
@@ -21,6 +45,7 @@
           :clearable="!isDisabled"
           :append-inner-icon="showSaveButton ? 'mdi mdi-magnify' : ''"
           @append="searchMember"
+          @input="onIinInput"
           :rules="$rules.required.concat($rules.iinRight)"
         ></base-form-input>
         <base-form-input
@@ -488,6 +513,7 @@
             :append-inner-icon="hasOtp ? 'mdi-cellphone-message text-[17px]' : ''"
             hide-details
             @keyup.enter.prevent="hasOtp ? checkOtp() : null"
+            @input="onOtpCodeInput"
           ></base-rounded-input>
         </base-fade-transition>
         <base-btn v-if="!member.otpTokenId" :disabled="otpSending" :loading="otpSending" :text="$t('buttons.sendOtp')" @click="sendOtp(false)"></base-btn>
@@ -505,7 +531,7 @@
 
 <script lang="ts">
 import { LocationQueryValue } from 'vue-router';
-import { Value, DocumentItem } from '@/composables/classes';
+import { Value, DocumentItem, Member } from '@/composables/classes';
 import { uuid } from 'vue-uuid';
 
 export default {
@@ -530,6 +556,7 @@ export default {
     const isDocumentOpen = ref<boolean>(false);
     const isOtpPanelOpen = ref<boolean>(false);
     const isPanelLoading = ref<boolean>(false);
+    const isChangingMember = ref<boolean>(false);
     const familyDialog = ref<boolean>(false);
     const sameAddress = ref<boolean>(false);
     const panelValue = ref<Value>(new Value());
@@ -540,6 +567,7 @@ export default {
 
     const whichForm = computed(() => route.query.tab);
     const whichIndex = computed(() => route.query.i);
+    const memberSetting = computed(() => dataStore.members[memberStore.getMemberApplicationCode(whichForm.value as MemberKeys) as keyof typeof dataStore.members]);
     const hasOtp = computed(() => member.value.otpCode && member.value.otpCode.length === useMask().otp.length);
     const isDisabled = computed(() => !memberStore.isStatementEditible(whichForm.value as string));
     const isTask = computed(() => route.params.taskId === '0' || dataStore.isTask());
@@ -781,55 +809,6 @@ export default {
       }
     };
 
-    const setAddress = () => {
-      const beneficiary = formStore.beneficiaryForm[Number(whichIndex.value)];
-      const policyholder = formStore.policyholderForm;
-      if (sameAddress.value === true) {
-        beneficiary.registrationCity = policyholder.registrationCity;
-        beneficiary.registrationCountry = policyholder.registrationCountry;
-        beneficiary.birthPlace = policyholder.birthPlace;
-        beneficiary.registrationMicroDistrict = policyholder.registrationMicroDistrict;
-        beneficiary.registrationNumberApartment = policyholder.registrationNumberApartment;
-        beneficiary.registrationNumberApartment = policyholder.registrationNumberApartment;
-        beneficiary.registrationNumberHouse = policyholder.registrationNumberHouse;
-        beneficiary.registrationProvince = policyholder.registrationProvince;
-        beneficiary.registrationQuarter = policyholder.registrationQuarter;
-        beneficiary.registrationRegion = policyholder.registrationRegion;
-        beneficiary.registrationRegionType = policyholder.registrationRegionType;
-        beneficiary.registrationStreet = policyholder.registrationStreet;
-      } else {
-        if (beneficiary.id === 0) {
-          beneficiary.registrationCity = new Value();
-          beneficiary.registrationCountry = new Value();
-          beneficiary.registrationMicroDistrict = '';
-          beneficiary.registrationNumberApartment = '';
-          beneficiary.registrationNumberApartment = '';
-          beneficiary.registrationNumberHouse = '';
-          beneficiary.registrationProvince = new Value();
-          beneficiary.registrationQuarter = '';
-          beneficiary.registrationRegion = new Value();
-          beneficiary.registrationRegionType = new Value();
-          beneficiary.registrationStreet = '';
-        } else {
-          const country = dataStore.countries.find(i => (i.nameRu as string).match(new RegExp(beneficiary.response?.addresses[0].countryName, 'i')));
-          const city = dataStore.cities.find(i => i.nameRu === beneficiary.response?.addresses[0].cityName.replace('г.', ''));
-          const province = dataStore.states.find(i => i.ids === beneficiary.response?.addresses[0].stateCode);
-          const localityType = dataStore.localityTypes.find(i => i.nameRu === beneficiary.response?.addresses[0].cityTypeName);
-          const region = dataStore.regions.find(i => i.ids == beneficiary.response?.addresses[0].regionCode);
-          beneficiary.registrationCountry = country ?? new Value();
-          beneficiary.registrationCity = city ?? new Value();
-          beneficiary.registrationMicroDistrict = beneficiary.response?.addresses[0].microRaion ?? '';
-          beneficiary.registrationNumberApartment = beneficiary.response?.addresses[0].apartmentNumber ?? '';
-          beneficiary.registrationNumberHouse = beneficiary.response?.addresses[0].blockNumber ?? '';
-          beneficiary.registrationProvince = province ?? new Value();
-          beneficiary.registrationQuarter = beneficiary.response?.addresses[0].kvartal ?? '';
-          beneficiary.registrationRegion = region ?? new Value();
-          beneficiary.registrationRegionType = localityType ?? new Value();
-          beneficiary.registrationStreet = beneficiary.response?.addresses[0].streetName ?? '';
-        }
-      }
-    };
-
     const uploadFile = async (processInstanceId: string | number) => {
       const selectedDocument = dataStore.dicFileTypeList.find((i: Value) => i.nameRu === member.value.documentType.nameRu);
       const formData = new FormData();
@@ -1185,27 +1164,40 @@ export default {
       }
     };
 
-    const onInit = async () => {
-      if (route.params.taskId === '0' || (route.params.taskId !== '0' && dataStore.isProcessEditable(formStore.applicationData.statusCode))) {
-        await dataStore.getSignedDocList(formStore.applicationData.processInstanceId);
+    const selectMember = async (index: number, update?: boolean) => {
+      dataStore.panel.open = false;
+      isButtonLoading.value = true;
+      isChangingMember.value = true;
+      //@ts-ignore
+      await router.replace({ query: { ...route.query, i: index, id: getMember(route.query.tab, index).id, upd: update } });
+      isChangingMember.value = false;
+      isButtonLoading.value = false;
+    };
+
+    const deleteMember = async (index: number) => {
+      await memberStore.deleteMember(route.params.taskId as string, whichForm.value as MemberKeys, index);
+      const currentIndex = Number(whichIndex.value);
+      if (index <= currentIndex) {
+        const newIndex = ref<number>(currentIndex - 1 > 0 ? currentIndex - 1 : 0);
+        await selectMember(newIndex.value, index === currentIndex ? true : undefined);
       }
+    };
+
+    const onInit = async () => {
+      // if (route.params.taskId === '0' || (route.params.taskId !== '0' && dataStore.isProcessEditable(formStore.applicationData.statusCode))) {
+      //   await dataStore.getSignedDocList(formStore.applicationData.processInstanceId);
+      // }
       if (getOtpConditionByMember()) {
         await sendOtp(true);
       } else {
         if (member.value.hasAgreement === null) member.value.hasAgreement = true;
       }
-      if (route.query.id !== '0' && !member.value.id) {
-        await dataStore.getContragentById(route.query.id, whichForm.value, true);
-      }
-      if (member.value.id && route.query.id === '0') {
-        await router.replace({
-          name: route.name!,
-          query: { ...route.query, id: member.value.id },
-        });
-      }
-      if (member.value.id) {
-        const filteredDocuments: DocumentItem[] = dataStore.getFilesByIIN(member.value.iin!.replace(/-/g, '')) as DocumentItem[];
-        if (filteredDocuments && filteredDocuments.length) memberDocument.value = filteredDocuments[0];
+      if (!member.value.id) {
+        await router.replace({ query: { ...route.query, id: 0 } });
+      } else {
+        if (route.query.id !== String(member.value.id)) await router.replace({ query: { ...route.query, id: member.value.id } });
+        // const filteredDocuments: DocumentItem[] = dataStore.getFilesByIIN(member.value.iin!.replace(/-/g, '')) as DocumentItem[];
+        // if (filteredDocuments && filteredDocuments.length) memberDocument.value = filteredDocuments[0];
       }
       await setDefaultValues();
     };
@@ -1214,30 +1206,26 @@ export default {
       await onInit();
     });
 
-    onBeforeRouteUpdate(to => {
-      if ('tab' in to.query && to.query.tab !== 'productConditions') {
-        member.value = getMember(to.query.tab, to.query.i);
-      }
-    });
-
     watch(
       () => sameAddress.value,
       () => {
-        if (whichForm.value === formStore.beneficiaryFormKey) setAddress();
+        if (whichForm.value === formStore.beneficiaryFormKey) setAddressBeneficiary(Number(whichIndex.value), sameAddress.value);
       },
     );
 
     watch(
       () => member.value.percentageOfPayoutAmount,
       val => {
-        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 (isChangingMember.value === false) {
+          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);
+            }
           }
         }
       },
@@ -1246,21 +1234,28 @@ export default {
     watch(
       () => member.value.birthDate,
       val => {
-        if (val && val.length === useMask().date.length) {
+        if (val && val.length === useMask().date.length && isChangingMember.value === false) {
           const calculatedAge = member.value.getAgeByBirthDate();
           if (calculatedAge) member.value.age = calculatedAge;
         }
       },
     );
 
-    // watch(
-    //   () => member.value.otpCode,
-    //   async () => {
-    //     if (member.value.otpCode && member.value.otpCode.length === useMask().otp.length) {
-    //       await checkOtp();
-    //     }
-    //   },
-    // );
+    const onIinInput = () => {
+      if (!!member.value.iin && member.value.iin.length === useMask().iin.length && memberSetting.value.isMultiple === true) {
+        const alreadyInStatement = formStore[whichForm.value as MemberKeys].findIndex((i: Member) => i.iin === member.value.iin);
+        if (alreadyInStatement !== -1 && alreadyInStatement !== Number(whichIndex.value)) {
+          dataStore.showToaster('error', dataStore.t('toaster.hasAlreadyMember'), 3000);
+          member.value.iin = null;
+        }
+      }
+    };
+
+    const onOtpCodeInput = async () => {
+      if (member.value.otpCode && member.value.otpCode.length === useMask().otp.length) {
+        await checkOtp();
+      }
+    };
 
     watch(
       () => dataStore.panel.open,
@@ -1309,6 +1304,7 @@ export default {
       // Computed
       whichForm,
       whichIndex,
+      memberSetting,
       otpCondition,
       hasOtp,
       isDisabled,
@@ -1342,6 +1338,10 @@ export default {
       selectFamilyMember,
       closeFamilyDialog,
       scrollForm,
+      onIinInput,
+      onOtpCodeInput,
+      deleteMember,
+      selectMember,
     };
   },
 };

package/components/Utilities/Chip.vue

@@ -9,7 +9,6 @@ export default defineComponent({
   props: {
     chip: {
       type: Object as PropType<ChipComponent>,
-      required: true,
     },
     color: {
       type: String,
@@ -17,7 +16,7 @@ export default defineComponent({
     },
     textSize: {
       type: String,
-      default: '!text-[11px]',
+      default: '!text-[10px]',
     },
     maxWidth: {
       type: [String, Number],

package/composables/classes.ts

@@ -802,10 +802,12 @@ export class MemberSettings {
   has?: boolean;
   isMultiple?: boolean;
   required?: boolean;
-  constructor(options?: { has?: boolean; isMultiple?: boolean; required?: boolean }) {
+  limit?: number;
+  constructor(options?: { has?: boolean; isMultiple?: boolean; required?: boolean; limit?: number }) {
     if (options) {
       this.has = options.has;
       this.isMultiple = options.isMultiple;
+      this.limit = options.limit;
       if (this.has === true) {
         this.required = options.required;
       } else {

package/composables/index.ts

@@ -175,3 +175,54 @@ export const ErrorHandler = (err: unknown, errorText?: string) => {
   }
   return false;
 };
+
+export const setAddressBeneficiary = (whichIndex: number, sameAddress: boolean) => {
+  const formStore = useFormStore();
+  const dataStore = useDataStore();
+  const beneficiary = formStore.beneficiaryForm[Number(whichIndex)];
+  const policyholder = formStore.policyholderForm;
+  if (sameAddress === true) {
+    beneficiary.registrationCity = policyholder.registrationCity;
+    beneficiary.registrationCountry = policyholder.registrationCountry;
+    beneficiary.birthPlace = policyholder.birthPlace;
+    beneficiary.registrationMicroDistrict = policyholder.registrationMicroDistrict;
+    beneficiary.registrationNumberApartment = policyholder.registrationNumberApartment;
+    beneficiary.registrationNumberApartment = policyholder.registrationNumberApartment;
+    beneficiary.registrationNumberHouse = policyholder.registrationNumberHouse;
+    beneficiary.registrationProvince = policyholder.registrationProvince;
+    beneficiary.registrationQuarter = policyholder.registrationQuarter;
+    beneficiary.registrationRegion = policyholder.registrationRegion;
+    beneficiary.registrationRegionType = policyholder.registrationRegionType;
+    beneficiary.registrationStreet = policyholder.registrationStreet;
+  } else {
+    if (beneficiary.id === 0) {
+      beneficiary.registrationCity = new Value();
+      beneficiary.registrationCountry = new Value();
+      beneficiary.registrationMicroDistrict = '';
+      beneficiary.registrationNumberApartment = '';
+      beneficiary.registrationNumberApartment = '';
+      beneficiary.registrationNumberHouse = '';
+      beneficiary.registrationProvince = new Value();
+      beneficiary.registrationQuarter = '';
+      beneficiary.registrationRegion = new Value();
+      beneficiary.registrationRegionType = new Value();
+      beneficiary.registrationStreet = '';
+    } else {
+      const country = dataStore.countries.find(i => (i.nameRu as string).match(new RegExp(beneficiary.response?.addresses[0].countryName, 'i')));
+      const city = dataStore.cities.find(i => i.nameRu === beneficiary.response?.addresses[0].cityName.replace('г.', ''));
+      const province = dataStore.states.find(i => i.ids === beneficiary.response?.addresses[0].stateCode);
+      const localityType = dataStore.localityTypes.find(i => i.nameRu === beneficiary.response?.addresses[0].cityTypeName);
+      const region = dataStore.regions.find(i => i.ids == beneficiary.response?.addresses[0].regionCode);
+      beneficiary.registrationCountry = country ?? new Value();
+      beneficiary.registrationCity = city ?? new Value();
+      beneficiary.registrationMicroDistrict = beneficiary.response?.addresses[0].microRaion ?? '';
+      beneficiary.registrationNumberApartment = beneficiary.response?.addresses[0].apartmentNumber ?? '';
+      beneficiary.registrationNumberHouse = beneficiary.response?.addresses[0].blockNumber ?? '';
+      beneficiary.registrationProvince = province ?? new Value();
+      beneficiary.registrationQuarter = beneficiary.response?.addresses[0].kvartal ?? '';
+      beneficiary.registrationRegion = region ?? new Value();
+      beneficiary.registrationRegionType = localityType ?? new Value();
+      beneficiary.registrationStreet = beneficiary.response?.addresses[0].streetName ?? '';
+    }
+  }
+};

package/locales/en.json

@@ -21,6 +21,8 @@
     "memberSave": "Error while saving members"
   },
   "toaster": {
+    "membersLimit": "The number of these members has been exceeded. The limit is: {text}",
+    "hasAlreadyMember": "Member with such IIN is already in statement",
     "noIinOrPhone": "Missing data to send SMS",
     "ESBDErrorMessage": "Incorrect data entered for this IIN",
     "phoneNotFoundInBMG": "Enter a number registered in BMG or register the contragent in BMG",
@@ -376,6 +378,7 @@
     "new": "Подать заявление"
   },
   "labels": {
+    "newVersion": "New",
     "code": "Code",
     "codes": "Codes",
     "listType": "List type",

package/locales/kz.json

@@ -21,6 +21,8 @@
     "memberSave": "Қатысушы мәліметтерін сақтау кезіндегі қате"
   },
   "toaster": {
+    "membersLimit": "Количество этих участников превышено. Лимит составляет: {text}",
+    "hasAlreadyMember": "Участник с таким ИИН уже есть в заявке",
     "noIinOrPhone": "SMS жіберу үшін дереккөз мәліметтер жоқ",
     "ESBDErrorMessage": "Бұл ЖСН бойынша дұрыс мәліметтер енгізілмеді",
     "phoneNotFoundInBMG": "БМГ-де тіркелген нөмірді енгізіңіз немесе контрагентті БМГ-де тіркеу",
@@ -376,6 +378,7 @@
     "new": "Өтінім жасау"
   },
   "labels": {
+    "newVersion": "Жаңа версия",
     "code": "Код",
     "codes": "Коды",
     "listType": "Тип списка",

package/locales/ru.json

@@ -21,6 +21,8 @@
     "memberSave": "Ошибка при сохранении данных участников"
   },
   "toaster": {
+    "membersLimit": "Количество этих участников превышено. Лимит составляет: {text}",
+    "hasAlreadyMember": "Участник с таким ИИН уже есть в заявке",
     "noIinOrPhone": "Отсутствуют данные для отправки СМС",
     "ESBDErrorMessage": "Введены не  корректные данные по этому ИИН",
     "phoneNotFoundInBMG": "Введите номер зарегистрированный в БМГ или зарегистрируйте контрагента в БМГ",
@@ -376,6 +378,7 @@
     "new": "Подать заявление"
   },
   "labels": {
+    "newVersion": "Новая версия",
     "code": "Код",
     "codes": "Коды",
     "listType": "Тип списка",

package/package.json

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

package/store/data.store.js

@@ -834,9 +834,9 @@ export const useDataStore = defineStore('data', {
             if(
               this.formStore.applicationData.insuredApp.every(i => i.iin !== data.iin) &&
               data.id !== null) {
-                await this.api.deleteMember('Insured', data.id);
-                delete data.id;
-              }
+              await this.api.deleteMember('Insured', data.id);
+              delete data.id;
+            }
           }
           data.isDisability = this.formStore.isPolicyholderInsured ? false : member.isDisability.nameRu == 'Да';
           data.disabilityGroupId = data.isDisability ? member.disabilityGroupId.id : null;
@@ -1644,9 +1644,9 @@ export const useDataStore = defineStore('data', {
           this.setMembersField(this.formStore.policyholderFormKey, 'clientApp');
           if (insuredData && insuredData.length) {
             insuredData.forEach((each, index) => {
+              this.setMembersFieldIndex(this.formStore.insuredFormKey, 'insuredApp', index);
               const relationDegree = this.relations.find(i => i.ids == each.relationId);
               this.formStore.insuredForm[index].relationDegree = relationDegree ? relationDegree : new Value();
-              this.setMembersFieldIndex(this.formStore.insuredFormKey, 'insuredApp', index);
             });
           }
 

package/store/member.store.ts

@@ -13,6 +13,7 @@ export const useMemberStore = defineStore('members', {
   }),
   actions: {
     isStatementEditible(whichForm: string, showToaster: boolean = false) {
+      if (!this.validateInitiator(false)) return false;
       if (this.formStore.isDisabled[whichForm as keyof typeof this.formStore.isDisabled] === true) {
         if (showToaster) this.dataStore.showToaster('error', this.dataStore.t('toaster.viewErrorText'), 2000);
         return false;
@@ -27,14 +28,21 @@ export const useMemberStore = defineStore('members', {
       return true;
     },
     hasMemberData(whichForm: MemberKeys, whichIndex?: number, key: string = 'id', emptyValue: any = 0) {
-      if (!this.validateInitiator(false)) return false;
       if (!this.isStatementEditible(whichForm)) return false;
       return typeof whichIndex === 'number' ? this.formStore[whichForm][whichIndex][key] != emptyValue : this.formStore[whichForm][key] != emptyValue;
     },
+    canMemberCleared(whichForm: MemberKeys, whichIndex?: number) {
+      if (!whichForm) return false;
+      if (!this.isStatementEditible(whichForm)) return false;
+      if (typeof whichIndex === 'number') {
+        return this.formStore[whichForm][whichIndex].id === 0 && (!!this.formStore[whichForm][whichIndex].iin || !!this.formStore[whichForm][whichIndex].phoneNumber);
+      } else {
+        return this.formStore[whichForm].id === 0 && (!!this.formStore[whichForm].iin || !!this.formStore[whichForm].phoneNumber);
+      }
+    },
     canMemberDeleted(whichForm: MemberKeys, whichIndex?: number) {
       if (!whichForm) return false;
       if (!this.isStatementEditible(whichForm)) return false;
-      if (!this.validateInitiator(false)) return false;
       if (typeof whichIndex === 'number') {
         if (whichIndex > 0) {
           return true;
@@ -135,7 +143,6 @@ export const useMemberStore = defineStore('members', {
     clearMember(whichForm: MemberKeys, whichIndex?: number) {
       if (!whichForm) return false;
       if (!this.isStatementEditible(whichForm)) return false;
-      if (!this.validateInitiator()) return false;
       if (whichForm === this.formStore.policyholderFormKey || whichForm === this.formStore.policyholdersRepresentativeFormKey) {
         //@ts-ignore
         this.formStore[whichForm] = this.getMemberClass(whichForm);
@@ -152,7 +159,6 @@ export const useMemberStore = defineStore('members', {
     async deleteMember(taskId: string, whichForm: MemberKeys, whichIndex?: number, refetch: boolean = true) {
       if (!whichForm) return false;
       if (!this.isStatementEditible(whichForm)) return false;
-      if (!this.validateInitiator()) return false;
       try {
         const memberCode = this.getMemberCode(whichForm);
         const memberData = this.getMemberFromApplication(whichForm, whichIndex);
@@ -262,8 +268,16 @@ export const useMemberStore = defineStore('members', {
     addMember(whichForm: MemberKeys) {
       if (!whichForm) return false;
       if (!this.isStatementEditible(whichForm)) return false;
-      if (!this.validateInitiator()) return false;
-      this.formStore[whichForm].push(this.getMemberClass(whichForm));
+      const limit = this.dataStore.members[this.getMemberApplicationCode(whichForm)!].limit;
+      if (typeof limit === 'number') {
+        if (this.formStore[whichForm].length < limit) {
+          this.formStore[whichForm].push(this.getMemberClass(whichForm));
+        } else {
+          this.dataStore.showToaster('error', this.dataStore.t('toaster.membersLimit', { text: limit }));
+        }
+      } else {
+        this.formStore[whichForm].push(this.getMemberClass(whichForm));
+      }
     },
     async getOtpStatus(iin: string, phone: string, processInstanceId: string | number | null = null) {
       try {