hl-core 0.0.9-beta.47 → 0.0.9-beta.49

package/api/base.api.ts

@@ -234,6 +234,13 @@ export class ApiClass {
     });
   }
 
+  async getProcessCoverTypePeriod(processCode: string | number, questionId: string) {
+    return await this.axiosCall<AddCoverAnswer[]>({
+      method: Methods.GET,
+      url: `/Arm/api/Dictionary/GetProcessCoverTypePeriod/${processCode}/${questionId}`,
+    });
+  }
+
   async getProcessPaymentPeriod(processCode: string | number) {
     return await this.axiosCall({
       method: Methods.GET,
@@ -712,11 +719,15 @@ export class ApiClass {
       data: data,
     });
   }
-  async downloadTemplate(fileType: number) {
+  async downloadTemplate(fileType: number, processInstanceId?: string | number) {
     return await this.axiosCall({
       method: Methods.GET,
-      url: `/${this.productUrl}/api/Application/DownloadTemplate?fileType=${fileType}`,
+      url: `/${this.productUrl}/api/Application/DownloadTemplate`,
       responseType: 'arraybuffer',
+      params: {
+        fileType,
+        processInstanceId: processInstanceId ?? null,
+      },
     });
   }
 
@@ -727,6 +738,13 @@ export class ApiClass {
     });
   }
 
