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

package/api/base.api.ts

@@ -114,6 +114,13 @@ export class ApiClass {
     });
   }
 
+  async getEconomicActivityType() {
+    return await this.axiosCall<Value[]>({
+      method: Methods.GET,
+      url: '/Ekk/api/Contragentinsis/DictionaryItems/Questionary?filter=500024',
+    });
+  }
+
   async getFamilyStatuses() {
     return await this.axiosCall<Value[]>({
       method: Methods.GET,
@@ -773,4 +780,83 @@ export class ApiClass {
       url: `/Arm/api/Dictionary/ProcessGfot/${processCode}`,
     });
   }
+
+  async getClientData(clientId: string) {
+    return this.axiosCall({
+      method: Methods.GET,
+      url: `/${this.productUrl}/api/Application/GetClientData`,
+      params: {
+        clientId,
+      },
+    });
+  }
+
+  async getInsuredData(insuredId: string) {
+    return this.axiosCall({
+      method: Methods.GET,
+      url: `/${this.productUrl}/api/Application/GetClientData`,
+      params: {
+        insuredId,
+      },
+    });
+  }
+
+  async getBeneficiaryData(beneficiaryId: string) {
+    return this.axiosCall({
+      method: Methods.GET,
+      url: `/${this.productUrl}/api/Application/GetBeneficiaryData`,
+      params: {
+        beneficiaryId,
+      },
+    });
+  }
+
+  async saveClientData(clientId: string) {
+    return this.axiosCall({
+      method: Methods.POST,
+      url: `/${this.productUrl}/api/Application/SaveClient`,
+      params: {
+        clientId,
+      },
+    });
+  }
+
+  async saveInsuredData(processInstanceId: string, insuredId: string) {
+    return this.axiosCall({
+      method: Methods.POST,
+      url: `/${this.productUrl}/api/Application/SaveInsured`,
+      params: {
+        processInstanceId,
+        insuredId,
+      },
+    });
+  }
+
+  async saveBeneficiaryData(processInstanceId: string, benificiaryId: string) {
+    return this.axiosCall({
+      method: Methods.POST,
+      url: `/${this.productUrl}/api/Application/SaveBenificiary`,
+      params: {
+        processInstanceId,
+        benificiaryId,
+      },
+    });
+  }
+
+  async setApplicationData() {
+    return this.axiosCall({
+      method: Methods.POST,
+      url: `/${this.productUrl}/api/Application/SetApplicationData`,
+    });
+  }
+
+  async calculate(processInstanceId: string) {
+    return this.axiosCall({
+      method: Methods.POST,
+      url: `/${this.productUrl}/api/Application/Calculator`,
+      params: {
+        processInstanceId,
+      },
+    });
+  }
 }

package/components/Form/DynamicForm.vue

@@ -1,12 +1,30 @@
 <template>
   <v-form class="dynamic-form">
     <base-form-section v-for="(section, sectionIndex) in form.sections" :key="sectionIndex" class="rounded-lg" :title="section.title">
-      <base-dynamic-input :fields="section.fields" />
+      <base-dynamic-input :fields="section.fields" @onClickField="onClickField" />
     </base-form-section>
+    <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">
+          <base-panel-select-item :text="$dataStore.t('form.notChosen')" :selected="panelValue.nameRu === null" @click="pickPanelValue(new Value())" />
+          <base-panel-select-item
+            v-for="(item, index) of panelList.filter(i => i.nameRu && (i.nameRu as string).match(new RegExp(searchQuery, 'i')))"
+            :key="index"
+            :text="(item.nameRu as string)"
+            :selected="item.nameRu === panelValue.nameRu"
+            @click="pickPanelValue(item)"
+          />
+        </div>
+        <base-loader v-if="isPanelLoading" class="absolute mt-10" :size="50" />
+      </div>
+    </Teleport>
   </v-form>
 </template>
 
 <script lang="ts">
