hl-core 0.0.9-beta.51 → 0.0.9-beta.53

package/components/Panel/PanelHandler.vue

@@ -34,15 +34,21 @@
       <base-btn :text="$dataStore.t('buttons.sendElectronically')" :disabled="isElectronicDisabled" :loading="loading" @click="handleSignAction('electronic')" />
       <base-btn :text="$dataStore.t('buttons.generatePrintedForms')" :disabled="isScansDisabled" :loading="loading" @click="handleSignAction('scans')" />
       <base-btn :text="$dataStore.t('buttons.sendEgovMob')" :disabled="isQrDisabled" :loading="loading" @click="handleSignAction('qr')" />
-      <base-btn v-if="$dataStore.isPension" text="Подписать Согласие через Egov QrXML" :disabled="isQrXmlDisabled" :loading="loading" @click="handleSignAction('qrXml')" />
-      <base-btn v-if="$dataStore.isPension" :text="$dataStore.t('buttons.signWithSignature')" :disabled="consentGiven" :loading="loading" @click="handleSignAction('signature')" />
+      <base-btn v-if="$dataStore.isPension" :text="$dataStore.t('buttons.signWithSignature')" :loading="loading" @click="handleSignAction('signature')" />
+      <base-btn
+        v-if="$dataStore.isPension"
+        :text="$dataStore.t('buttons.signWithSignatureXML')"
+        :disabled="isQrXmlDisabled"
+        :loading="loading"
+        @click="handleSignAction('qrXml')"
+      />
     </div>
     <div v-if="isPaperContract" :class="[$styles.flexColNav]">
       <base-btn :text="$dataStore.t('buttons.downloadContract')" :loading="$dataStore.isButtonsLoading" @click="generateDocument" />
     </div>
     <div v-if="isScansDocuments" :class="[$styles.flexColNav]">
       <div v-if="$dataStore.isPension">
-        <div v-if="processCode == 1">
+        <div v-if="processCode == 19">
           <div v-if="formStore.applicationData.statusCode === 'ContractSignedByAuthorizedPerson' || formStore.applicationData.statusCode === 'ContractSignedFrom'">
             <base-btn :text="$dataStore.t('buttons.downloadContract')" :loading="$dataStore.isButtonsLoading" @click="$dataStore.generatePDFDocument('PA_Contract', '38')" />
             <base-form-section class="mt-4 flex flex-col !gap-2" :title="$dataStore.t('clients.attachScansSignDocs')">
@@ -82,7 +88,7 @@
           </base-form-section>
         </div>
       </div>
-      <div v-else>
+      <div :class="[$styles.flexColNav]" v-else>
         <base-btn :text="$dataStore.t('buttons.downloadStatement')" @click="downloadTemplate(constants.documentTypes.statement, 'docx')" />
         <base-btn :text="$dataStore.t('buttons.downloadContract')" @click="downloadTemplate(constants.documentTypes.contract, 'doc')" />
         <base-btn :text="$dataStore.t('buttons.downloadApplication')" @click="downloadTemplate(constants.documentTypes.application1, 'vnd.ms-excel')" />