+  async sendInvoiceToEmail(processInstanceId: string | number, email: string) {
+    return await this.axiosCall({
+      method: Methods.GET,
+      url: `/${this.productUrl}/api/Application/SendInvoiceToEmail?processInstanceId=${processInstanceId}&emailTo=${email}`,
+    });
+  }
+
   async getCalculator(data: SetApplicationRequest) {
     return await this.axiosCall<number>({
       method: Methods.POST,

package/components/Input/FormInput.vue

@@ -33,7 +33,7 @@
       <v-icon
         v-if="appendInnerIcon.includes('mdi-calendar-blank-outline') === false"
         :icon="appendInnerIcon"
-        @click="appendInnerIcon.includes('mdi-magnify') ? $emit('append') : !props.readonly && $emit('append')"
+        @click="appendInnerIcon.includes('mdi-magnify') || appendInnerIcon.includes('mdi-credit-card-scan') ? $emit('append') : !props.readonly && $emit('append')"
       />
       <base-datepicker
         v-if="appendInnerIcon.includes('mdi-calendar-blank-outline') && !props.readonly"

package/components/Pages/MemberForm.vue

@@ -59,23 +59,23 @@
           v-model="member.iin"
           :label="$dataStore.t('form.iin')"
           :maska="$maska.iin"
-          :readonly="!!isDisabled || !!isIinPhoneDisabled"
+          :readonly="!!isDisabled || !!isIinPhoneDisabled || !!member.parsedDocument?.iin"
           :clearable="!isDisabled"
-          :append-inner-icon="hasMemberSearch ? 'mdi mdi-magnify' : ''"
+          :append-inner-icon="hasMemberSearch ? (hasDocumentReader ? 'mdi mdi-credit-card-scan-outline' : 'mdi mdi-magnify') : ''"
           @append="searchMember"
           @input="onIinInput"
           :rules="$rules.required.concat($rules.iinRight)"
         />
         <base-form-input
           v-model.trim="member.lastName"
-          :readonly="isDisabled || isFromGBD"
+          :readonly="isDisabled || isFromGBD || !!member.parsedDocument?.lastName"
           :clearable="!isDisabled"
           :label="$dataStore.t('form.lastName')"
           :rules="$rules.required.concat($rules.cyrillic)"
         />
         <base-form-input
           v-model.trim="member.firstName"
-          :readonly="isDisabled || isFromGBD"
+          :readonly="isDisabled || isFromGBD || !!member.parsedDocument?.firstName"
           :clearable="!isDisabled"
           :label="$dataStore.t('form.firstName')"
           :rules="$rules.required.concat($rules.cyrillic)"
@@ -83,7 +83,7 @@
         <base-form-input
           v-if="hasMiddleName"
           v-model.trim="member.middleName"
-          :readonly="isDisabled || isFromGBD"
+          :readonly="isDisabled || isFromGBD || !!member.parsedDocument?.middleName"
           :clearable="!isDisabled"
           :label="$dataStore.t('form.middleName')"
           :rules="$rules.cyrillicNonRequired"
@@ -108,7 +108,7 @@
         />
         <base-form-input
           v-model="member.birthDate"
-          :readonly="isDisabled || isFromGBD"
+          :readonly="isDisabled || isFromGBD || !!member.parsedDocument?.birthDate"
           :clearable="!isDisabled"
           :label="$dataStore.t('form.birthDate')"
           :rules="birthDateRule"
@@ -386,7 +386,7 @@
         <base-form-input
           v-model.trim="member.documentNumber"
           :label="$dataStore.t('form.documentNumber')"
-          :readonly="isDisabled"
+          :readonly="isDisabled || !!member.parsedDocument?.documentNumber"
           :clearable="!isDisabled"
           :rules="$rules.required"
         />
@@ -399,7 +399,7 @@
           v-model="member.documentIssuers"
           :value="member.documentIssuers?.nameRu"
           :label="$dataStore.t('form.documentIssuers')"
-          :readonly="isDisabled"
+          :readonly="isDisabled || !!member.parsedDocument?.documentIssuer"
           :clearable="!isDisabled"
           :rules="$rules.objectRequired"
           append-inner-icon="mdi mdi-chevron-right"
@@ -408,7 +408,7 @@
         <base-form-input
           v-model="member.documentDate"
           :label="$dataStore.t('form.documentDate')"
-          :readonly="isDisabled"
+          :readonly="isDisabled || !!member.parsedDocument?.documentIssueDate"
           :clearable="!isDisabled"
           :rules="$rules.required.concat($rules.date)"
           :maska="$maska.date"
@@ -419,7 +419,7 @@
             v-if="member.documentType.ids !== 'SBI' && member.documentType.ids !== 'VNZ'"
             v-model="member.documentExpire"
             :label="$dataStore.t('form.documentExpire')"
-            :readonly="isDisabled"
+            :readonly="isDisabled || !!member.parsedDocument?.documentExpireDate"
             :clearable="!isDisabled"
             :rules="$rules.required.concat($rules.date)"
             :maska="$maska.date"
@@ -538,6 +538,20 @@
         <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" />
+        <base-form-section v-if="hasDocumentReader" class="!mt-0">
+          <base-file-input
+            :disabled="isDisabled"
+            :clearable="!isDisabled"
+            accept="image/*,.pdf"
+            append="mdi-credit-card-scan-outline"
+            :multiple="true"
+            @onClear="imageDataList = []"
+            @input="attachDocumentReader($event)"
+          />
+        </base-form-section>
+        <base-animation>
+          <base-btn v-if="hasDocumentReader && imageDataList && !!imageDataList.length" :loading="isButtonLoading" text="Получить данные" @click="getDocumentReader" />
+        </base-animation>
       </div>
     </Teleport>
     <Teleport v-if="isDocumentOpen" to="#right-panel-actions">
@@ -620,6 +634,7 @@ export default {
     const currentPanel = ref<keyof typeof member.value>();
     const searchQuery = ref<string>('');
     const fileData = ref<{ file: any }>();
+    const imageDataList = ref<string[]>([]);
 
     const memberSetting = computed(() => dataStore.members[memberStore.getMemberApplicationCode(whichForm.value)!]);
     const hasOtp = computed(() => member.value.otpCode && member.value.otpCode.length === useMask().otp.length);
@@ -696,7 +711,10 @@ export default {
       };
       return dataStore.controls.hasGKB && !!dataStore.isTask() && perMemberCondition();
     });
-    const hasMemberSearch = computed(() => showSaveButton.value && (hasGBDFL.value || hasGKB.value || hasInsis.value));
+    const hasDocumentReader = computed(() => {
+      return !!member.value.hasAgreement && !!isTask.value && (dataStore.isAULETTI || dataStore.isAulettiParent);
+    });
+    const hasMemberSearch = computed(() => showSaveButton.value && (hasGBDFL.value || hasGKB.value || hasInsis.value || hasDocumentReader.value));
     const hasMiddleName = computed(() => {
       if (dataStore.isLifetrip) {
         return false;
@@ -834,7 +852,7 @@ export default {
     const searchMember = async () => {
       if (!isDisabled.value) {
         dataStore.panelAction = null;
-        dataStore.rightPanel.title = 'Поиск контрагента';
+        dataStore.rightPanel.title = hasDocumentReader.value ? 'Получение данных со скана документа' : 'Поиск контрагента';
         dataStore.rightPanel.open = true;
         isSearchOpen.value = true;
         isDocumentOpen.value = false;
@@ -959,6 +977,68 @@ export default {
       }
     };
 
+    const attachDocumentReader = async (event: InputEvent) => {
+      if (event.target) {
+        const target = event.target as HTMLInputElement;
+        if (target.files && !!target.files.length) {
+          imageDataList.value = [];
+          await Promise.allSettled(
+            Object.values(target.files).map(async f => {
+              const { execute: getBase64 } = useBase64(f);
+              imageDataList.value.push(await getBase64());
+            }),
+          );
+        }
+      } else {
+        if (event.dataTransfer) {
+          const dataTransfer = event.dataTransfer as DataTransfer;
+          if (!!dataTransfer.files && !!dataTransfer.files.length) {
+            imageDataList.value = [];
+            await Promise.allSettled(
+              Object.values(dataTransfer.files).map(async f => {
+                const { execute: getBase64 } = useBase64(f);
+                imageDataList.value.push(await getBase64());
+              }),
+            );
+          }
+        }
+      }
+    };
+
+    const getDocumentReader = async () => {
+      if (imageDataList.value && !!imageDataList.value.length) {
+        isButtonLoading.value = true;
+        const parsedDocument = await callDocumentReader(imageDataList.value);
+        if (typeof parsedDocument === 'object') {
+          formatDateProperty(parsedDocument, 'front');
+          member.value.parsedDocument = parsedDocument;
+          if (parsedDocument.age) member.value.age = parsedDocument.age;
+          if (parsedDocument.iin) member.value.iin = reformatIin(parsedDocument.iin);
+          if (parsedDocument.birthDate) member.value.birthDate = parsedDocument.birthDate;
+          if (parsedDocument.documentIssueDate) member.value.documentDate = parsedDocument.documentIssueDate;
+          if (parsedDocument.documentExpireDate) member.value.documentExpire = parsedDocument.documentExpireDate;
+          if (parsedDocument.documentNumber) member.value.documentNumber = parsedDocument.documentNumber;
+          if (parsedDocument.lastName) member.value.lastName = parsedDocument.lastName;
+          if (parsedDocument.firstName) member.value.firstName = parsedDocument.firstName;
+          if (parsedDocument.middleName) member.value.middleName = parsedDocument.middleName;
+          if (parsedDocument.fullName) member.value.longName = parsedDocument.fullName;
+          if (!!parsedDocument.documentIssuer) {
+            if (parsedDocument.documentIssuer === 'МИНИСТЕРСТВО ВНУТРЕННИХ ДЕЛ РК' || parsedDocument.documentIssuer === 'ҚР ІШКІ ІСТЕР МИНИСТРЛІГІ') {
+              const documentIssuer = dataStore.documentIssuers.find(i => (i.nameRu as string).match(new RegExp('МВД РК', 'i')));
+              if (documentIssuer) member.value.documentIssuers = documentIssuer;
+            } else {
+              const documentIssuer = dataStore.documentIssuers.find(i => (i.nameRu as string).match(new RegExp(`${parsedDocument.documentIssuer}`, 'i')));
+              if (documentIssuer) member.value.documentIssuers = documentIssuer;
+            }
+          }
+          dataStore.rightPanel.open = false;
+          dataStore.showToaster('success', dataStore.t('toaster.successOperation'));
+          imageDataList.value = [];
+        }
+        isButtonLoading.value = false;
+      }
+    };
+
     const getFile = async (type: FileActions) => {
       if (memberDocument.value) {
         documentLoading.value = true;
@@ -1498,6 +1578,7 @@ export default {
       selectedIndex,
       selectedFamilyMember,
       sameAddress,
+      imageDataList,
 
       // Computed
       whichForm,
@@ -1513,6 +1594,7 @@ export default {
       hasGBDFL,
       hasInsis,
       hasGKB,
+      hasDocumentReader,
       hasMiddleName,
       hasRelationDegree,
       hasFamilyStatus,
@@ -1539,6 +1621,8 @@ export default {
       getContragentFromGBDFL,
       getContragent,
       attachFile,
+      attachDocumentReader,
+      getDocumentReader,
       getFile,
       selectFamilyMember,
       closeFamilyDialog,

package/components/Pages/ProductConditions.vue

@@ -460,7 +460,10 @@
         <base-form-input v-model="calculatorForm.price" :readonly="true" :label="isCalculator ? $dataStore.t('calculatorForm.premium') : $dataStore.t('calculatorForm.price')" />
       </base-form-section>
       <base-form-section v-if="hasDeathInsFromNS" :title="$dataStore.t('generalConditions')">
-        <base-form-input v-model="deathInsFromNS" :readonly="true" :clearable="false" :label="$dataStore.t('form.deathInsFromNS')" />
+        <base-form-input v-model="enabled" :readonly="true" :clearable="false" :label="$dataStore.t('form.deathInsFromNS')" />
+      </base-form-section>
+      <base-form-section v-if="hasDeathInsAnyReason" :title="$dataStore.t('generalConditions')">
+        <base-form-input v-model="enabled" :readonly="true" :clearable="false" :label="$dataStore.t('form.deathInsAnyReason')" />
       </base-form-section>
       <base-form-section v-if="isShownAdditionalTerms && additionalTerms && additionalTerms.length" :title="$dataStore.t('productConditionsForm.additional')">
         <div v-for="(term, index) of additionalTerms" :key="index">
@@ -589,14 +592,14 @@ export default defineComponent({
     const termValue = ref<AddCover>();
     const subTermValue = ref<string>('');
     const panelList = ref<Value[]>([]);
-    const subPanelList = ref<Value[]>([]);
+    const subPanelList = ref<AddCoverAnswer[] | Value[]>([]);
     const productConditionsForm = formStore.productConditionsForm;
     const currentPanel = ref<keyof typeof productConditionsForm>();
     const currentIndex = ref<number>();
     const searchQuery = ref<string>('');
     const whichSum = ref<'insurancePremiumPerMonth' | 'requestedSumInsured' | ''>('');
     const panelCodeList = ['processcovertypesum', 'fixedinssum'];
-    const deathInsFromNS = 'Включено';
+    const enabled = 'включено';
 
     const additionalTerms = ref<AddCover[]>([]);
 
@@ -880,8 +883,14 @@ export default defineComponent({
       }
       return false;
     });
+    const hasDeathInsAnyReason = computed(() => {
+      if (whichProduct.value === 'lifebusiness') {
+        return true;
+      }
+      return false;
+    });
     const defaultText = computed(() => {
-      if (whichProduct.value === 'gns') {
+      if (whichProduct.value === 'gns' || whichProduct.value === 'lifebusiness') {
         return dataStore.t('clients.form.calculation');
       }
       return dataStore.t('generalConditions');
@@ -985,9 +994,11 @@ export default defineComponent({
         }
 
         if (termValue.value && termValue.value.coverTypeCode === 6 && item.code === 'processcovertypesum') {
-          const response = await dataStore.getFromApi('DicCoverTypePeriod', 'getArmDicts', 'DicCoverTypePeriod');
-          subPanelList.value = response;
-          subTermValue.value = termValue.value.coverPeriodCode as string;
+          const response = await dataStore.getProcessCoverTypePeriod(termValue.value.coverTypeId);
+          if (response) {
+            subPanelList.value = response;
+            subTermValue.value = termValue.value.coverPeriodCode as string;
+          }
         }
 
         if (termValue.value && termValue.value.coverTypeCode === 6 && item.code !== 'processcovertypesum') {
@@ -1074,11 +1085,11 @@ export default defineComponent({
     };
 
     const filterList = (list: Value[], key: string) => {
-      if (whichProduct.value === 'baiterek') {
-        if (dataStore.isManagerHalykBank()) {
-          if (key === 'paymentPeriod') return list.filter(i => i.code !== 'single');
-        }
-      }
+      // if (whichProduct.value === 'baiterek') {
+      //   if (dataStore.isManagerHalykBank()) {
+      //     if (key === 'paymentPeriod') return list.filter(i => i.code !== 'single');
+      //   }
+      // }
       return list;
     };
 
@@ -1107,7 +1118,7 @@ export default defineComponent({
       }
     };
 
-    const pickSubTermValue = (item: Value, subItem: Value) => {
+    const pickSubTermValue = (item: any, subItem: any) => {
       dataStore.rightPanel.open = false;
       isTermsPanelOpen.value = false;
       subTermValue.value = item.code as string;
@@ -1554,7 +1565,7 @@ export default defineComponent({
       subPanelList,
       subTermValue,
       panelCodeList,
-      deathInsFromNS,
+      enabled,
 
       // Computed
       isTask,
@@ -1601,6 +1612,7 @@ export default defineComponent({
       isDisabledFixInsSum,
       defaultText,
       hasDeathInsFromNS,
+      hasDeathInsAnyReason,
 
       // Rules
       coverPeriodRule,

package/components/Panel/PanelHandler.vue

@@ -53,7 +53,7 @@
       <base-form-section :title="''">
         <base-loader v-if="isQrLoading" class="self-center m-5 opacity-70" />
         <div v-if="qrUrl && !isQrLoading">
-          <img width="135" height="135" class="ma-auto" :src="qrUrl" alt="" />
+          <base-qr :value="qrUrl" :size="200" class="ma-auto rounded" />
           <span :class="[$styles.textSimple]" class="mt-3 text-center d-block">{{ $dataStore.t('sign.scanQrCode') }}</span>
         </div>
         <base-btn class="mt-10" :loading="loading" :text="$dataStore.t('sign.copyEgov')" @click="$dataStore.copyToClipboard(urlCopy)" />
@@ -62,7 +62,7 @@
     </div>
   </section>
   <section v-if="choosePayActions">
-    <div v-if="!isEpayPay" :class="[$styles.flexColNav]">
+    <div v-if="!isEpayPay && !isOfflinePay" :class="[$styles.flexColNav]">
       <base-btn :text="$dataStore.t('buttons.payEpay')" :loading="loading" @click="handlePayAction('epay')" />
       <base-btn :text="$dataStore.t('buttons.payOffline')" :loading="loading" @click="handlePayAction('offline')" />
     </div>
@@ -80,6 +80,7 @@
                 <section class="flex flex-col gap-4 py-3" :class="$styles.textSimple">
                   <base-btn :loading="loading" :text="$dataStore.t('sign.copyCloud')" @click="$dataStore.copyToClipboard(signUrl.uri)" />
                   <base-btn :loading="loading" :btn="$styles.blueLightBtn" :text="$dataStore.t('sign.recipientNumber')" @click="openSmsPanel(signUrl)" />
+                  <base-btn :loading="loading" :text="$dataStore.t('sign.convertQr')" @click="convertQr(signUrl.uri)" />
                 </section>
               </v-expansion-panel-text>
             </v-expansion-panel>
@@ -110,6 +111,7 @@
         <div v-if="!isSendNumberOpen" :class="[$styles.flexColNav]">
           <base-btn :loading="loading" :text="$dataStore.t('payment.copyUrl')" @click="$dataStore.copyToClipboard(formStore.epayLink)" />
           <base-btn :loading="loading" :btn="$styles.blueLightBtn" :text="$dataStore.t('payment.recipientNumber')" @click="openEpayPanel" />
+          <base-btn :loading="loading" :text="$dataStore.t('sign.convertQr')" @click="convertQr(formStore.epayLink)" />
         </div>
         <div v-if="isSendNumberOpen" :class="[$styles.flexColNav]">
           <i
@@ -154,6 +156,13 @@
       <base-btn :text="buttonText" :loading="loading" @click="submitForm" />
     </div>
   </section>
+  <v-dialog v-model="isQrDialog" width="auto">
+    <v-card>
+      <v-card-text class="!p-4">
+        <base-qr :value="qrUrl" class="rounded" :size="300" />
+      </v-card-text>
+    </v-card>
+  </v-dialog>
 </template>
 
 <script lang="ts">
@@ -178,6 +187,8 @@ export default defineComponent({
     const isQrLoading = ref<boolean>(false);
     const urlCopy = ref<string>('');
     const isEpayPay = ref<boolean>(false);
+    const isOfflinePay = ref<boolean>(false);
+    const isQrDialog = ref<boolean>(false);
 
     const vForm = ref<any>();
     const isSendNumberOpen = ref<boolean>(false);
@@ -282,7 +293,7 @@ export default defineComponent({
       }
       closePanel();
       dataStore.showToaster('success', dataStore.t('toaster.successOperation'));
-      await dataStore.handleTask(constants.actions.signedScans, route.params.taskId as string, actionCause.value);
+      await dataStore.handleTask(constants.actions.signed, route.params.taskId as string, 'scans');
     };
     const submitForm = async () => {
       await vForm.value.validate().then(async (v: { valid: Boolean; errors: any }) => {
@@ -322,7 +333,7 @@ export default defineComponent({
       //   loading.value = false;
       //   return;
       // }
-      if (dataStore.isAML || dataStore.isCheckContract || dataStore.isCheckContragent || dataStore.isDas) {
+      if (dataStore.isAML || dataStore.isCheckContract || dataStore.isCheckContragent || dataStore.isDas || dataStore.isUU) {
         emit('task', [dataStore.panelAction, route.params.taskId as string, actionCause.value]);
       } else {
         await dataStore.handleTask(dataStore.panelAction, route.params.taskId as string, actionCause.value);
@@ -403,7 +414,7 @@ export default defineComponent({
     const price = computed(() => dataStore.getNumberWithSpaces(formStore.productConditionsForm.calculatorForm.price));
     const insuredAmount = computed(() => formStore.productConditionsForm.calculatorForm.amount!.nameRu! + dataStore.currency);
     const hasConditionsInfo = computed(() => {
-      if (dataStore.isLifetrip || dataStore.isDas) {
+      if (dataStore.isLifetrip || dataStore.isDas || dataStore.isUU) {
         return false;
       }
       if (dataStore.isFinCenter()) {
@@ -436,7 +447,7 @@ export default defineComponent({
       return true;
     });
     const downloadTemplate = async (documentType: number, fileType: string) => {
-      await dataStore.downloadTemplate(documentType, fileType);
+      await dataStore.downloadTemplate(documentType, fileType, formStore.applicationData.processInstanceId);
     };
 
     const handleSignAction = async (type: 'paper' | 'electronic' | 'scans' | 'qr') => {
@@ -468,14 +479,17 @@ export default defineComponent({
       if (type === 'epay') {
         await payEpay();
       }
+      if (type === 'offline') {
+        await dataStore.handleTask(constants.actions.payed, route.params.taskId as string, 'offline');
+        isOfflinePay.value = true;
+      }
+      loading.value = false;
     };
 
-    // TODO Рефактор QR c npm
     const generateQR = async (groupId: string) => {
       const uuidV4 = uuid.v4();
       const qrValue = `${getStrValuePerEnv('qrGenUrl')}/${uuidV4}/${groupId}`;
-      qrUrl.value = `https://api.qrserver.com/v1/create-qr-code/?size=135x135&data=${qrValue}`;
-
+      qrUrl.value = qrValue;
       if (dataStore.isLifeBusiness || dataStore.isGns) {
         //для юр лиц
         urlCopy.value = `https://egovbusiness.page.link/?link=${qrValue}?mgovSign&amp;apn=kz.mobile.mgov.business&amp;isi=1597880144&amp;ibi=kz.mobile.mgov.business`;
@@ -530,6 +544,15 @@ export default defineComponent({
       await dataStore.generateDocument();
     };
 
+    const convertQr = (url: string | null) => {
+      if (url) {
+        qrUrl.value = url;
+        isQrDialog.value = true;
+      } else {
+        dataStore.showToaster('error', dataStore.t('toaster.noUrl'));
+      }
+    };
+
     const payEpay = async () => {
       const invoiceData = await dataStore.getInvoiceData(formStore.applicationData.processInstanceId);
       if (invoiceData === false || invoiceData.status === 3 || invoiceData.status === 0) {
@@ -579,6 +602,8 @@ export default defineComponent({
       isQrLoading,
       urlCopy,
       isEpayPay,
+      isOfflinePay,
+      isQrDialog,
 
       // Functions
       closePanel,
@@ -594,6 +619,7 @@ export default defineComponent({
       closeQrPanel,
       handlePayAction,
       payEpay,
+      convertQr,
 
       // Computed
       buttonText,

package/components/Utilities/Qr.vue

@@ -0,0 +1,44 @@
+<template>
+  <qrcode-vue v-if="!!value" :value="value" :size="size" :level="level" :margin="margin" :render-as="renderAs" :background="background" :foreground="foreground" />
+</template>
+
+<script lang="ts">
+import QrcodeVue from 'qrcode.vue';
+
+export default defineComponent({
+  components: {
+    QrcodeVue,
+  },
+  props: {
+    value: {
+      type: String,
+      default: '',
+      required: true,
+    },
+    size: {
+      type: Number,
+      default: 250,
+    },
+    renderAs: {
+      type: String as PropType<'canvas' | 'svg'>,
+      default: 'canvas',
+    },
+    margin: {
+      type: Number,
+      default: 0,
+    },
+    level: {
+      type: String as PropType<'L' | 'M' | 'Q' | 'H'>,
+      default: 'M',
+    },
+    background: {
+      type: String,
+      default: '#ffffff',
+    },
+    foreground: {
+      type: String,
+      default: '#000000',
+    },
+  },
+});
+</script>

package/composables/classes.ts

@@ -447,6 +447,7 @@ export class Member extends Person {
   _emailPattern: RegExp;
   gotFromInsis: boolean | null;
   gosPersonData: any;
+  parsedDocument: any;
   hasAgreement: boolean | null;
   otpTokenId: string | null;
   otpCode: string | null;
@@ -582,6 +583,7 @@ export class Member extends Person {
     this._emailPattern = /.+@.+\..+/;
     this.gotFromInsis = true;
     this.gosPersonData = null;
+    this.parsedDocument = null;
     this.hasAgreement = null;
   }
 
@@ -625,6 +627,7 @@ export class Member extends Person {
     this.percentageOfPayoutAmount = null;
     this.gotFromInsis = true;
     this.gosPersonData = null;
+    this.parsedDocument = null;
     this.hasAgreement = null;
     this.insurancePay = new Value();
     this.migrationCard = null;
@@ -1513,7 +1516,8 @@ export class BaseGroupClass {
     documentNumber: string;
     series: string;
     issuedBy: Value;
-    validUntil: string | null;
+    issuedOn: string;
+    validUntil: string;
   };
   bankInfo: BankInfoClass;
   kbe: string;
@@ -1541,6 +1545,7 @@ export class BaseGroupClass {
       documentNumber: '',
       series: '',
       issuedBy: new Value(),
+      issuedOn: '',
       validUntil: '',
     };
     this.bankInfo = new BankInfoClass();
@@ -1552,7 +1557,8 @@ export class PhysGroupClass extends BaseGroupClass {
   lastName: string;
   firstName: string;
   middleName: string;
-  birthDate: string | null;
+  birthDate: string;
+  gender: Value;
   placeOfBirth: Value;
   workDetails: { workplace: string; position: string; jobDuties: string };
   hasContactPerson: boolean;
@@ -1562,6 +1568,7 @@ export class PhysGroupClass extends BaseGroupClass {
     this.firstName = '';
     this.middleName = '';
     this.birthDate = '';
+    this.gender = new Value();
     this.placeOfBirth = new Value();
     this.workDetails = { workplace: '', position: '', jobDuties: '' };
     this.hasContactPerson = false;

package/composables/constants.ts

@@ -68,6 +68,7 @@ export const constants = Object.freeze({
     application1: 33,
     insuredsList: 34,
     questionnaireInsured: 35,
+    invoicePayment: 36,
   },
   fixInsAmount: [
     {

package/composables/index.ts

@@ -2,6 +2,8 @@ import { useDisplay } from 'vuetify';
 import jwt_decode from 'jwt-decode';
 import { XMLParser } from 'fast-xml-parser';
 import { AxiosError } from 'axios';
+import { DocumentReaderApi, Scenario, TextFieldType } from '@regulaforensics/document-reader-webclient';
+import { PolicyholderClass } from '../composables/classes';
 
 export const getBaseCredentials = () => {
   return {
@@ -202,6 +204,48 @@ export const ErrorHandler = (err: unknown, errorText?: string) => {
   return false;
 };
 
+export const policyholderToBeneficialOwner = (isPolicyholderBeneficialOwner: boolean, policyholder?: PolicyholderClass) => {
+  const formStore = useFormStore();
+  const dataStore = useDataStore();
+  const beneficialOwner = formStore.lfb.beneficialOwners[0].beneficialOwnerData;
+  if (isPolicyholderBeneficialOwner && policyholder) {
+    beneficialOwner.iin = policyholder.clientData.authoritedPerson.iin;
+    beneficialOwner.firstName = policyholder.clientData.authoritedPerson.firstName;
+    beneficialOwner.middleName = policyholder.clientData.authoritedPerson.middleName;
+    beneficialOwner.lastName = policyholder.clientData.authoritedPerson.lastName;
+    beneficialOwner.citizenship = policyholder.clientData.authoritedPerson.citizenship;
+    beneficialOwner.birthDate = policyholder.clientData.authoritedPerson.birthDate;
+    beneficialOwner.gender = policyholder.clientData.authoritedPerson.gender;
+    beneficialOwner.resident = policyholder.clientData.resident;
+    beneficialOwner.taxResidentCountry = policyholder.clientData.taxResidentCountry;
+    beneficialOwner.economySectorCode = policyholder.clientData.economySectorCode;
+    beneficialOwner.identityDocument.issuedOn = policyholder.clientData.authoritedPerson.identityDocument.issuedOn;
+    beneficialOwner.identityDocument.documentNumber = policyholder.clientData.authoritedPerson.identityDocument.documentNumber;
+    beneficialOwner.identityDocument.documentType = policyholder.clientData.authoritedPerson.identityDocument.documentType;
+    beneficialOwner.identityDocument.issuedBy = policyholder.clientData.authoritedPerson.identityDocument.issuedBy;
+    beneficialOwner.identityDocument.validUntil = policyholder.clientData.authoritedPerson.identityDocument.validUntil;
+    beneficialOwner.identityDocument.series = policyholder.clientData.authoritedPerson.identityDocument.series;
+    dataStore.showToaster('warning', dataStore.t('toaster.formFieldEmptyWarning'));
+  } else {
+    beneficialOwner.iin = '';
+    beneficialOwner.firstName = '';
+    beneficialOwner.middleName = '';
+    beneficialOwner.lastName = '';
+    beneficialOwner.citizenship = new Value();
+    beneficialOwner.birthDate = '';
+    beneficialOwner.gender = new Value();
+    beneficialOwner.resident = new Value();
+    beneficialOwner.taxResidentCountry = new Value();
+    beneficialOwner.economySectorCode = new Value();
+    beneficialOwner.identityDocument.issuedOn = '';
+    beneficialOwner.identityDocument.documentNumber = '';
+    beneficialOwner.identityDocument.documentType = new Value();
+    beneficialOwner.identityDocument.issuedBy = new Value();
+    beneficialOwner.identityDocument.validUntil = '';
+    beneficialOwner.identityDocument.series = '';
+  }
+};
+
 export const setAddressBeneficiary = (whichIndex: number, sameAddress: boolean) => {
   const formStore = useFormStore();
   const dataStore = useDataStore();
@@ -339,3 +383,76 @@ export const keyDeleter = <T extends object>(data: T, keys: Array<NestedKeyOf<T>
     });
   }
 };
+
+export const formatDateProperty = (item: any, to: 'front' | 'back', additionalKeys?: string[]) => {
+  try {
+    if (item) {
+      Object.keys(item).forEach((key: string) => {
+        if (item[key] === Object(item[key])) {
+          formatDateProperty(item[key], to);
+        } else {
+          if (Array.isArray(additionalKeys)) {
+            additionalKeys.forEach(k => {
+              if (String(key).includes(k) && typeof item[key] === 'string' && !!item[key]) {
+                item[key] = to === 'front' ? reformatDate(item[key]) : formatDate(item[key])!.toISOString();
+              }
+            });
+          }
+          if ((String(key).includes('date') || String(key).includes('Date')) && typeof item[key] === 'string' && !!item[key]) {
+            item[key] = to === 'front' ? reformatDate(item[key]) : formatDate(item[key])!.toISOString();
+          }
+        }
+      });
+    }
+  } catch (err) {
+    console.log(err);
+  }
+};
+
+export const callDocumentReader = async (imageBase64: string | string[]) => {
+  if (!imageBase64) return false;
+  const dataStore = useDataStore();
+  try {
+    const api = new DocumentReaderApi({ basePath: 'http://10.176.49.47:8080' });
+    const result = await api.process({
+      images: Array.isArray(imageBase64) ? imageBase64 : [imageBase64],
+      processParam: { scenario: Scenario.FULL_PROCESS, doublePageSpread: true, measureSystem: 0 },
+    });
+    if (result.text) {
+      const iin = result.text.getField(TextFieldType.PERSONAL_NUMBER);
+      const lastName = result.text.getField(TextFieldType.SURNAME);
+      const firstName = result.text.getField(TextFieldType.GIVEN_NAMES_RUS) ?? result.text.getField(TextFieldType.GIVEN_NAMES);
+      const middleName = result.text.getField(TextFieldType.FATHERS_NAME_RUS) ?? result.text.getField(TextFieldType.FATHERS_NAME);
+      const fullName = result.text.getField(TextFieldType.SURNAME_AND_GIVEN_NAMES);
+      const birthDate = result.text.getField(TextFieldType.DATE_OF_BIRTH);
+      const age = result.text.getField(TextFieldType.AGE);
+      const documentNumber = result.text.getField(TextFieldType.DOCUMENT_NUMBER);
+      const documentIssuer = result.text.getField(TextFieldType.AUTHORITY_RUS) ?? result.text.getField(TextFieldType.AUTHORITY);
+      const documentIssueDate = result.text.getField(TextFieldType.DATE_OF_ISSUE);
+      const documentExpireDate = result.text.getField(TextFieldType.DATE_OF_EXPIRY);
+      const parsedDocument = {
+        iin: iin?.value,
+        lastName: lastName?.value,
+        firstName: firstName?.value,
+        middleName: middleName?.value,
+        fullName: fullName?.value,
+        birthDate: birthDate?.value,
+        age: age?.value,
+        documentNumber: documentNumber?.value,
+        documentIssuer: documentIssuer?.value,
+        documentIssueDate: documentIssueDate?.value,
+        documentExpireDate: documentExpireDate?.value,
+      };
+      if (Object.values(parsedDocument).every(i => !i)) {
+        dataStore.showToaster('error', dataStore.t('toaster.notParsedDocument'));
+        return false;
+      }
+      return parsedDocument;
+    } else {
+      dataStore.showToaster('error', dataStore.t('toaster.notParsedDocument'));
+    }
+    return false;
+  } catch (err) {
+    return ErrorHandler(err);
+  }
+};

package/locales/ru.json

@@ -136,7 +136,8 @@
     "needAttachQuestionnaire": "Нужно вложить анкету для клиентов",
     "notZeroPremium": "Общая страховая премия не должен быть 0",
     "requiredFieldsLB": "Обязательные поля: №, Ф.И.О, Пол, Должность, Дата рождения, ИИН, Страховая сумма",
-    "duplicateClient": "В списке присутствуют повторяющиеся клиенты"
+    "duplicateClient": "В списке присутствуют повторяющиеся клиенты",
+    "notParsedDocument": "Не удалось получить данные"
   },
   "notSignedContract": "Неподписанный Договор",
   "Contract": "Договор страхования",
@@ -220,7 +221,8 @@
     "sendEgovMob": "Отправить на подпись через Egov Mobile",
     "sendToPay": "Отправить на оплату",
     "payEpay": "Оплатить через EPAY",
-    "payOffline": "Оплатить офлайн"
+    "payOffline": "Оплатить офлайн",
+    "paymentInvoice": "Cчет на оплату"
   },
   "dialog": {
     "title": "Подтверждение",
@@ -275,7 +277,8 @@
     "timer": "Вы создали счет на оплату, через 00:59 сек счет станет не активным",
     "copyEgov": "Скопировать ссылку на подпись через Egov",
     "scanQrCode": "Отсканируйте этот QR-код в приложении, чтобы осуществить подписание",
-    "successQrSigned": "Заявление и Договор подписаны Страхователем"
+    "successQrSigned": "Заявление и Договор подписаны Страхователем",
+    "convertQr": "Преобразовать в QR код"
   },
   "questionnaireType": {
     "byHealth": "Анкета по здоровью Застрахованного",
@@ -381,6 +384,7 @@
     "totalRequestedSumInsured": "Общая страховая сумма",
     "totalInsurancePremiumAmount": "Общая страховая премия",
     "totalInsurancePremiumAmountWithCommission": "Общая страховая премия с комиссией",
+    "totalInsurancePremiumAmountWithAgent": "Общая страховая премия с агентской частью",
     "agencyPart": "Агентская переменная часть, %",
     "processGfot": "Кратность страховой суммы к ГФОТ-у",
     "annuiteStartDate": "Дата расчета",
@@ -895,7 +899,8 @@
     "identityCardOfContactPerson": "Документ удостоверяющий личность Контактного лица Застрахованного",
     "recipientDocs": "Документы Получателя",
     "recipientData": "Сведения о Получателе",
-    "deathInsFromNS": "Страхование от смерти от НС"
+    "deathInsFromNS": "Страхование от смерти от НС",
+    "deathInsAnyReason": "Смерть Застрахованного по любой причине"
   },
   "bankDetailsForm": {
     "title": "Банковские реквизиты",

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "hl-core",
-  "version": "0.0.9-beta.47",
+  "version": "0.0.9-beta.49",
   "license": "MIT",
   "private": false,
   "main": "nuxt.config.ts",
@@ -51,9 +51,10 @@
   "dependencies": {
     "@intlify/unplugin-vue-i18n": "0.12.2",
     "@mdi/font": "7.3.67",
-    "@microsoft/signalr": "^7.0.12",
+    "@microsoft/signalr": "7.0.12",
     "@nuxtjs/tailwindcss": "6.8.0",
     "@pinia/nuxt": "0.4.11",
+    "@regulaforensics/document-reader-webclient": "6.9.5",
     "@vuepic/vue-datepicker": "7.2.0",
     "animate.css": "4.1.1",
     "axios": "1.4.0",
@@ -61,6 +62,7 @@
     "jwt-decode": "3.1.2",
     "maska": "1.5.0",
     "pinia": "2.1.4",
+    "qrcode.vue": "3.4.1",
     "typedoc": "0.24.8",
     "typescript": "5.0.4",
     "vue-i18n": "9.2.2",

package/store/data.store.ts

@@ -237,6 +237,9 @@ export const useDataStore = defineStore('data', {
     isHeadManager() {
       return this.isRole(constants.roles.HeadManager);
     },
+    isBranchDirector() {
+      return this.isRole(constants.roles.BranchDirector);
+    },
     isProcessEditable(statusCode?: keyof typeof Statuses) {
       const getEditibleStatuses = () => {
         const defaultStatuses = constants.editableStatuses;
@@ -1112,6 +1115,16 @@ export const useDataStore = defineStore('data', {
       }
       return null;
     },
+    async getProcessCoverTypePeriod(questionId: string) {
+      if (!this.processCode) return null;
+      try {
+        const answers = await this.api.getProcessCoverTypePeriod(this.processCode, questionId);
+        return answers;
+      } catch (err) {
+        console.log(err);
+      }
+      return null;
+    },
     async definedAnswers(
       filter: string,
       whichSurvey: 'surveyByHealthBase' | 'surveyByHealthBasePolicyholder' | 'surveyByCriticalBase' | 'surveyByCriticalBasePolicyholder',
@@ -1341,20 +1354,6 @@ export const useDataStore = defineStore('data', {
       }
       return this.cities;
     },
-    async getCitiesEfo(key?: string, member?: any, parentKey?: string) {
-      if (this.isLifeBusiness || this.isGns) {
-        await this.getFromApi('cities', 'getCities');
-        //@ts-ignore
-        if (key && member[parentKey][key] && member[parentKey][key].ids !== null) return this.cities.filter(i => i.code === member[parentKey][key].ids);
-        //@ts-ignore
-        if (member && member[parentKey].registrationProvince.ids !== null) {
-          //@ts-ignore
-          return this.cities.filter(i => i.code === member[parentKey].registrationProvince.ids);
-        } else {
-          return this.cities;
-        }
-      }
-    },
     async getLocalityTypes() {
       return await this.getFromApi('localityTypes', 'getLocalityTypes');
     },
@@ -1453,7 +1452,6 @@ export const useDataStore = defineStore('data', {
         this.getStates(),
         this.getRegions(),
         this.getCities(),
-        this.getCitiesEfo(),
         this.getLocalityTypes(),
         this.getDocumentTypes(),
         this.getDocumentIssuers(),
@@ -2249,7 +2247,7 @@ export const useDataStore = defineStore('data', {
       try {
         const data = {
           taskId: taskId,
-          decision: decision,
+          decision: decision.replace(/custom/i, '') as keyof typeof constants.actions,
         };
         await this.api.sendTask(comment === null ? data : { ...data, comment: comment });
         this.showToaster('success', this.t('toaster.successOperation'), 3000);
@@ -2281,7 +2279,8 @@ export const useDataStore = defineStore('data', {
           case constants.actions.return:
           case constants.actions.signed:
           case constants.actions.rejectclient:
-          case constants.actions.accept: {
+          case constants.actions.accept:
+          case constants.actions.payed: {
             try {
               const sended = await this.sendTask(taskId, action, comment);
               if (!sended) return;
@@ -2427,10 +2426,10 @@ export const useDataStore = defineStore('data', {
         ErrorHandler(err);
       }
     },
-    async downloadTemplate(documentType: number, fileType: string = 'pdf') {
+    async downloadTemplate(documentType: number, fileType: string = 'pdf', processInstanceId?: string | number) {
       try {
         this.isButtonsLoading = true;
-        const response: any = await this.api.downloadTemplate(documentType);
+        const response: any = await this.api.downloadTemplate(documentType, processInstanceId);
         const blob = new Blob([response], {
           type: `application/${fileType}`,
         });
@@ -2442,10 +2441,10 @@ export const useDataStore = defineStore('data', {
             link.setAttribute('download', 'РФ-ДС-028 Список застрахованных ГССЖ_ГНС, изд.1.xls');
             break;
           case constants.documentTypes.statement:
-            link.setAttribute('download', 'Заявление.docx');
+            link.setAttribute('download', 'Заявление.pdf');
             break;
           case constants.documentTypes.contract:
-            link.setAttribute('download', 'Договор страхования.doc');
+            link.setAttribute('download', 'Договор страхования.pdf');
             break;
           case constants.documentTypes.application1:
             link.setAttribute('download', 'Приложение №1.xls');
@@ -2453,6 +2452,9 @@ export const useDataStore = defineStore('data', {
           case constants.documentTypes.questionnaireInsured:
             link.setAttribute('download', 'Анкета Застрахованного.docx');
             break;
+          case constants.documentTypes.invoicePayment:
+            link.setAttribute('download', 'Счет на оплату.pdf');
+            break;
         }
         document.body.appendChild(link);
         link.click();
@@ -2471,6 +2473,16 @@ export const useDataStore = defineStore('data', {
       }
       this.isButtonsLoading = false;
     },
+    async sendInvoiceToEmail(processInstanceId: string | number, email: string) {
+      try {
+        this.isButtonsLoading = true;
+        await this.api.sendInvoiceToEmail(processInstanceId, email);
+        this.showToaster('info', this.t('toaster.successfullyDocSent'), 5000);
+      } catch (err) {
+        ErrorHandler(err);
+      }
+      this.isButtonsLoading = false;
+    },
     async generateDocument() {
       try {
         this.isButtonsLoading = true;
@@ -3147,20 +3159,26 @@ export const useDataStore = defineStore('data', {
     },
     async startApplicationV2(data: PolicyholderClass) {
       const policyholder = JSON.parse(JSON.stringify(data)) as any;
-      this.preparePersonData(policyholder);
-      delete policyholder.clientData.beneficalOwnerQuest;
-      delete policyholder.clientData.identityDocument;
-      delete policyholder.clientData.activityTypes;
-      delete policyholder.clientData.citizenship;
-      delete policyholder.clientData.authoritedPerson.identityDocument;
-      delete policyholder.clientData.authoritedPerson.actualAddress;
-      delete policyholder.clientData.authoritedPerson.bankInfo;
-      delete policyholder.clientData.authoritedPerson.economySectorCode;
-      delete policyholder.clientData.authoritedPerson.legalAddress;
-      delete policyholder.clientData.authoritedPerson.placeOfBirth;
-      delete policyholder.clientData.authoritedPerson.resident;
-      delete policyholder.clientData.authoritedPerson.taxResidentCountry;
       if (!policyholder.clientData.iin) return false;
+      this.preparePersonData(policyholder);
+      keyDeleter(policyholder as PolicyholderClass, [
+        'clientData.beneficalOwnerQuest',
+        'clientData.identityDocument',
+        'clientData.activityTypes',
+        'clientData.citizenship',
+        'clientData.addTaxResidency',
+        'clientData.gender',
+        'clientData.placeOfBirth',
+        'clientData.authoritedPerson.actualAddress',
+        'clientData.authoritedPerson.bankInfo',
+        'clientData.authoritedPerson.economySectorCode',
+        'clientData.authoritedPerson.legalAddress',
+        'clientData.authoritedPerson.placeOfBirth',
+        'clientData.authoritedPerson.resident',
+        'clientData.authoritedPerson.taxResidentCountry',
+        'clientData.authoritedPerson.addTaxResidency',
+      ]);
+      policyholder.clientData.authoritedPerson.gender = policyholder.clientData.authoritedPerson.gender.nameRu === 'Мужской' ? 1 : 2;
       try {
         const response = await this.api.startApplication(policyholder);
         this.sendToParent(constants.postActions.applicationCreated, response.processInstanceId);
@@ -3171,6 +3189,7 @@ export const useDataStore = defineStore('data', {
     },
     async saveClient(data: PolicyholderClass) {
       const policyholder = JSON.parse(JSON.stringify(data)) as any;
+      policyholder.clientData.authoritedPerson.gender = policyholder.clientData.authoritedPerson.gender.nameRu === 'Мужской' ? 1 : 2;
       this.preparePersonData(policyholder);
       try {
         await this.api.saveClient(this.formStore.applicationData.processInstanceId, this.formStore.lfb.clientId, policyholder);
@@ -3218,6 +3237,11 @@ export const useDataStore = defineStore('data', {
         this.formStore.lfb.policyholder.clientData.authoritedPerson.iin = reformatIin(clientData.authoritedPerson.iin);
         this.formStore.lfb.clientId = clientId;
         this.formStore.lfb.policyholder.clientData.authorityDetails.date = reformatDate(clientData.authorityDetails.date);
+        this.formStore.lfb.policyholder.clientData.authoritedPerson.birthDate = reformatDate(clientData.authoritedPerson.birthDate) ?? '';
+        this.formStore.lfb.policyholder.clientData.authoritedPerson.identityDocument.issuedOn = reformatDate(clientData.authoritedPerson.identityDocument.issuedOn) ?? '';
+        this.formStore.lfb.policyholder.clientData.authoritedPerson.identityDocument.validUntil = reformatDate(clientData.authoritedPerson.identityDocument.validUntil) ?? '';
+        const gender = this.gender.find((i: Value) => i.id === clientData.authoritedPerson.gender);
+        this.formStore.lfb.policyholder.clientData.authoritedPerson.gender = gender ? gender : new Value();
 
         if (clientData && clientData.activityTypes !== null) {
           this.formStore.lfb.policyholderActivities = clientData.activityTypes;
@@ -3227,9 +3251,13 @@ export const useDataStore = defineStore('data', {
           this.formStore.lfb.beneficialOwners = beneficialOwnerApp;
           this.formStore.lfb.isPolicyholderBeneficialOwner = clientData.authoritedPerson.iin.replace(/-/g, '') === beneficialOwnerApp[0].beneficialOwnerData.iin ? true : false;
           this.formStore.lfb.beneficialOwners.forEach(beneficial => {
-            beneficial.beneficialOwnerData.birthDate = reformatDate(beneficial.beneficialOwnerData.birthDate as string);
-            beneficial.beneficialOwnerData.identityDocument!.validUntil = reformatDate(beneficial.beneficialOwnerData.identityDocument!.validUntil as string);
+            beneficial.beneficialOwnerData.birthDate = reformatDate(beneficial.beneficialOwnerData.birthDate as string) ?? '';
+            beneficial.beneficialOwnerData.identityDocument.validUntil = reformatDate(beneficial.beneficialOwnerData.identityDocument.validUntil as string) ?? '';
             beneficial.beneficialOwnerData.iin = reformatIin(beneficial.beneficialOwnerData.iin as string);
+            beneficial.beneficialOwnerData.identityDocument.issuedOn = reformatDate(beneficial.beneficialOwnerData.identityDocument.issuedOn as string) ?? '';
+            //@ts-ignore
+            const gender = this.gender.find((i: Value) => i.id === beneficial.beneficialOwnerData.gender);
+            beneficial.beneficialOwnerData.gender = gender ? gender : new Value();
           });
         }
 
@@ -3286,20 +3314,19 @@ export const useDataStore = defineStore('data', {
     async saveBeneficialOwnerList(data: BeneficialOwner[]) {
       const beneficialOwnerList = JSON.parse(JSON.stringify(data)) as any;
       for (const item of beneficialOwnerList) {
-        delete item.beneficialOwnerData.identityDocument.issuedOn;
-        delete item.beneficialOwnerData.activityTypes;
-        delete item.beneficialOwnerData.actualAddress;
-        delete item.beneficialOwnerData.addTaxResidency;
-        delete item.beneficialOwnerData.authoritedPerson;
-        delete item.beneficialOwnerData.authorityDetails;
-        delete item.beneficialOwnerData.bankInfo;
-        delete item.beneficialOwnerData.economySectorCode;
-        delete item.beneficialOwnerData.legalAddress;
-        delete item.beneficialOwnerData.placeOfBirth;
-        delete item.beneficialOwnerData.resident;
-        delete item.beneficialOwnerData.taxResidentCountry;
-        delete item.beneficialOwnerData.typeOfEconomicActivity;
+        keyDeleter(item as BeneficialOwner, [
+          'beneficialOwnerData.activityTypes',
+          'beneficialOwnerData.actualAddress',
+          'beneficialOwnerData.addTaxResidency',
+          'beneficialOwnerData.authoritedPerson',
+          'beneficialOwnerData.authorityDetails',
+          'beneficialOwnerData.bankInfo',
+          'beneficialOwnerData.legalAddress',
+          'beneficialOwnerData.placeOfBirth',
+          'beneficialOwnerData.typeOfEconomicActivity',
+        ]);
         item.processInstanceId = this.formStore.applicationData.processInstanceId;
+        item.beneficialOwnerData.gender = item.beneficialOwnerData.gender.nameRu === 'Мужской' ? 1 : 2;
         this.preparePersonData(item.beneficialOwnerData);
       }
       try {
@@ -3311,7 +3338,18 @@ export const useDataStore = defineStore('data', {
     },
     async saveBeneficialOwner(data: BeneficialOwner) {
       const beneficialOwner = JSON.parse(JSON.stringify(data)) as any;
-      delete beneficialOwner.beneficialOwnerData.identityDocument.issuedOn;
+      keyDeleter(beneficialOwner as BeneficialOwner, [
+        'beneficialOwnerData.activityTypes',
+        'beneficialOwnerData.actualAddress',
+        'beneficialOwnerData.addTaxResidency',
+        'beneficialOwnerData.authoritedPerson',
+        'beneficialOwnerData.authorityDetails',
+        'beneficialOwnerData.bankInfo',
+        'beneficialOwnerData.legalAddress',
+        'beneficialOwnerData.placeOfBirth',
+        'beneficialOwnerData.typeOfEconomicActivity',
+      ]);
+      beneficialOwner.beneficialOwnerData.gender = beneficialOwner.beneficialOwnerData.gender.nameRu === 'Мужской' ? 1 : 2;
       this.preparePersonData(beneficialOwner.beneficialOwnerData);
       try {
         const response = await this.api.saveBeneficialOwner(this.formStore.applicationData.processInstanceId, String(beneficialOwner.id), beneficialOwner);
@@ -3533,7 +3571,8 @@ export const useDataStore = defineStore('data', {
           this.isFinCenter() ||
           this.isSupervisor() ||
           this.isSupport() ||
-          this.isDrn(),
+          this.isDrn() ||
+          this.isBranchDirector(),
       };
     },
   },

package/types/enum.ts

@@ -46,8 +46,8 @@ export enum Actions {
   choosePay = 'choosePay',
   choosePayCustom = 'choosePayCustom',
 
-  signedScans = 'signedScans',
-  signedScansCustom = 'signedScansCustom',
+  payed = 'payed',
+  payedCustom = 'payedCustom',
 }
 
 export enum PostActions {
@@ -83,6 +83,7 @@ export enum Roles {
   DRNSJ = 'DRNSJ',
   HeadManager = 'HeadManager',
   AgentAuletti = 'AgentAuletti',
+  BranchDirector = 'BranchDirector',
 }
 
 export enum Statuses {