+import { Value } from '#imports';
+
 export default defineComponent({
   props: {
     form: {
@@ -14,5 +32,68 @@ export default defineComponent({
       required: true,
     },
   },
+  setup() {
+    const dataStore = useDataStore();
+    const isPanelOpen = ref<boolean>(false);
+    const panelValue = ref<Value>(new Value());
+    const panelList = ref<Value[]>([]);
+    const isPanelLoading = ref<boolean>(false);
+    const searchQuery = ref<string>('');
+    const listOfPanelTitles: {
+      [key in FetchFunctions]: string;
+    } = {
+      getResidents: 'form.signOfResidency',
+      getFamilyStatuses: 'form.familyStatus',
+      getRelationTypes: 'form.relations',
+      getCountries: 'form.Country',
+      getLocalityTypes: 'form.RegionType',
+      getStates: 'form.Province',
+      getCities: 'form.City',
+      getRegions: 'form.Region',
+      getDocumentTypes: 'form.documentType',
+      getTaxCountries: 'form.countryOfTaxResidency',
+      getCitizenshipCountries: 'form.countryOfCitizenship',
+      getSectorCodeList: 'form.economySectorCode',
+      getInsurancePay: 'form.insurancePay',
+      getEconomicActivityType: 'form.typeEconomicActivity',
+      getBanks: 'form.bankName',
+      getDocumentIssuers: 'form.documentIssuers',
+      getGenderList: 'form.gender',
+    };
+
+    const currentField = ref<InputType | null>(null);
+
+    const pickPanelValue = (item: Value) => {
+      if (currentField.value) {
+        currentField.value.modelValue = item;
+        dataStore.rightPanel.open = false;
+        searchQuery.value = '';
+        currentField.value = null;
+      }
+      isPanelOpen.value = false;
+    };
+
+    const onClickField = async (field: InputType) => {
+      currentField.value = field;
+      if (field.fetchFrom) {
+        isPanelLoading.value = true;
+        isPanelOpen.value = true;
+        dataStore.rightPanel.open = true;
+        dataStore.rightPanel.title = dataStore.t(listOfPanelTitles[field.fetchFrom]);
+        panelList.value = (await dataStore[field.fetchFrom]()) as Value[];
+        isPanelLoading.value = false;
+      }
+    };
+
+    return {
+      panelValue,
+      panelList,
+      isPanelOpen,
+      isPanelLoading,
+      searchQuery,
+      pickPanelValue,
+      onClickField,
+    };
+  },
 });
 </script>

package/components/Input/DynamicInput.vue

@@ -5,6 +5,7 @@
       :control="field"
       class="bg-[#fff]"
       :class="{ 'rounded-t-lg': fieldIndex === 0 || fields[fieldIndex - 1].type !== 'text', 'rounded-b-lg': fieldIndex === fields.length - 1 }"
+      @onClickField="$emit('onClickField', field)"
     />
     <base-switch-input v-if="field.type === 'switch'" :field="field" />
   </div>

package/components/Input/TextInput.vue

@@ -1,12 +1,12 @@
 <template>
-  <div class="base-text-input flex justify-between items-center pr-4 mb-[1px] bg-[#fff]">
+  <div class="base-text-input flex justify-between items-center pr-4 mb-[1px] bg-[#fff]" @click="$emit('onClickField')">
     <v-text-field v-model="control.modelValue" v-bind="textFieldProps" v-maska="mask">
       <div v-if="hasSuffix" class="absolute top-[27px] left-[18px] flex items-center justify-center">
         <p class="opacity-0 inline-block mr-[2px]">{{ control.modelValue }}</p>
         <span>{{ suffix }}</span>
       </div>
     </v-text-field>
-    <v-icon v-if="control.iconName" :icon="`mdi cursor-pointer ${iconsList[control.iconName]}`" color="#A0B3D8" @click="onClickIcon" />
+    <v-icon v-if="control.iconName" :icon="`mdi cursor-pointer ${iconsList[control.iconName]}`" color="#A0B3D8" />
     <vue-date-picker v-if="control.maska === 'date'" v-model="control.modelValue" v-bind="datePickerProps" @update:modelValue="$emit('update:modelValue', $event)">
       <template #trigger>
         <v-icon icon="mdi mdi-calendar-blank-outline cursor-pointer" color="#a0b3d8" />
@@ -38,6 +38,7 @@ export default defineComponent({
   },
   setup(props) {
     const mask = computed(() => (props.control.maska ? useMask()[props.control.maska] : ''));
+    const dataStore = useDataStore();
 
     const textFieldProps = computed(() => {
       return {
@@ -76,7 +77,12 @@ export default defineComponent({
       return hasSuffix.value ? suffixList[props.control.suffix!] : '';
     });
 
-    const onClickIcon = () => {};
+    const onClickIcon = async () => {
+      if (props.control.fetchFrom) {
+        dataStore.rightPanel.open = true;
+        dataStore.rightPanel.title = 'test panel name';
+      }
+    };
 
     return {
       // State
@@ -86,7 +92,6 @@ export default defineComponent({
       mask,
       suffix,
       iconsList,
-
       // Functions
       onClickIcon,
     };

package/components/Pages/MemberForm.vue

@@ -891,7 +891,7 @@ export default {
           isPanelLoading.value = true;
           newList = await asyncFunction(filterKey, member.value);
         }
-        panelList.value = filterList(newList, key); 
+        panelList.value = filterList(newList, key);
         panelValue.value = member.value[currentPanel.value];
         isPanelLoading.value = false;
       } else {

package/components/Pages/ProductConditions.vue

@@ -1,6 +1,6 @@
 <template>
   <section class="flex flex-col gap-4 px-[10px]">
-    <v-form ref="vForm" @submit="submitForm" class="max-h-[80svh] overflow-y-scroll">
+    <v-form ref="vForm" @submit="submitForm" class="overflow-y-scroll" :class="[!$dataStore.isCalculator && isCalculator && hasCalculated ? 'max-h-[73svh]' : 'max-h-[80svh]']">
       <base-message-block
         v-if="isCalculator"
         class="mt-4"
@@ -44,7 +44,7 @@
         <base-form-input v-model="formStore.policyholderForm.age" :label="$dataStore.t('form.age')" :readonly="true" />
         <base-form-input v-model="formStore.policyholderForm.gender.nameRu" class="mb-4" :label="$dataStore.t('form.gender')" :readonly="true" />
       </base-form-section>
-      <base-form-section v-if="isUnderwriterRole && $dataStore.members.insuredApp.has === true && !$dataStore.isLifeBusiness" :title="$dataStore.t('insuredForm')">
+      <base-form-section v-if="isUnderwriterRole && $dataStore.members.insuredApp.has === true && whichProduct !== 'lifebusiness'" :title="$dataStore.t('insuredForm')">
         <div v-for="(insured, index) of formStore.insuredForm" :key="index">
           <base-form-input v-model="insured.longName" :label="$dataStore.t('labels.insurerLongName')" :readonly="true" />
           <base-form-input v-model="insured.job" :label="$dataStore.t('form.job')" :readonly="true" />
@@ -274,7 +274,7 @@
           :clearable="!isDisabledProcessGfot"
           :label="$dataStore.t('productConditionsForm.processGfot')"
           append-inner-icon="mdi mdi-chevron-right"
-          @append="openPanel($dataStore.t('productConditionsForm.processGfot'), $dataStore.processTariff, 'processGfot', $dataStore.getProcessGfot)"
+          @append="openPanel($dataStore.t('productConditionsForm.processGfot'), $dataStore.processGfot, 'processGfot', $dataStore.getProcessGfot)"
         />
       </base-form-section>
       <base-form-section v-if="hasAnnuityPayments" :title="$dataStore.t('calculationAnnuityPayments')">
@@ -629,7 +629,7 @@ export default defineComponent({
     });
     const isDisabled = computed(() => (dataStore.isCalculator ? false : !memberStore.isStatementEditible('productConditionsForm')));
     const isTermsDisabled = computed(() => {
-      if (dataStore.isGons || whichProduct.value === 'gons') {
+      if (whichProduct.value === 'gons') {
         return true;
       }
       return isDisabled.value;
@@ -642,7 +642,7 @@ export default defineComponent({
       if (dataStore.isUnderwriter() && !isRecalculationDisabled.value) {
         return false;
       }
-      if (dataStore.isLifeBusiness) {
+      if (whichProduct.value === 'lifebusiness') {
         return true;
       }
       return isDisabled.value;
@@ -1351,8 +1351,10 @@ export default defineComponent({
             if (defaultData.signDate) {
               productConditionsForm.signDate = reformatDate(defaultData.signDate);
             }
-            if (dataStore.isLifeBusiness) {
+            if (whichProduct.value === 'lifebusiness') {
               productConditionsForm.coverPeriod = defaultData.insTermInMonth ?? null;
+              productConditionsForm.requestedSumInsured = null;
+              productConditionsForm.insurancePremiumPerMonth = null;
             }
           }
         }
@@ -1364,7 +1366,7 @@ export default defineComponent({
       if (!!productConditionsForm.requestedSumInsured) {
         whichSum.value = 'requestedSumInsured';
       }
-      if (dataStore.isLifeBusiness && !productConditionsForm.requestedSumInsured) {
+      if (whichProduct.value === 'lifebusiness' && !productConditionsForm.requestedSumInsured) {
         whichSum.value = 'requestedSumInsured';
       }
       if (dataStore.isCalculator) {

package/components/Panel/PanelHandler.vue

@@ -27,10 +27,11 @@
     </div>
   </section>
   <section v-if="chooseSignActions">
-    <div v-if="!isElectronicContract && !isPaperContract && !isScansDocuments" :class="[$styles.flexColNav]">
+    <div v-if="!isElectronicContract && !isPaperContract && !isScansDocuments && !isQr" :class="[$styles.flexColNav]">
       <base-btn :text="$dataStore.t('buttons.sendOnPaper')" :disabled="isPaperDisabled" @click="handleSignAction('paper')" />
       <base-btn :text="$dataStore.t('buttons.sendElectronically')" :disabled="isElectronicDisabled" @click="handleSignAction('electronic')" />
       <base-btn :text="$dataStore.t('buttons.generatePrintedForms')" :disabled="isScansDisabled" @click="handleSignAction('scans')" />
+      <base-btn :text="$dataStore.t('buttons.sendEgovMob')" :disabled="isQrDisabled" @click="handleSignAction('qr')" />
     </div>
     <div v-if="isPaperContract" :class="[$styles.flexColNav]">
       <base-btn :text="$dataStore.t('buttons.downloadContract')" :loading="$dataStore.isButtonsLoading" @click="generateDocument" />
@@ -50,6 +51,14 @@
       <base-btn :text="$dataStore.t('buttons.sign')" :loading="$dataStore.isButtonsLoading" @click="sendFiles" />
       <base-btn :text="$dataStore.t('buttons.cancel')" :btn="$styles.whiteBtn" @click="isScansDocuments = false" />
     </div>
+    <div v-if="isQr" :class="[$styles.flexColNav]">
+      <base-form-section :title="''">
+        <img width="135" height="135" class="ma-auto" v-if="qrUrl" :src="qrUrl" alt="" />
+        <span :class="[$styles.textSimple]" class="mt-3 text-center">{{ $dataStore.t('sign.scanQrCode') }}</span>
+        <base-btn class="mt-10" :loading="loading" :text="$dataStore.t('sign.copyEgov')" @click="$dataStore.copyToClipboard(qrUrl)" />
+        <base-btn :text="$dataStore.t('buttons.cancel')" :btn="$styles.whiteBtn" @click="isQr = false" />
+      </base-form-section>
+    </div>
   </section>
   <section v-if="signingActions" class="relative">
     <base-fade-transition>
@@ -169,8 +178,10 @@ export default defineComponent({
     const loading = ref<boolean>(false);
     const isPaperContract = ref<boolean>(false);
     const isScansDocuments = ref<boolean>(false);
+    const isQr = ref<boolean>(false);
     const isElectronicContract = ref<boolean>(true);
     const email = ref<string>('');
+    const qrUrl = ref<string>('');
 
     const vForm = ref<any>();
     const isSendNumberOpen = ref<boolean>(false);
@@ -408,6 +419,12 @@ export default defineComponent({
       }
       return false;
     });
+    const isQrDisabled = computed(() => {
+      if (dataStore.isLifeBusiness) {
+        return false;
+      }
+      return true;
+    });
     const downloadTemplate = async () => {
       dataStore.panel.open = false;
       dataStore.panelAction = null;
@@ -424,7 +441,7 @@ export default defineComponent({
       });
     };
 
-    const handleSignAction = async (type: 'paper' | 'electronic' | 'scans') => {
+    const handleSignAction = async (type: 'paper' | 'electronic' | 'scans' | 'qr') => {
       if (type === 'electronic') {
         await dataStore.signDocument();
         isElectronicContract.value = true;
@@ -435,6 +452,17 @@ export default defineComponent({
       if (type === 'scans') {
         isScansDocuments.value = true;
       }
+      if (type === 'qr') {
+        await generateQR();
+        isQr.value = true;
+      }
+    };
+
+    // TODO Рефактор QR c npm
+    const generateQR = async () => {
+      const uuid = crypto.randomUUID();
+      const qrValue = `${getValuePerEnv('qrGenUrl')}/${uuid}`;
+      qrUrl.value = `https://api.qrserver.com/v1/create-qr-code/?size=135x135&data=${qrValue}`;
     };
 
     const generateDocument = async () => {
@@ -455,6 +483,8 @@ export default defineComponent({
       isPaperContract,
       isScansDocuments,
       email,
+      isQr,
+      qrUrl,
       // Functions
       closePanel,
       submitForm,
@@ -488,6 +518,7 @@ export default defineComponent({
       isPaperDisabled,
       isElectronicDisabled,
       isScansDisabled,
+      isQrDisabled,
     };
   },
 });

package/composables/classes.ts

@@ -980,6 +980,7 @@ export class DataStoreClass {
   residents: Value[];
   ipdl: Value[];
   economySectorCode: Value[];
+  economicActivityType: Value[];
   gender: Value[];
   fontSize: number;
   isFontChangerOpen: boolean = false;
@@ -1152,6 +1153,7 @@ export class DataStoreClass {
     this.residents = [];
     this.ipdl = [new Value(1, null), new Value(2, 'Да'), new Value(3, 'Нет')];
     this.economySectorCode = [];
+    this.economicActivityType = [];
     this.gender = [new Value(0, null), new Value(1, 'Мужской'), new Value(2, 'Женский')];
     this.fontSize = 14;
     this.isFontChangerOpen = false;
@@ -1437,7 +1439,7 @@ export class MemberV2 {
   resident: Value;
   taxResidentCountry: Value;
   economySectorCode: Value;
-  isActualAddressEqualLegalAddres: boolean;
+  isPublicPerson: boolean;
   identityDocument?: {
     documentType: Value;
     documentNumber: string | null;
@@ -1476,6 +1478,7 @@ export class MemberV2 {
     organizationEmail: string | null;
     organizationInternetResource: string | null;
     organizationStartDate: string | null;
+    isActualAddressEqualLegalAddres: boolean;
     activityTypes: {
       activityTypeName: string | null;
       empoloyeeCount: number | null;
@@ -1498,7 +1501,7 @@ export class MemberV2 {
     this.resident = new Value();
     this.taxResidentCountry = new Value();
     this.economySectorCode = new Value();
-    this.isActualAddressEqualLegalAddres = true;
+    this.isPublicPerson = false;
     this.identityDocument = {
       documentType: new Value(),
       documentNumber: null,
@@ -1537,6 +1540,7 @@ export class MemberV2 {
       organizationEmail: null,
       organizationInternetResource: null,
       organizationStartDate: null,
+      isActualAddressEqualLegalAddres: true,
       activityTypes: [
         {
           activityTypeName: null,
@@ -1544,7 +1548,7 @@ export class MemberV2 {
         },
       ],
     };
-    this.isLeader = true;
+    this.isLeader = false;
     this.beneficalOwnerQuest = [
       {
         order: 0,

package/composables/fields.ts

@@ -0,0 +1,203 @@
+import { i18n } from '../configs/i18n';
+import { FieldTypes } from '../types/form';
+
+const t = i18n.t;
+
+export const FieldBase = ({
+  label = '',
+  placeholder = '',
+  readonly = false,
+  disabled = false,
+  modelValue = null,
+  iconName = null,
+  rules = [],
+  maxLength = null,
+  clearable = true,
+  hint = undefined,
+  suffix = null,
+  maska = null,
+  key = '',
+  fetchFrom = null,
+}: InputBase): InputBase =>
+  ({
+    label,
+    placeholder,
+    readonly,
+    disabled,
+    modelValue,
+    iconName,
+    rules,
+    maxLength,
+    clearable,
+    hint,
+    suffix,
+    maska,
+    key,
+    fetchFrom,
+  } as InputBase);
+
+export const TextInput = ({ ...rest }: Partial<TextInput>): TextInput => {
+  return {
+    ...FieldBase(rest),
+    type: FieldTypes.TEXT,
+  };
+};
+
+export const SwitchInput = ({ ...rest }: Partial<SwitchInput>): SwitchInput => {
+  return {
+    ...FieldBase(rest),
+    type: FieldTypes.SWITCH,
+    direction: 'horizontal',
+    trueValue: null,
+    falseValue: null,
+    labeling: false,
+  };
+};
+
+export const NumberInput = ({ ...rest }: Partial<NumberInput>): NumberInput => {
+  return {
+    ...FieldBase(rest),
+    type: FieldTypes.NUMBER,
+  };
+};
+
+export const dynamic = <T>(obj: T, key: keyof T) => {
+  return computed({
+    get: () => {
+      const value = obj[key];
+      if (typeof value === 'object' && value) {
+        if ('nameRu' in value) return value.nameRu as any;
+      }
+      return value;
+    },
+    set: (val: any) => {
+      obj[key] = val;
+    },
+  });
+};
+
+type PersonalDataKeys = 'iin' | 'phoneNumber' | 'lastName' | 'firstName' | 'middleName' | 'citizenship' | 'position' | 'email' | 'gender';
+type PersonalData = Record<PersonalDataKeys, InputType>;
+
+type AddressesKeys = 'country' | 'province' | 'regionType' | 'city' | 'quarter' | 'microDistrict' | 'street' | 'houseNumber';
+type Address = Record<AddressesKeys, InputType>;
+
+type RepeatedFields = {
+  personalData: PersonalData;
+  address: Address;
+};
+
+export const RepeatedFields: RepeatedFields = {
+  personalData: {
+    iin: TextInput({
+      label: t('form.iin'),
+      maska: 'iin',
+    }),
+    phoneNumber: TextInput({
+      label: t('form.phoneNumber'),
+      maska: 'phone',
+    }),
+    lastName: TextInput({
+      label: t('form.lastName'),
+    }),
+    firstName: TextInput({
+      label: t('form.firstName'),
+    }),
+    middleName: TextInput({
+      label: t('form.middleName'),
+    }),
+    citizenship: TextInput({
+      label: t('clients.form.citizenship'),
+      iconName: 'arrowRight',
+      fetchFrom: 'getCountries',
+    }),
+    position: TextInput({
+      label: t('clients.form.namePosition'),
+    }),
+    email: TextInput({
+      label: t('form.email'),
+    }),
+    gender: TextInput({
+      label: t('form.gender'),
+    }),
+  },
+  address: {
+    country: TextInput({
+      label: t('form.Country'),
+      iconName: 'arrowRight',
+      fetchFrom: 'getCountries',
+    }),
+    province: TextInput({
+      label: t('form.Province'),
+      iconName: 'arrowRight',
+      fetchFrom: 'getStates',
+    }),
+    regionType: TextInput({
+      label: t('form.RegionType'),
+      iconName: 'arrowRight',
+      fetchFrom: 'getLocalityTypes',
+    }),
+    city: TextInput({
+      label: t('form.City'),
+      iconName: 'arrowRight',
+      fetchFrom: 'getCities',
+    }),
+    quarter: TextInput({
+      label: t('form.Quarter'),
+    }),
+    microDistrict: TextInput({
+      label: t('form.MicroDistrict'),
+    }),
+    street: TextInput({
+      label: t('form.Street'),
+    }),
+    houseNumber: TextInput({
+      label: t('form.NumberHouse'),
+    }),
+  },
+};
+
+export class BaseFields {
+  public mutatedList: InputType[] = [];
+  public fieldsLength: number = 0;
+
+  init<T extends keyof RepeatedFields>(sectionName: T, fieldsOrder?: (keyof RepeatedFields[T])[] | null, excludeFields?: (keyof RepeatedFields[T])[] | null): InputType[] {
+    const inputsWithDefinedKey = Object.entries(RepeatedFields[sectionName]).map(([key, field]: [string, InputType]) => {
+      return { ...field, key };
+    });
+
+    const originalFields = Object.values(RepeatedFields[sectionName]);
+
+    if (fieldsOrder && !excludeFields) {
+      this.fieldsLength = fieldsOrder.length;
+      return inputsWithDefinedKey
+        .filter((field: InputType) => fieldsOrder.includes(field.key))
+        .sort((a: InputType, b: InputType) => {
+          return fieldsOrder.indexOf(a.key) - fieldsOrder.indexOf(b.key);
+        });
+    }
+
+    if (!fieldsOrder && excludeFields) {
+      this.fieldsLength = originalFields.length - excludeFields.length;
+      return inputsWithDefinedKey.filter((field: InputType) => !excludeFields.includes(field.key));
+    }
+
+    this.fieldsLength = originalFields.length;
+    return originalFields;
+  }
+
+  setModels(modelList: any[]) {
+    if (modelList.length !== this.fieldsLength) {
+      throw new Error('Invalid v-models');
+    } else {
+      return this.mutatedList.map((field: InputType, index: number) => {
+        return { ...field, modelValue: modelList[index] };
+      });
+    }
+  }
+
+  getFields<T extends keyof RepeatedFields>(sectionName: T, fieldsOrder?: (keyof RepeatedFields[T])[] | null, excludeFields?: (keyof RepeatedFields[T])[] | null): this {
+    this.mutatedList = this.init(sectionName, fieldsOrder, excludeFields);
+    return this;
+  }
+}

package/composables/index.ts

@@ -2,7 +2,6 @@ import { useDisplay } from 'vuetify';
 import jwt_decode from 'jwt-decode';
 import { XMLParser } from 'fast-xml-parser';
 import { AxiosError } from 'axios';
-import { FieldTypes } from '../types/form';
 
 export const getBaseCredentials = () => {
   return {
@@ -286,67 +285,20 @@ export const getLastDayOfMonth = (year: number, month: number) => {
   return new Date(year, month + 1, 0, (date.getTimezoneOffset() / 60) * -1).toISOString();
 };
 
-export const FieldBase = ({
-  label = '',
-  placeholder = '',
-  readonly = false,
-  disabled = false,
-  modelValue = null,
-  iconName = null,
-  rules = [],
-  maxLength = null,
-  clearable = true,
-  hint = undefined,
-  suffix = null,
-  maska = null,
-}: InputBase): InputBase =>
-  ({
-    label,
-    placeholder,
-    readonly,
-    disabled,
-    modelValue,
-    iconName,
-    rules,
-    maxLength,
-    clearable,
-    hint,
-    suffix,
-    maska,
-  } as InputBase);
-
-export const TextInput = ({ ...rest }: Partial<TextInput>): TextInput => {
-  return {
-    ...FieldBase(rest),
-    type: FieldTypes.TEXT,
-  };
-};
-
-export const SwitchInput = ({ ...rest }: Partial<SwitchInput>): SwitchInput => {
-  return {
-    ...FieldBase(rest),
-    type: FieldTypes.SWITCH,
-    direction: 'horizontal',
-    trueValue: null,
-    falseValue: null,
-    labeling: false,
-  };
-};
-
-export const NumberInput = ({ ...rest }: Partial<NumberInput>): NumberInput => {
-  return {
-    ...FieldBase(rest),
-    type: FieldTypes.NUMBER,
-  };
-};
-
-export const dynamic = <T>(obj: T, key: keyof T) => {
-  return computed({
-    get: () => {
-      return obj[key];
-    },
-    set: (val: any) => {
-      obj[key] = val;
+type WhichValuePerEnv = 'qrGenUrl';
+
+export const getValuePerEnv = (which: WhichValuePerEnv) => {
+  type Envs = Exclude<EnvModes, 'vercel'>;
+  const valuesPerEnv: {
+    [key in WhichValuePerEnv]: {
+      [key in Envs]: string;
+    };
+  } = {
+    qrGenUrl: {
+      production: 'mobileSign:https://test-sign.halyklife.kz/EgovQr',
+      development: 'mobileSign:https://test-sign.halyklife.kz/EgovQr',
+      test: 'mobileSign:https://test-sign.halyklife.kz/EgovQr',
     },
-  });
+  };
+  return valuesPerEnv[which][useEnv().envMode as Envs];
 };

package/locales/ru.json

@@ -210,7 +210,8 @@
     "generatePrintedForms": "Сформировать печатные формы",
     "downloadStatement": "Скачать заявление",
     "downloadApplication": "Скачать приложение №1",
-    "downloadPowerOfAttorney": "Скачать доверенность"
+    "downloadPowerOfAttorney": "Скачать доверенность",
+    "sendEgovMob": "Отправить на подпись через Egov Mobile"
   },
   "dialog": {
     "title": "Подтверждение",
@@ -261,7 +262,9 @@
     "codeFromSMS": "Код из СМС",
     "signEgov": "Подписать с помощью eGov mobile",
     "showQR": "Показать QR-код",
-    "timer": "Вы создали счет на оплату, через 00:59 сек счет станет не активным"
+    "timer": "Вы создали счет на оплату, через 00:59 сек счет станет не активным",
+    "copyEgov": "Скопировать ссылку на подпись через Egov",
+    "scanQrCode": "Отсканируйте этот QR-код в приложении, чтобы осуществить подписание"
   },
   "questionnaireType": {
     "byHealth": "Анкета по здоровью Застрахованного",
@@ -363,7 +366,15 @@
     "totalRequestedSumInsured": "Общая страховая сумма",
     "totalInsurancePremiumAmount": "Общая страховая премия",
     "agencyPart": "Агентская переменная часть, %",
-    "processGfot": "Кратность страховой суммы к ГФОТ-у"
+    "processGfot": "Кратность страховой суммы к ГФОТ-у",
+    "annuiteStartDate": "Дата расчета",
+    "annuityFullPaymentPeriod": "Срок аннуитетных выплат (с / по)",
+    "guaranteedFullPaymentPeriod": "Период осуществления гарантийных выплат (с / по)",
+    "effectiveAnnualpercentage": "Эффективная годовая процентная ставка доходности",
+    "factorCurrentValueGP": "Фактор текущей стоимости с учетом гарантированных выплат",
+    "alfa": "Расходы от премии, в %",
+    "gamma": "Расходы от выплат, в %",
+    "mrpPayment": "Выплата на погребение (в тенге)"
   },
   "calculatorForm": {
     "selectedCountries": "Выбранные страны",
@@ -812,6 +823,8 @@
     "countryOfTaxResidency": "Страна налогового резиденства",
     "addTaxResidency": "Указать если налоговое резиденство выбрано другое",
     "economySectorCode": "Код сектора экономики",
+    "typeEconomicActivity": "Вид экономической деятельности",
+    "bankName": "Наименование банка",
     "contactsData": "Контакты",
     "phoneNumber": "Номер телефона",
     "homePhone": "Домашний номер телефон",
@@ -965,9 +978,22 @@
       "refundPremiumWithin30days": "Расторжение договора страхования и возврат страховой премии в течении 30/40 дней с даты заключения договора страхования",
       "transferPremiumOrAmount": "Расторжение договора страхования и перенос выкупной суммы/страховой премии"
     },
+    "reasonsChangeOfContract": {
+      "title": "Типы изменении"
+    },
+    "insuranceConditions": {
+      "title": "Условия страхования",
+      "grossPremium": "Текущая страховая премия",
+      "insValue": "Текущая страховая сумма",
+      "redemptionAmount": "Текущая выкупная сумма",
+      "bonusInsuredAmount": "Текущая бонусная сумма"
+    },
     "needDocuments": "Необходимо вложить оригинал страхового полиса в разделе “Документы”",
-    "hasOriginalContract": "Имеется ли оригинал страхового полиса?  Да",
+    "hasOriginalContract": "Имеется ли оригинал страхового полиса? ",
     "byAttorney": "По доверенности?  Нет",
+    "newPolicyholder": "Новый страхователь",
+    "newBeneficiary": "Новый(-ые) выгодоприобретатель(-и)",
+    "productConditions": "Условие страховых взносов и/или дополнительные условия",
     "changePolicyholder": "Изменить Страхователя? Нет",
     "Contract/Policy/Statement": "Договор/Полис/Заявление"
   },

package/package.json

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

package/store/data.store.ts

@@ -1198,7 +1198,13 @@ export const useDataStore = defineStore('data', {
       return this[whichField];
     },
     async getCountries() {
-      return await this.getFromApi('countries', 'getCountries');
+      const response = await this.getFromApi('countries', 'getCountries');
+      const kzIndex = response.findIndex(country => country.ids === 'KZ');
+      if (kzIndex !== -1) {
+        const element = response.splice(kzIndex, 1)[0];
+        response.splice(0, 0, element);
+      }
+      return response;
     },
     async getDicCountries() {
       if (this.isLifetrip) return await this.getFromApi('dicAllCountries', 'getArmDicts', 'DicCountry');
@@ -1290,6 +1296,9 @@ export const useDataStore = defineStore('data', {
     async getSectorCodeList() {
       return await this.getFromApi('economySectorCode', 'getSectorCode');
     },
+    async getEconomicActivityType() {
+      if (this.isDas) return await this.getFromApi('economicActivityType', 'getEconomicActivityType');
+    },
     async getFamilyStatuses() {
       return await this.getFromApi('familyStatuses', 'getFamilyStatuses');
     },
@@ -1297,7 +1306,7 @@ export const useDataStore = defineStore('data', {
       return await this.getFromApi('relations', 'getRelationTypes');
     },
     async getBanks() {
-      if (this.isLifeBusiness) return await this.getFromApi('banks', 'getBanks');
+      if (this.isLifeBusiness || this.isDas) return await this.getFromApi('banks', 'getBanks');
     },
     async getProcessIndexRate() {
       if (this.processCode) {
@@ -1344,6 +1353,9 @@ export const useDataStore = defineStore('data', {
     async getDictionaryItems(dictName: string) {
       return await this.getFromApi(dictName, 'getDictionaryItems', dictName);
     },
+    getGenderList() {
+      return this.gender;
+    },
     async getAllFormsData() {
       await Promise.allSettled([
         this.getCountries(),
@@ -1377,6 +1389,8 @@ export const useDataStore = defineStore('data', {
         this.getDicTripPurpose(),
         this.getCurrencies(),
         this.getProcessGfot(),
+        this.getBanks(),
+        this.getEconomicActivityType(),
       ]);
     },
     async getQuestionList(
@@ -3071,6 +3085,7 @@ export const useDataStore = defineStore('data', {
 
         this.formStore.applicationData.processInstanceId = applicationData.processInstanceId;
         this.formStore.lfb.policyholder = clientData;
+        this.formStore.lfb.policyholder.iin = reformatIin(clientData.iin);
         this.formStore.lfb.clientId = clientId;
         this.formStore.lfb.policyholder.authorityDetails.date = reformatDate(clientData.authorityDetails.date);
 
@@ -3080,6 +3095,7 @@ export const useDataStore = defineStore('data', {
 
         if (beneficialOwnerApp && beneficialOwnerApp.length) {
           this.formStore.lfb.beneficialOwners = beneficialOwnerApp;
+          this.formStore.lfb.isPolicyholderBeneficialOwner = clientData.iin.replace(/-/g, '') === beneficialOwnerApp[0].beneficialOwnerData.iin ? true : false;
           this.formStore.lfb.beneficialOwners.forEach(beneficial => {
             beneficial.beneficialOwnerData.identityDocument!.validUntil = reformatDate(beneficial.beneficialOwnerData.identityDocument!.validUntil as string);
           });

package/store/rules.ts

@@ -49,6 +49,7 @@ export const rules = {
   ],
   cyrillic: [(v: any) => v === null || /^[\u0400-\u04FF ]+$/.test(v) || t('rules.cyrillic')],
   latin: [(v: any) => v === null || /^[a-zA-Z]+$/.test(v) || t('rules.latin')],
+  latinAndNumber: [(v: any) => v === null || /^[0-9a-zA-Z]+$/.test(v) || t('rules.latinAndNumber')],
   cyrillicNonRequired: [
     (v: any) => {
       if (!v) return true;

package/types/form.ts

@@ -15,6 +15,25 @@ declare global {
   type FormIcons = 'arrowRight' | 'search' | 'sms' | null;
   type Suffix = 'kzt' | 'usd' | 'percent' | null;
 
+  type FetchFunctions =
+    | 'getResidents'
+    | 'getFamilyStatuses'
+    | 'getRelationTypes'
+    | 'getCountries'
+    | 'getStates'
+    | 'getLocalityTypes'
+    | 'getRegions'
+    | 'getCities'
+    | 'getDocumentTypes'
+    | 'getTaxCountries'
+    | 'getCitizenshipCountries'
+    | 'getSectorCodeList'
+    | 'getInsurancePay'
+    | 'getEconomicActivityType'
+    | 'getBanks'
+    | 'getDocumentIssuers'
+    | 'getGenderList';
+
   export interface DynamicForm {
     formRef: any;
     sections: SectionType[];
@@ -22,6 +41,7 @@ declare global {
   }
 
   type InputBase = {
+    key?: any;
     modelValue?: any;
     clearable?: boolean;
     label?: string;
@@ -36,6 +56,7 @@ declare global {
     suffix?: Suffix | null;
     hint?: string | undefined;
     maska?: FormMasks | null;
+    fetchFrom?: FetchFunctions | null;
   };
 
   type FormControl<T extends InputType> = T & {