hl-core 0.0.10-beta.37 → 0.0.10-beta.38

package/api/base.api.ts

@@ -1039,6 +1039,16 @@ export class ApiClass {
     });
   }
 
+  async getParentApplication(bin: string) {
+    return await this.axiosCall<any>({
+      method: Methods.GET,
+      url: `/${this.productUrl}/api/Application/GetParentApplication`,
+      params: {
+        bin,
+      },
+    });
+  }
+
   pensionannuityNew = {
     base: '/pensionannuityNew',
     getEnpfRedirectUrl: async (id: string) => {

package/components/Input/TextAreaField.vue

@@ -0,0 +1,71 @@
+<template>
+  <v-textarea
+    class="form-input"
+    :label="label"
+    :model-value="modelValue"
+    :disabled="disabled"
+    :variant="variant"
+    :readonly="props.readonly"
+    :color="color"
+    :rows="rows"
+    @update:modelValue="$emit('update:modelValue', $event)"
+    auto-grow
+  ></v-textarea>
+</template>
+
+<script lang="ts">
+import type { InputVariants } from '../../types';
+
+export default defineComponent({
+  props: {
+    modelValue: {
+      required: false,
+    },
+    label: {
+      type: String,
+      default: '',
+    },
+    disabled: {
+      type: Boolean,
+      default: false,
+    },
+    variant: {
+      type: String as PropType<InputVariants>,
+      default: 'solo',
+    },
+    readonly: {
+      type: Boolean,
+      default: false,
+    },
+    color: {
+      type: String,
+      default: '#009c73',
+    },
+    rows: {
+      type: Number,
+      default: 5,
+    },
+  },
+  emits: ['update:modelValue'],
+
+  setup(props, { emit }) {
+    return {
+      props,
+    };
+  },
+});
+</script>
+
+<style>
+.form-input input:focus {
+  border: none !important;
+  outline: none !important;
+}
+.form-input .v-field {
+  box-shadow: none;
+  font-size: 14px;
+}
+.form-input .v-label.v-field-label {
+  top: 20px;
+}
+</style>

package/components/Pages/Anketa.vue

@@ -422,7 +422,7 @@ export default defineComponent({
       if (firstQuestionList.value) {
         if (answerToAll.value) {
           firstQuestionList.value.forEach((question: AnketaBody, index: number) => {
-            if (question.first.answerType === 'T') {
+            if (question.first.answerType === 'T' || question.first.answerType === 'D') {
               firstQuestionList.value![index].first.answerName = 'Нет' as AnswerName;
             }
           });
@@ -432,7 +432,7 @@ export default defineComponent({
           }
         } else {
           firstQuestionList.value.forEach((question: AnketaBody, index: number) => {
-            if (question.first.answerType === 'T') {
+            if (question.first.answerType === 'T' || question.first.answerType === 'D') {
               firstQuestionList.value![index].first.answerName = null;
             }
           });

package/components/Pages/MemberForm.vue

@@ -208,7 +208,7 @@
         v-if="$dataStore.isPension && (whichForm === formStore.insuredFormKey || $route.query.tab === 'slaveInsuredForm')"
         :title="$dataStore.t('pension.disabilityInfo')"
       >
-        <base-form-toggle v-model="member.isDisability" :title="$dataStore.t('pension.ifHasDisability')" :disabled="isDisabled" :has-border="false" />
+        <base-form-toggle v-model="member.isDisability" :title="$dataStore.t('pension.ifHasDisabilityAlways')" :disabled="isDisabled" :has-border="false" />
         <base-animation>
           <base-panel-input
             v-if="member.isDisability"
@@ -1676,7 +1676,7 @@ export default {
           });
           if (data.slave)
             pensionKeysWithSpace.forEach(key => {
-              if (/\s/g.test(data.slave[key]) === true) data.slave[key] = dataStore.getNumberWithSpaces(data.slave[key]);
+              if (/\s/g.test(data.slave[key]) === true) data.slave[key] = formatSpacedNumber(data.slave[key]);
             });
           const isApplicationSaved = await dataStore.setApplication(data);
           if (!isNewApplication) dataStore.showToaster('info', dataStore.t('toaster.needToRecalculate'), 5000);

package/components/Panel/PanelHandler.vue

@@ -58,7 +58,7 @@
           <base-file-input :label="$dataStore.t('labels.attachPowerOfAttorney')" @input.prevent="onFileChangeScans($event, 'attorney')" @onClear="onClearFile('attorney')" />
         </base-form-section>
       </div>
-      <base-btn :text="$dataStore.t('buttons.sign')" :loading="$dataStore.isButtonsLoading" @click="isNewSign ? sendFilesNew() : sendFiles()" />
+      <base-btn :text="$dataStore.t('buttons.sign')" :loading="$dataStore.isButtonsLoading || loading" @click="isNewSign ? sendFilesNew() : sendFiles()" />
       <base-btn :text="$dataStore.t('buttons.cancel')" :btn="$styles.whiteBtn" @click="isScansDocuments = false" />
     </div>
     <div v-if="isQr" :class="[$styles.flexColNav]">
@@ -123,7 +123,7 @@
   </section>
   <section v-if="choosePayActions">
     <div v-if="!isEpayPay && !isOfflinePay" :class="[$styles.flexColNav]">
-      <base-btn :text="$dataStore.t('buttons.payEpay')" :loading="loading" @click="handlePayAction('epay')" />
+      <base-btn v-if="hasEpayPay" :text="$dataStore.t('buttons.payEpay')" :loading="loading" @click="handlePayAction('epay')" />
       <base-btn :text="$dataStore.t('buttons.payOffline')" :loading="loading" @click="handlePayAction('offline')" />
     </div>
     <div v-if="isOfflinePay" :class="[$styles.flexColNav]">
@@ -449,6 +449,7 @@ export default defineComponent({
     };
 
     const sendFiles = async () => {
+      loading.value = true;
       if (scansFiles.value.length !== 4) {
         dataStore.showToaster('warning', dataStore.t('toaster.notAllDocumentsAttached'));
         return;
@@ -462,6 +463,7 @@ export default defineComponent({
       closePanel();
       dataStore.showToaster('success', dataStore.t('toaster.successOperation'));
       await dataStore.handleTask(constants.actions.signed, route.params.taskId as string, 'scans');
+      loading.value = false;
     };
     const submitForm = async () => {
       await vForm.value.validate().then(async (v: { valid: Boolean; errors: any }) => {
@@ -647,6 +649,12 @@ export default defineComponent({
     const isSignatureDisabled = computed(() => {
       return true;
     });
+    const hasEpayPay = computed(() => {
+      if (dataStore.isLifeBusiness || dataStore.isGns) {
+        return false;
+      }
+      return true;
+    });
     const downloadTemplate = async (documentType: number, fileType: string) => {
       await dataStore.downloadTemplate(documentType, fileType, formStore.applicationData.processInstanceId);
     };
@@ -892,14 +900,19 @@ export default defineComponent({
               isQr.value = true;
               break;
             case CoreEnums.Sign.Types.nclayer:
-              for (let sign of signOptions.value.signIds) {
-                const response = await dataStore.nclayerSign(sign.id, signType, file[0].fileType === 43);
-                if (response === null) {
-                  dataStore.showToaster('error', 'Ошибка при подключении к приложению «NCALayer». Убедитесь, что запустили приложение «NCALayer»', 10000);
-                  break;
+              for (let each of file.filter((i: any) => i.isSigned !== true)) {
+                const signingFile = signOptions.value.signIds.find((i: any) => Number(i.fileType) === Number(each.fileType));
+                if (signingFile) {
+                  const response = await dataStore.nclayerSign(signingFile.id, signType, Number(each.fileType) === 43);
+                  if (response === null) {
+                    dataStore.showToaster('error', 'Ошибка при подключении к приложению «NCALayer». Убедитесь, что запустили приложение «NCALayer»', 10000);
+                    break;
+                  }
+                  if (!response) break;
+                  if (response === true) dataStore.showToaster('success', 'Подписание прошло успешно');
+                } else {
+                  dataStore.showToaster('error', 'Не найдены данные для подписания файла');
                 }
-                if (!response) break;
-                if (response === true) dataStore.showToaster('success', 'Подписание прошло успешно');
               }
               break;
             default:
@@ -1003,6 +1016,7 @@ export default defineComponent({
       getFileNew,
       inSigningOrder,
       isNewSign,
+      hasEpayPay,
     };
   },
 });

package/composables/classes.ts

@@ -1564,6 +1564,7 @@ export class FormStoreClass {
 export class Address {
   country: Value;
   region: Value;
+  state: Value;
   regionType: Value;
   city: Value;
   square: string | null;
@@ -1577,6 +1578,7 @@ export class Address {
   constructor() {
     this.country = new Value();
     this.region = new Value();
+    this.state = new Value();
     this.regionType = new Value();
     this.city = new Value();
     this.square = null;

package/composables/index.ts

@@ -806,6 +806,9 @@ export class RoleController {
   isDsoDirector = () => {
     return this.isRole(constants.roles.DsoDirector);
   };
+  isArchivist = () => {
+    return this.isRole(constants.roles.Archivist);
+  };
   isAccountantDirector = () => {
     return this.isRole(constants.roles.AccountantDirector);
   };
@@ -826,7 +829,6 @@ export class RoleController {
       toUU: this.isServiceManager() || this.isAccountant() || this.isAdjuster() || this.isHeadAdjuster() || baseAccessRoles,
       toDSO:
         this.isDsuio() ||
-        this.isManager() ||
         this.isActuary() ||
         this.isHeadOfDso() ||
         this.isAccountant() ||

package/locales/ru.json

@@ -560,6 +560,7 @@
     "paymentsDate": "Дата начала аннуитетных выплат",
     "paymentsPeriod": "Период страховых выплат",
     "ifHasDisability": "Включите, если у Страхователя есть инвалидность",
+    "ifHasDisabilityAlways": "Включите, если у Страхователя бессрочная инвалидность",
     "disabilityInfo": "Данные об инвалидности",
     "disabilityGroup": "Группа инвалидности",
     "compulsoryContractAmount": "Обязательные пенсионные взносы, в тенге",

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "hl-core",
-  "version": "0.0.10-beta.37",
+  "version": "0.0.10-beta.38",
   "license": "MIT",
   "private": false,
   "main": "nuxt.config.ts",

package/store/data.store.ts

@@ -3,7 +3,7 @@ import { rules } from './rules';
 import { i18n } from '../configs/i18n';
 import { Toast, Types as ToastTypes, Positions, ToastOptions } from './toast';
 import { isValidGUID, yearEnding, jwtDecode, ErrorHandler, getKeyWithPattern, getNumber, getAgeByBirthDate, RoleController, ProcessController, sanitize } from '../composables';
-import { DataStoreClass, DocumentItem, Member, Value, CountryValue, PolicyholderActivity, BeneficialOwner, PolicyholderClass } from '../composables/classes';
+import { DataStoreClass, DocumentItem, Member, Value, CountryValue, PolicyholderActivity, BeneficialOwner, PolicyholderClass, GroupMember } from '../composables/classes';
 import { ApiClass } from '../api';
 import { useFormStore } from './form.store';
 import { AxiosError } from 'axios';
@@ -3689,12 +3689,6 @@ export const useDataStore = defineStore('data', {
         this.formStore.applicationData = applicationData;
         this.formStore.regNumber = applicationData.regNumber;
         this.formStore.additionalInsuranceTerms = applicationData.addCoverDto;
-
-        if (localStorage.getItem('add') === 'true' || this.formStore.applicationData.parentPolicyDto !== null) {
-          this.formStore.lfb.add = true;
-          this.formStore.lfb.policyholder.clientData.iin = localStorage.getItem('bin') as string;
-        }
-
         this.formStore.canBeClaimed = await this.api.isClaimTask(taskId);
         this.formStore.applicationTaskId = taskId;
         this.formStore.RegionPolicy.nameRu = applicationData.insisWorkDataApp.regionPolicyName;
@@ -3715,17 +3709,8 @@ export const useDataStore = defineStore('data', {
 
         this.formStore.applicationData.processInstanceId = applicationData.processInstanceId;
         this.formStore.lfb.policyholder.isIpdl = applicationData.clientApp.isIpdl;
-        this.formStore.lfb.policyholder.clientData = clientData;
-        this.formStore.lfb.policyholder.clientData.authoritedPerson = clientData.authoritedPerson;
-        this.formStore.lfb.policyholder.clientData.iin = reformatIin(clientData.iin);
-        this.formStore.lfb.policyholder.clientData.authoritedPerson.iin = reformatIin(clientData.authoritedPerson.iin);
         this.formStore.lfb.clientId = clientId;
-        this.formStore.lfb.policyholder.clientData.authoritedPerson.authorityDetails.date = reformatDate(clientData.authoritedPerson.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();
+        this.getClientData(clientData);
 
         if (clientData && clientData.activityTypes !== null) {
           this.formStore.lfb.policyholderActivities = clientData.activityTypes;
@@ -4123,6 +4108,28 @@ export const useDataStore = defineStore('data', {
         return ErrorHandler(err);
       }
     },
+    getClientData(clientData: GroupMember) {
+      this.formStore.lfb.policyholder.clientData = clientData;
+      this.formStore.lfb.policyholder.clientData.authoritedPerson = clientData.authoritedPerson;
+      this.formStore.lfb.policyholder.clientData.iin = reformatIin(clientData.iin);
+      this.formStore.lfb.policyholder.clientData.authoritedPerson.iin = reformatIin(clientData.authoritedPerson.iin);
+      this.formStore.lfb.policyholder.clientData.authoritedPerson.authorityDetails.date = reformatDate(clientData.authoritedPerson.authorityDetails.date as string);
+      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 === Number(clientData.authoritedPerson.gender));
+      this.formStore.lfb.policyholder.clientData.authoritedPerson.gender = gender ? gender : new Value();
+    },
+    async getParentApplication(bin: string) {
+      try {
+        const response = await this.api.getParentApplication(bin);
+        if (response) {
+          this.getClientData(response.clientApp.clientData);
+        }
+      } catch (err) {
+        return ErrorHandler(err);
+      }
+    },
     hasJobSection(whichForm: keyof typeof StoreMembers) {
       if (this.isLifetrip || this.isPension || this.isBalam) return false;
       switch (whichForm) {

package/store/rules.ts

@@ -6,6 +6,7 @@ const t = i18n.t;
 export const rules = {
   recalculationMultiply: [(v: any) => (v !== null && v !== '' && v >= 100) || t('toaster.valueShouldBeHigher', { text: '100' })],
   recalculationMultiplyBetween: [(v: any) => (v !== null && v !== '' && v >= 100 && v <= 200) || t('toaster.recalculationMultiplyBetween', { floor: '100', ceil: '200' })],
+  recalculationMultiplyBetween50And200: [(v: any) => (v !== null && v !== '' && v >= 50 && v <= 200) || t('toaster.recalculationMultiplyBetween', { floor: '50', ceil: '200' })],
   recalculationAdditive: [(v: any) => (v !== null && v !== '' && v <= 100 && v >= 0) || t('toaster.valueShouldBeBetween', { floor: '0', ceil: '100' })],
   required: [(v: any) => !!v || t('rules.required')],
   notZero: [(v: any) => Number(v) !== 0 || 'Не может быть равно нулю'],

package/types/enum.ts

@@ -62,7 +62,7 @@ export enum Actions {
   annulmentCustom = 'annulmentCustom',
 
   otrs = 'otrs',
-  otrsCustom = 'otrsCustom'
+  otrsCustom = 'otrsCustom',
 }
 
 export enum PostActions {
@@ -112,6 +112,7 @@ export enum Roles {
   SettlementLosses = 'SettlementLosses',
   HeadSettlementLosses = 'HeadSettlementLosses',
   DsoDirector = 'DsoDirector',
+  Archivist = 'Archivist',
   AccountantDirector = 'AccountantDirector',
   ManagerAuletti = 'ManagerAuletti',
   HeadOfDso = 'HeadOfDso',