@@ -263,7 +269,15 @@ export default defineComponent({
     const phoneNumber = ref<string | null>(formStore.policyholderForm.phoneNumber ?? '');
     const selectedClient = ref<SignUrlType>();
     const documentDict = computed(() => dataStore.dicFileTypeList.find(i => i.nameRu === 'Решение АС'));
-    const consentGiven = computed(() => !!formStore.signedDocumentList.find(i => i.fileTypeCode === '43')?.signed);
+    const pensionForm = formStore.applicationData?.pensionApp ?? undefined;
+    const needsAgreement = computed(
+      () =>
+        formStore.applicationData.statusCode === 'ContractSignedFrom' &&
+        ((pensionForm.compulsoryContractAmount && pensionForm.compulsoryContractAmount !== 0) ||
+          (pensionForm.compulsoryProfContractAmount && pensionForm.compulsoryProfContractAmount !== 0) ||
+          (pensionForm.voluntaryContractAmount && pensionForm.voluntaryContractAmount !== 0)),
+    );
+    const consentGiven = computed(() => !!formStore.signedDocumentList.find(i => i.fileTypeCode === '43')?.signed && needsAgreement.value);
     const affiliationDocument = computed(() => formStore.signedDocumentList.find((file: DocumentItem) => file.fileTypeName === 'Решение АС'));
     const affiliationData = ref<{
       processInstanceId: string | number;
@@ -522,46 +536,49 @@ export default defineComponent({
       return true;
     });
     const isPaperDisabled = computed(() => {
-      if (dataStore.isGons || dataStore.isPension) {
+      if (dataStore.isGons) {
         return false;
       }
       return true;
     });
     const isElectronicDisabled = computed(() => {
-      if (dataStore.isGons) {
+      if (dataStore.isGons || dataStore.isLifeBusiness || dataStore.isGns) {
         return true;
       }
-      if (!consentGiven.value && dataStore.isPension) {
+      if (formStore.applicationData.statusCode === 'ContractSignedByAuthorizedPerson') {
         return true;
       }
+      if (needsAgreement.value) {
+        if (!consentGiven.value && dataStore.isPension) {
+          return true;
+        }
+      }
       return false;
     });
     const isScansDisabled = computed(() => {
       if (dataStore.isGons) {
         return true;
       }
-      if (formStore.applicationData.statusCode === 'ContractSignedByAuthorizedPerson') {
-        return false;
-      }
-      if (!consentGiven.value && dataStore.isPension) {
-        return true;
+      if (needsAgreement.value) {
+        if (!consentGiven.value && dataStore.isPension && formStore.applicationData.statusCode !== 'ContractSignedFrom') {
+          return true;
+        }
       }
       return false;
     });
     const isQrDisabled = computed(() => {
-      if (!consentGiven.value && dataStore.isPension) {
-        return true;
-      }
-      if (dataStore.isLifeBusiness || dataStore.isPension || dataStore.isGns) {
-        return false;
+      if (needsAgreement.value) {
+        if (!consentGiven.value && dataStore.isPension) {
+          return true;
+        }
       }
       return true;
     });
     const isQrXmlDisabled = computed(() => {
-      if (consentGiven.value && dataStore.isPension) {
-        return true;
+      if (consentGiven.value && needsAgreement.value) {
+        return false;
       }
-      return false;
+      return true;
     });
     const downloadTemplate = async (documentType: number, fileType: string) => {
       await dataStore.downloadTemplate(documentType, fileType, formStore.applicationData.processInstanceId);
@@ -813,6 +830,7 @@ export default defineComponent({
       isQrXmlDisabled,
       choosePayActions,
       consentGiven,
+      needsAgreement,
     };
   },
 });

package/composables/classes.ts

@@ -438,7 +438,7 @@ export class Member extends Person {
   familyStatus: Value;
   isTerror: null;
   relationDegree: Value;
-  isDisability: Value;
+  isDisability: boolean;
   disabilityGroup: Value | null;
   percentageOfPayoutAmount: string | number | null;
   _cyrPattern: RegExp;
@@ -454,6 +454,7 @@ export class Member extends Person {
   documentsList: ContragentDocuments[];
   isInsuredUnderage?: boolean = false;
   bankInfo: BankInfoClass;
+  transferContractCompany: Value;
   identityDocument: {
     documentType: Value;
     documentNumber: string | null;
@@ -507,7 +508,7 @@ export class Member extends Person {
     address = null,
     familyStatus = new Value(),
     relationDegree = new Value(),
-    isDisability = new Value(),
+    isDisability = false,
     disabilityGroupId = new Value(),
     percentageOfPayoutAmount = null,
     migrationCard = null,
@@ -594,6 +595,7 @@ export class Member extends Person {
     this.parsedDocument = null;
     this.hasAgreement = null;
     this.bankInfo = new BankInfoClass();
+    this.transferContractCompany = new Value();
     this.identityDocument = {
       documentType: new Value(),
       documentNumber: null,
@@ -638,7 +640,7 @@ export class Member extends Person {
     this.familyStatus = new Value();
     this.isTerror = null;
     this.relationDegree = new Value();
-    this.isDisability = new Value();
+    this.isDisability = false;
     this.disabilityGroup = null;
     this.percentageOfPayoutAmount = null;
     this.gotFromInsis = true;
@@ -737,6 +739,7 @@ export class ProductConditions {
   annualIncome: string | null;
   processIndexRate: Value;
   processGfot: Value;
+  transferContractCompany: Value;
   requestedSumInsured: number | string | null;
   requestedSumInsuredInDollar: number | string | null;
   insurancePremiumPerMonth: number | string | null;
@@ -784,6 +787,7 @@ export class ProductConditions {
     annualIncome = null,
     processIndexRate = new Value(),
     processGfot = new Value(),
+    transferContractCompany = new Value(),
     requestedSumInsured = null,
     insurancePremiumPerMonth = null,
     establishingGroupDisabilityFromThirdYear = null,
@@ -833,6 +837,7 @@ export class ProductConditions {
     this.annualIncome = annualIncome;
     this.processIndexRate = processIndexRate;
     this.processGfot = processGfot;
+    this.transferContractCompany = transferContractCompany;
     this.requestedSumInsured = requestedSumInsured;
     this.insurancePremiumPerMonth = insurancePremiumPerMonth;
     this.establishingGroupDisabilityFromThirdYear = establishingGroupDisabilityFromThirdYear;
@@ -1007,7 +1012,7 @@ export class DataStoreClass {
   disabilityGroups: Value[];
   relations: Value[];
   banks: Value[];
-  insuranceCompanies: Value[];
+  transferContractCompanies: Value[];
   processTariff: Value[];
   insurancePay: Value[];
   questionRefs: Value[];
@@ -1190,7 +1195,7 @@ export class DataStoreClass {
     this.relations = [];
     this.processTariff = [];
     this.banks = [];
-    this.insuranceCompanies = [];
+    this.transferContractCompanies = [];
     this.insurancePay = [];
     this.residents = [];
     this.ipdl = [new Value(1, null), new Value(2, 'Да'), new Value(3, 'Нет')];
@@ -1585,6 +1590,11 @@ export class PhysGroupClass extends BaseGroupClass {
   placeOfBirth: Value;
   workDetails: { workplace: string; position: string; jobDuties: string };
   hasContactPerson: boolean;
+  authorityDetails: {
+    basis: Value;
+    documentNumber: string | null;
+    date: string | null;
+  };
   constructor() {
     super();
     this.lastName = '';
@@ -1595,16 +1605,17 @@ export class PhysGroupClass extends BaseGroupClass {
     this.placeOfBirth = new Value();
     this.workDetails = { workplace: '', position: '', jobDuties: '' };
     this.hasContactPerson = false;
+    this.authorityDetails = {
+      basis: new Value(),
+      documentNumber: null,
+      date: null,
+    };
   }
 }
 
 export class GroupMember extends PhysGroupClass {
   isLeader: boolean;
-  authorityDetails: {
-    basis: Value;
-    documentNumber: string | null;
-    date: string | null;
-  };
+
   typeOfEconomicActivity: Value;
   activityTypes: { activityTypeName: string; empoloyeeCount: number }[];
   beneficalOwnerQuest: { order: number; text: string; answer: boolean | null }[];
@@ -1614,11 +1625,6 @@ export class GroupMember extends PhysGroupClass {
     super();
     // Client
     this.isLeader = false;
-    this.authorityDetails = {
-      basis: new Value(),
-      documentNumber: null,
-      date: null,
-    };
     this.typeOfEconomicActivity = new Value();
     this.activityTypes = [];
     this.beneficalOwnerQuest = [

package/composables/constants.ts

@@ -17,6 +17,7 @@ export const constants = Object.freeze({
     amuletlife: 15,
     gns: 16,
     prepensionannuity: 18,
+    pensionannuitynew: 19,
   },
   amlProducts: {
     checkcontragent: 1,
@@ -54,11 +55,8 @@ export const constants = Object.freeze({
     Statuses.ContractSignedFrom,
     Statuses.AttachAppContractForm,
     Statuses.PreparationDossierForm,
-    Statuses.DsoUsnsForm,
-    Statuses.AccountantForm,
-    Statuses.ContractSignedByAuthorizedPerson,
   ],
-  rejectApplicationStatuses: [Statuses.StartForm, Statuses.AttachAppContractForm],
+  rejectApplicationStatuses: [Statuses.StartForm, Statuses.AttachAppContractForm, Statuses.DsoUsnsForm, Statuses.AccountantForm, Statuses.ContractSignedByAuthorizedPerson, Statuses.ContractSignedFrom],
   gbdErrors: ['INVALID', 'TIMEOUT', 'ERROR', 'NOT_FOUND'],
   roles: Roles,
   actions: Actions,

package/composables/index.ts

@@ -17,6 +17,7 @@ export const useEnv = () => {
 export class Masks {
   numbers: string = '#*';
   otp: string = '# # # #';
+  spacedNumbers: string = '### ### ### ### ### ### ###';
   iin: string = '###-###-###-###';
   phone: string = '+7 (7##) ### ## ##';
   date: string = '##.##.####';
@@ -98,6 +99,8 @@ export const formatPhone = (phone: string) => {
   return phone?.replace(/(\(|\)|\+| )/g, '');
 };
 
+export const cleanWhiteSpace = (str: string) => String(str).replace(/\s+/g, '');
+
 export const jwtDecode = (token: string): any => {
   if (token) return jwt_decode(token);
   else return null;
@@ -190,6 +193,7 @@ export const ErrorHandler = (err: unknown, errorText?: string) => {
   console.log(err);
   if (useDataStore) {
     const dataStore = useDataStore();
+    if (typeof err === 'string') dataStore.showToaster('error', err);
     if (err instanceof AxiosError) {
       if ('response' in err && err.response && err.response.data) {
         if (err.response.data === Object(err.response.data) && 'errors' in err.response.data && 'title' in err.response.data && 'traceId' in err.response.data) {
@@ -336,7 +340,17 @@ export const getLastDayOfMonth = (year: number, month: number) => {
   return new Date(year, month + 1, 0, (date.getTimezoneOffset() / 60) * -1).toISOString();
 };
 
-type WhichValuePerEnv = 'qrGenUrl' | 'qrXmlGenUrl' | 'gatewayApiUrl' | 'gatewayApiUrlLocal' | 'baseApi' | 'baseApiLocal' | 'efoBaseApi' | 'efoBaseApiLocal' | 'amlBaseApi' | 'amlBaseApiLocal';
+type WhichValuePerEnv =
+  | 'qrGenUrl'
+  | 'qrXmlGenUrl'
+  | 'gatewayApiUrl'
+  | 'gatewayApiUrlLocal'
+  | 'baseApi'
+  | 'baseApiLocal'
+  | 'efoBaseApi'
+  | 'efoBaseApiLocal'
+  | 'amlBaseApi'
+  | 'amlBaseApiLocal';
 
 export const getStrValuePerEnv = (which: WhichValuePerEnv) => {
   const valuesPerEnv: {
@@ -515,3 +529,12 @@ export const callDocumentReader = async (imageBase64: string | string[]) => {
     return ErrorHandler(err);
   }
 };
+
+export const validateResponseStructure = <T>(res: ResponseStructure<T>) => {
+  if (res && res.code === 0) {
+    return res.data;
+  } else {
+    useDataStore().showToaster('error', res.message);
+    return null;
+  }
+};

package/locales/ru.json

@@ -223,14 +223,17 @@
     "downloadPARefundStatement": "Скачать заявление на страхование возврат в ЕНПФ ПА",
     "downloadPARefundAgreement": "Скачать согласие возврат в ЕНПФ ПА",
     "sendEgovMob": "Отправить на подпись через Egov Mobile",
-    "signWithSignature": "Подписать согласие с помощью ЭЦП",
+    "signWithSignature": "Подписать с помощью ЭЦП",
+    "signWithSignatureXML": "Подписать Согласие через Egov QrXML",
     "sendToPay": "Отправить на оплату",
     "payEpay": "Оплатить через EPAY",
     "payOffline": "Оплатить офлайн",
     "paymentInvoice": "Cчет на оплату",
     "finishApplication": "Завершить заявку",
     "generateConract": "Сгенерировать Договор",
-    "signContract": "Заключить Договор"
+    "signContract": "Заключить Договор",
+    "sendDosie": "Отправить досье",
+    "downloadPaymentInvoice": "Скачать счет на оплату"
   },
   "dialog": {
     "title": "Подтверждение",
@@ -266,7 +269,10 @@
     "register": "Вы действительно хотите добавить в реестр данного ребенка?",
     "toApprove": "Вы действительно хотите отправить на согласование?",
     "affiliate": "Вы действительно хотите добавить решение андеррайтингового совета?",
-    "choosePay": "Вы действительно хотите выбрать метод оплаты?"
+    "choosePay": "Вы действительно хотите выбрать метод оплаты?",
+    "searchBeneficiary":"Выполните поиск договоров по ИИН Выгодоприобретателя",
+    "searchFoundBeneficiary":"По данному ИИН уже имеется договор. Создание заявки по продукту “ГОНС” - невозможно.",
+    "searchNotFoundBeneficiary":"По данному ИИН договор не найден. Нажмите “Создать” для создания новой заявки по продукту “ГОНС”"
   },
   "sign": {
     "chooseDoc": "Выберите документы для подписание",
@@ -439,7 +445,8 @@
     "dateCreated": "Дата начала",
     "factEndDate": "Дата завершения",
     "decision": "Статус",
-    "userFullName": "Исполнитель"
+    "userFullName": "Исполнитель",
+    "stage":"Этап"
   },
   "aml": {
     "contractSignDate": "Дата заключение контракта",
@@ -534,6 +541,7 @@
     "transferContractAmount": "Выкупная сумма, в тенге",
     "guaranteedPeriod": "Гарантированный период страховых выплат (от 1 до 35, в годах)",
     "isOPPV": "Включите, если есть ОППВ",
+    "isOPPVTransfer": "Выкупная сумма содержит суммы ОППВ?",
     "annuityConditions": "Условия аннуитетных выплат",
     "role": "Роль",
     "frequencyPayments": "Периодичность аннуитетной выплаты",
@@ -560,7 +568,10 @@
     "dossierPA": "Форма Описи страхового досье ПА (docx)",
     "transferContractCompany": "Наименование КСЖ",
     "transferContractFirstPaymentDate": "Дата начала выплат по договору с КСЖ",
-    "companyName": "Наименование компании по страхованию жизни"
+    "companyName": "Наименование компании по страхованию жизни",
+    "bankInvalid": "Некорректные банковские данные",
+    "globalId": "Уникальный номер договора (globalId)",
+    "oppvMonthsCheck": "ВНИМАНИЕ! НЕОБХОДИМО ПРОВЕРИТЬ НАЛИЧИЕ ОТЧИСЛЕНИЙ 60 МЕСЯЦЕВ ПО ПРИЗНАКУ 'ОППВ'"
   },
   "agent": {
     "currency": "Валюта",
@@ -811,6 +822,7 @@
   },
   "rules": {
     "required": "Поле обязательно",
+    "fileRequired": "Файл обязательно",
     "cyrillic": "Поле должно содержать только кириллические символы",
     "latin": "Поле должно содержать только латинские символы",
     "email": "Неправильный адрес электронной почты",

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "hl-core",
-  "version": "0.0.9-beta.51",
+  "version": "0.0.9-beta.53",
   "license": "MIT",
   "private": false,
   "main": "nuxt.config.ts",
@@ -28,8 +28,8 @@
     "dev": "nuxt dev",
     "generate": "nuxt generate",
     "preview": "nuxt preview",
-    "tk:all": "cd .. && cd amuletlife && yarn typecheck && cd .. && cd baiterek && yarn typecheck && cd .. && cd bolashak && yarn typecheck && cd .. && cd calc && yarn typecheck && cd .. && cd daskamkorlyk && yarn typecheck && cd .. && cd efo && yarn typecheck && cd .. && cd gons && yarn typecheck && cd .. && cd halykkazyna && yarn typecheck && cd .. && cd lifebusiness && yarn typecheck && cd .. && cd gns && yarn typecheck && cd .. && cd liferenta && yarn typecheck && cd .. && cd lifetrip && yarn typecheck && cd .. && cd pensionannuity && yarn typecheck && cd .. && cd prepensionannuity && yarn typecheck && cd .. && cd core",
-    "i:all": "cd .. && cd amuletlife && yarn && cd .. && cd baiterek && yarn && cd .. && cd bolashak && yarn && cd .. && cd calc && yarn && cd .. && cd daskamkorlyk && yarn && cd .. && cd efo && yarn && cd .. && cd gons && yarn && cd .. && cd halykkazyna && yarn && cd .. && cd lifebusiness && yarn && cd .. && cd gns && yarn && cd .. && cd liferenta && yarn && cd .. && cd lifetrip && yarn && cd .. && cd pensionannuity && yarn && cd .. && cd prepensionannuity && yarn && cd .. && cd core",
+    "tk:all": "cd .. && cd amuletlife && yarn typecheck && cd .. && cd baiterek && yarn typecheck && cd .. && cd bolashak && yarn typecheck && cd .. && cd calc && yarn typecheck && cd .. && cd daskamkorlyk && yarn typecheck && cd .. && cd efo && yarn typecheck && cd .. && cd gons && yarn typecheck && cd .. && cd halykkazyna && yarn typecheck && cd .. && cd lifebusiness && yarn typecheck && cd .. && cd gns && yarn typecheck && cd .. && cd liferenta && yarn typecheck && cd .. && cd lifetrip && yarn typecheck && cd .. && cd pensionannuitynew && yarn typecheck && cd .. && cd prepensionannuity && yarn typecheck && cd .. && cd core",
+    "i:all": "cd .. && cd amuletlife && yarn && cd .. && cd baiterek && yarn && cd .. && cd bolashak && yarn && cd .. && cd calc && yarn && cd .. && cd daskamkorlyk && yarn && cd .. && cd efo && yarn && cd .. && cd gons && yarn && cd .. && cd halykkazyna && yarn && cd .. && cd lifebusiness && yarn && cd .. && cd gns && yarn && cd .. && cd liferenta && yarn && cd .. && cd lifetrip && yarn && cd .. && cd pensionannuitynew && yarn && cd .. && cd prepensionannuity && yarn && cd .. && cd core",
     "update:core": "git checkout -b %npm_package_version% && git add . && git commit -m \"%npm_package_version%\" && git push && git checkout main",
     "update:aml": "cd ../../aml/aml && yarn && cd ../checkcontract && yarn && cd ../checkcontragent && yarn && cd.. && git checkout -b %npm_package_version% && git add . && git commit -m \"%npm_package_version%\" && git push && git checkout main && cd ../efo/core",
     "update:lka": "cd .. && cd lka && yarn && git checkout -b %npm_package_version% && git add . && git commit -m \"%npm_package_version%\" && git push && git checkout main && cd .. && cd core",