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

package/api/base.api.ts

@@ -1039,4 +1039,15 @@ export class ApiClass {
       },
     });
   }
+
+  async uploadDigitalCertifijcate(data: any) {
+    return await this.axiosCall<any>({
+      method: Methods.POST,
+      url: '/File/api/Document/UploadDigitalCertifijcate',
+      headers: {
+        'Content-Type': 'multipart/form-data',
+      },
+      data: data,
+    });
+  }
 }

package/components/Pages/Documents.vue

@@ -2,7 +2,7 @@
   <section :class="[$styles.scrollPage]">
     <section class="w-full px-[10px] pt-[14px] flex flex-col gap-2" v-if="formStore.signedDocumentList && formStore.signedDocumentList.length">
       <base-content-block
-        v-if="$dataStore.isInitiator() && $dataStore.controls.hasChooseSign && formStore.applicationData.statusCode === 'ContractSignedFrom'"
+        v-if="$dataStore.isInitiator() && !$dataStore.isPension && $dataStore.controls.hasChooseSign && formStore.applicationData.statusCode === 'ContractSignedFrom'"
         :class="[$styles.textSimple]"
       >
         <h5 class="text-center font-medium mb-4">{{ $dataStore.t('Contract') }}</h5>
@@ -26,7 +26,7 @@
       </base-content-block>
     </section>
     <div
-      v-if="(!formStore.signedDocumentList || !formStore.signedDocumentList.length) && !$dataStore.isPension"
+      v-if="(!formStore.signedDocumentList || !formStore.signedDocumentList.length)"
       class="h-[calc(90vh-70px)] flex flex-col items-center justify-center gap-6"
     >
       <svg xmlns="http://www.w3.org/2000/svg" width="125" height="131" viewBox="0 0 125 131" fill="none" class="cursor-help">
@@ -48,7 +48,7 @@
       </svg>
       <p class="text-xl" :class="[$styles.mutedText]">{{ $dataStore.t('labels.noDocuments') }}</p>
     </div>
-    <section class="w-full px-[10px] pt-[14px] flex flex-col gap-2" v-if="$dataStore.isPension">
+    <section v-if="$dataStore.isPension && showContract" class="w-full px-[10px] pt-[14px] flex flex-col gap-2">
       <base-content-block :class="[$styles.textSimple]">
         <h5 class="text-center font-medium mb-4">{{ $dataStore.t('labels.statements') }}</h5>
         <div :class="[$styles.whiteBg, $styles.rounded]" class="p-2 h-12 flex items-center relative">
@@ -158,6 +158,9 @@ export default defineComponent({
         }
       }),
     );
+    const showContract = computed(
+      () => formStore.applicationData && (formStore.applicationData.statusCode === 'Completed' || formStore.applicationData.statusCode === 'PreparationDossierForm'),
+    );
 
     const openPanel = async (document: DocumentItem) => {
       dataStore.rightPanel.title = document.fileTypeName!;
@@ -246,6 +249,7 @@ export default defineComponent({
 
       // Computed
       isDisabled,
+      showContract,
 
       // Functions
       openPanel,

package/components/Pages/MemberForm.vue

@@ -199,25 +199,23 @@
           :rules="$rules.required.concat($rules.numbers)"
         />
       </base-form-section>
-
       <base-form-section
         v-if="$dataStore.isPension && (whichForm === formStore.insuredFormKey || whichForm === formStore.beneficiaryFormKey)"
         :title="$dataStore.t('pension.disabilityInfo')"
       >
-        <base-form-toggle v-model="hasDisability" :title="$dataStore.t('pension.ifHasDisability')" :disabled="isDisabled" :has-border="false" />
+        <base-form-toggle v-model="member.isDisability" :title="$dataStore.t('pension.ifHasDisability')" :disabled="isDisabled" :has-border="false" />
         <base-animation>
-          <div class="flex flex-col gap-[1px]" v-if="hasDisability">
-            <base-panel-input
-              v-model="member.disabilityGroup"
-              :value="member.disabilityGroup?.nameRu"
-              :readonly="isDisabled"
-              :clearable="!isDisabled"
-              :label="$dataStore.t('pension.disabilityGroup')"
-              :rules="$rules.objectRequired"
-              append-inner-icon="mdi mdi-chevron-right"
-              @append="openPanel($dataStore.t('pension.disabilityGroup'), $dataStore.disabilityGroups, 'disabilityGroup', $dataStore.getDisabilityGroups)"
-            />
-          </div>
+          <base-panel-input
+            v-if="member.isDisability"
+            v-model="member.disabilityGroup"
+            :value="member.disabilityGroup?.nameRu"
+            :readonly="isDisabled"
+            :clearable="!isDisabled"
+            :label="$dataStore.t('pension.disabilityGroup')"
+            :rules="$rules.objectRequired"
+            append-inner-icon="mdi mdi-chevron-right"
+            @append="openPanel($dataStore.t('pension.disabilityGroup'), $dataStore.disabilityGroups, 'disabilityGroup', $dataStore.getDisabilityGroups)"
+          />
         </base-animation>
       </base-form-section>
       <base-form-section :title="$dataStore.t('policyholdersRepresentative.PowerOfAttorney')" v-if="whichForm === formStore.policyholdersRepresentativeFormKey">
@@ -396,7 +394,7 @@
             <base-form-input v-model.trim="member.registrationMicroDistrict" :readonly="isDisabled" :clearable="!isDisabled" :label="$dataStore.t('form.MicroDistrict')" />
             <base-form-input
               v-model.trim="member.registrationStreet"
-              :rules="member.isInsuredUnderage ? [] : $rules.required"
+              :rules="member.isInsuredUnderage || $dataStore.isAULETTI || $dataStore.isAulettiParent ? [] : $rules.required"
               :readonly="isDisabled"
               :clearable="!isDisabled"
               :label="$dataStore.t('form.Street')"
@@ -758,7 +756,6 @@ export default {
 
     const currentPanelDeep = ref<string>();
     const currentPanelSubDeep = ref<string>();
-    const hasDisability = ref<boolean>(false);
 
     const memberSetting = computed(() => dataStore.members[memberStore.getMemberApplicationCode(whichForm.value)!]);
     const hasOtp = computed(() => member.value.otpCode && member.value.otpCode.length === useMask().otp.length);
@@ -837,7 +834,7 @@ export default {
             return false;
         }
       };
-      return dataStore.controls.hasGKB && !!dataStore.isTask() && perMemberCondition();
+      return dataStore.isAULETTI || dataStore.isAulettiParent ? false : dataStore.controls.hasGKB && !!dataStore.isTask() && perMemberCondition();
     });
     const hasDocumentReader = computed(() => {
       return !!member.value.hasAgreement && !!isTask.value && (dataStore.isAULETTI || dataStore.isAulettiParent);
@@ -1426,7 +1423,7 @@ export default {
             ownFundsRaisAmount: 0,
             compulsoryProfContractAmount: 0,
           };
-          const isApplicationSaved = await dataStore.setApplication();
+          const isApplicationSaved = await dataStore.setApplication(formStore.applicationData.pensionApp);
           if (isApplicationSaved === false) return;
           dataStore.showToaster('info', dataStore.t('toaster.needToRecalculate'), 5000);
         }
@@ -1797,6 +1794,15 @@ export default {
           }
         },
       );
+      watch(
+        () => member.value.isDisability,
+        val => {
+          if (!val) member.value.disabilityGroup = new Value();
+        },
+        {
+          immediate: true,
+        },
+      );
     }
 
     return {
@@ -1824,7 +1830,6 @@ export default {
       selectedIndex,
       selectedFamilyMember,
       sameAddress,
-      hasDisability,
       isRelative,
       imageDataList,
       // Computed

package/components/Pages/ProductConditions.vue

@@ -286,7 +286,6 @@
           <base-form-input
             v-model="pensionCalculationParams.compulsoryContractAmount"
             :maska="$maska.numbers"
-            :rules="$rules.required"
             :readonly="isDisabled"
             :clearable="!isDisabled"
             :label="$dataStore.t('pension.compulsoryContractAmount')"
@@ -328,23 +327,43 @@
             v-model="pensionForm.transferContractCompany"
             :value="pensionForm.transferContractCompany?.nameRu"
             :label="$dataStore.t('pension.transferContractCompany')"
-            clearable
+            :readonly="isDisabled"
+            :clearable="!isDisabled"
             append-inner-icon="mdi mdi-chevron-right"
-            @append="openPanel($dataStore.t('pension.transferContractCompany'), $dataStore.insuranceCompanies, 'insuranceCompanies', $dataStore.getInsuranceCompanies)"
+            @append="openPanel($dataStore.t('pension.transferContractCompany'), $dataStore.transferContractCompanies, 'transferContractCompany', $dataStore.getInsuranceCompanies)"
           />
           <base-form-input
-            v-model="pensionForm.transferContractDate"
+            v-model="transferContractDate"
             :maska="$maska.date"
             :label="$dataStore.t('pension.contractDate')"
+            :readonly="isDisabled"
             append-inner-icon="mdi mdi-calendar-blank-outline"
+            :clearable="!isDisabled"
+            :rules="pensionForm.transferContractCompany?.ids ? $rules.required.concat($rules.date) : []"
           />
           <base-form-input
-            v-model="pensionForm.transferContractFirstPaymentDate"
+            v-model="pensionForm.transferContractNumber"
+            :label="$dataStore.t('pension.globalId')"
+            :readonly="isDisabled"
+            :clearable="!isDisabled"
+            :rules="pensionForm.transferContractCompany?.ids ? $rules.required : []"
+          />
+          <base-form-input
+            v-model="transferContractFirstPaymentDate"
             :maska="$maska.date"
             :label="$dataStore.t('pension.transferContractFirstPaymentDate')"
             append-inner-icon="mdi mdi-calendar-blank-outline"
+            :readonly="isDisabled"
+            :clearable="!isDisabled"
+            :rules="pensionForm.transferContractCompany?.ids ? $rules.required.concat($rules.date) : []"
+          />
+          <base-form-input
+            v-model="pensionCalculationParams.transferContractAmount"
+            :maska="$maska.numbers"
+            :label="$dataStore.t('pension.transferContractAmount')"
+            :rules="pensionForm.transferContractCompany?.ids ? $rules.required : []"
           />
-          <base-form-input v-model="pensionForm.transferContractAmount" :maska="$maska.numbers" :label="$dataStore.t('pension.transferContractAmount')" />
+          <base-form-toggle v-model="pensionForm.transferContractIsOppv" :disabled="isDisabled" :has-border="false" :title="$dataStore.t('pension.isOPPVTransfer')" />
         </base-form-section>
         <base-form-section :title="$dataStore.t('pension.paymentTerms')">
           <base-form-input
@@ -703,14 +722,16 @@ export default defineComponent({
     const enabled = 'включено';
 
     const additionalTerms = ref<AddCover[]>([]);
-    const ksj = ref(new Value());
+
     const maxDate = ref();
     const dateOfBegin = ref();
     const contractDate = ref();
-    const guaranteedPeriodList = ref();
-    const isMultiplePanelOpen = ref<boolean>(false);
+    const transferContractDate = ref();
+    const transferContractFirstPaymentDate = ref();
+    const guaranteedPeriodList = Array.from(Array(35), (e, i) => i + 1);
     const pensionForm = formStore.applicationData?.pensionApp ?? undefined;
 
+    const isMultiplePanelOpen = ref<boolean>(false);
     const multiplePanelValue = ref<CountryValue>(new CountryValue());
     const multiplePanelList = ref<CountryValue[]>([]);
     const calculatorForm = productConditionsForm.calculatorForm;
@@ -1007,6 +1028,7 @@ export default defineComponent({
       ownFundsRaisAmount: pensionForm && pensionForm.ownFundsRaisAmount && pensionForm.ownFundsRaisAmount != 0 ? pensionForm.ownFundsRaisAmount : null,
       compulsoryProfContractAmount:
         pensionForm && pensionForm.compulsoryProfContractAmount && pensionForm.compulsoryProfContractAmount != 0 ? pensionForm.compulsoryProfContractAmount : null,
+      transferContractAmount: pensionForm && pensionForm.transferContractAmount && pensionForm.transferContractAmount != 0 ? pensionForm.transferContractAmount : null,
     });
 
     const pensionAmount = computed(() =>
@@ -1014,7 +1036,8 @@ export default defineComponent({
         ? (Number(pensionCalculationParams.value.compulsoryContractAmount) ?? 0) +
           (Number(pensionCalculationParams.value.voluntaryContractAmount) ?? 0) +
           (Number(pensionCalculationParams.value.ownFundsRaisAmount) ?? 0) +
-          (Number(pensionCalculationParams.value.compulsoryProfContractAmount) ?? 0)
+          (Number(pensionCalculationParams.value.compulsoryProfContractAmount) ?? 0) +
+          (Number(pensionCalculationParams.value.transferContractAmount) ?? 0)
         : 0,
     );
 
@@ -1055,6 +1078,9 @@ export default defineComponent({
       if (whichProduct.value === 'lifetrip') {
         // @ts-ignore
         calculatorForm[currentPanel.value] = item.nameRu === null ? new Value() : item;
+      } else if (whichProduct.value === 'pensionannuity') {
+        // @ts-ignore
+        pensionForm[currentPanel.value] = item.nameRu === null ? new Value() : item;
       } else {
         // @ts-ignore
         productConditionsForm[currentPanel.value] = item.nameRu === null ? new Value() : item;
@@ -1414,17 +1440,21 @@ export default defineComponent({
               dataStore.showToaster('error', 'Минимальное число дней уплаты ОППВ должно быть больше 60');
               return;
             }
-            Object.assign(
-              pensionForm,
-              (pensionCalculationParams.value = {
+            const data = {
+              ...pensionForm,
+              ...(pensionCalculationParams.value = {
                 ...pensionCalculationParams.value,
                 compulsoryContractAmount: Number(pensionCalculationParams.value.compulsoryContractAmount),
                 voluntaryContractAmount: Number(pensionCalculationParams.value.voluntaryContractAmount),
                 ownFundsRaisAmount: Number(pensionCalculationParams.value.ownFundsRaisAmount),
                 compulsoryProfContractAmount: Number(pensionCalculationParams.value.compulsoryProfContractAmount),
+                transferContractAmount: Number(pensionCalculationParams.value.transferContractAmount),
               }),
-            );
-            await dataStore.setApplication(true);
+              transferContractCompany: pensionForm.transferContractCompany?.nameRu ?? null,
+              transferContractDate: transferContractDate.value ? formatDate(transferContractDate.value) : null,
+              transferContractFirstPaymentDate: transferContractFirstPaymentDate.value ? formatDate(transferContractFirstPaymentDate.value) : null,
+            };
+            await dataStore.setApplication(data, true);
           } else {
             if (whichSum.value === 'requestedSumInsured') {
               productConditionsForm.insurancePremiumPerMonth = null;
@@ -1606,8 +1636,9 @@ export default defineComponent({
       if (whichProduct.value === 'pensionannuity') {
         contractDate.value = reformatDate(formStore.applicationData.pensionApp.contractDate);
         dateOfBegin.value = reformatDate(formStore.applicationData.pensionApp.dateOfBegin);
+        transferContractDate.value = reformatDate(formStore.applicationData.pensionApp.transferContractDate);
+        transferContractFirstPaymentDate.value = reformatDate(formStore.applicationData.pensionApp.transferContractFirstPaymentDate);
         maxDate.value = await dataStore.getVariableData(formStore.applicationData.processCode ?? 1);
-        guaranteedPeriodList.value = Array.from(Array(35), (e, i) => i + 1);
       }
     });
 
@@ -1719,7 +1750,8 @@ export default defineComponent({
       pensionForm,
       dateOfBegin,
       contractDate,
-      ksj,
+      transferContractDate,
+      transferContractFirstPaymentDate,
       enabled,
       maxDate,
       guaranteedPeriodList,

package/components/Panel/PanelHandler.vue

@@ -34,8 +34,14 @@
       <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" />
@@ -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,7 +536,7 @@ export default defineComponent({
       return true;
     });
     const isPaperDisabled = computed(() => {
-      if (dataStore.isGons || dataStore.isPension) {
+      if (dataStore.isGons) {
         return false;
       }
       return true;
@@ -531,37 +545,43 @@ export default defineComponent({
       if (dataStore.isGons) {
         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 (needsAgreement.value) {
+        if (!consentGiven.value && dataStore.isPension) {
+          return true;
+        }
       }
-      if (dataStore.isLifeBusiness || dataStore.isPension || dataStore.isGns) {
+      if (dataStore.isLifeBusiness || dataStore.isGns) {
         return false;
       }
       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 +833,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, 'Нет')];

package/composables/constants.ts

@@ -54,11 +54,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": "Выберите документы для подписание",
@@ -534,6 +540,7 @@
     "transferContractAmount": "Выкупная сумма, в тенге",
     "guaranteedPeriod": "Гарантированный период страховых выплат (от 1 до 35, в годах)",
     "isOPPV": "Включите, если есть ОППВ",
+    "isOPPVTransfer": "Выкупная сумма содержит суммы ОППВ?",
     "annuityConditions": "Условия аннуитетных выплат",
     "role": "Роль",
     "frequencyPayments": "Периодичность аннуитетной выплаты",
@@ -560,7 +567,10 @@
     "dossierPA": "Форма Описи страхового досье ПА (docx)",
     "transferContractCompany": "Наименование КСЖ",
     "transferContractFirstPaymentDate": "Дата начала выплат по договору с КСЖ",
-    "companyName": "Наименование компании по страхованию жизни"
+    "companyName": "Наименование компании по страхованию жизни",
+    "bankInvalid": "Некорректные банковские данные",
+    "globalId": "Уникальный номер договора (globalId)",
+    "oppvMonthsCheck": "ВНИМАНИЕ! НЕОБХОДИМО ПРОВЕРИТЬ НАЛИЧИЕ ОТЧИСЛЕНИЙ 60 МЕСЯЦЕВ ПО ПРИЗНАКУ 'ОППВ'"
   },
   "agent": {
     "currency": "Валюта",
@@ -811,6 +821,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.52",
   "license": "MIT",
   "private": false,
   "main": "nuxt.config.ts",

package/store/data.store.ts

@@ -983,7 +983,7 @@ export const useDataStore = defineStore('data', {
               delete data.id;
             }
           }
-          data.isDisability = this.formStore.isPolicyholderInsured && !this.isPension ? false : member.isDisability.nameRu == 'Да';
+          data.isDisability = this.formStore.isPolicyholderInsured && !this.isPension ? false : !!member.isDisability;
           data.disabilityGroupId = data.isDisability && member.disabilityGroup ? member.disabilityGroup.id : null;
           data.profession = member.job;
           data.position = member.jobPosition;
@@ -1035,11 +1035,11 @@ export const useDataStore = defineStore('data', {
         }
       }
     },
-    async setApplication(calculate: boolean = false) {
+    async setApplication(applicationData: object, calculate: boolean = false) {
       try {
         this.isLoading = true;
         this.isButtonsLoading = true;
-        await this.api.setApplication(this.formStore.applicationData.pensionApp);
+        await this.api.setApplication(applicationData);
         if (calculate) {
           await this.api.calculatePension(String(this.formStore.applicationData.processInstanceId));
           this.showToaster('success', this.t('toaster.successSaved'), 2000);
@@ -1437,7 +1437,7 @@ export const useDataStore = defineStore('data', {
       if (this.isLifeBusiness || this.isDas || this.isUU || this.isPension || this.isGns || this.isPrePension || this.isDSO) return await this.getFromApi('banks', 'getBanks');
     },
     async getInsuranceCompanies() {
-      if (this.isPension) return await this.getFromApi('insuranceCompanies', 'getInsuranceCompanies');
+      if (this.isPension) return await this.getFromApi('transferContractCompanies', 'getInsuranceCompanies');
     },
     async getProcessIndexRate() {
       if (this.processCode) {
@@ -1526,6 +1526,7 @@ export const useDataStore = defineStore('data', {
         this.getInsuranceCompanies(),
         this.getEconomicActivityType(),
         this.getAuthorityBasis(),
+        this.getDisabilityGroups(),
       ]);
     },
     async getQuestionList(
@@ -2286,7 +2287,7 @@ export const useDataStore = defineStore('data', {
           });
           this.formStore.productConditionsForm.riskGroup = riskGroup ? riskGroup : this.riskGroup.find(item => item.id == 1) ?? new Value();
         }
-        if (this.isPension && this.formStore.policyholderForm.bankInfo) {
+        if (this.isPension && this.formStore.policyholderForm.bankInfo && this.formStore.policyholderForm.bankInfo.bik) {
           this.formStore.insuredForm[0].bankInfo = this.formStore.policyholderForm.bankInfo;
         }
       } catch (err) {
@@ -2438,16 +2439,20 @@ export const useDataStore = defineStore('data', {
       if (!!this.formStore.applicationData[whichMember].profession) this.formStore[whichForm].job = this.formStore.applicationData[whichMember].profession;
       if (!!this.formStore.applicationData[whichMember].position) this.formStore[whichForm].jobPosition = this.formStore.applicationData[whichMember].position;
       if (!!this.formStore.applicationData[whichMember].jobName) this.formStore[whichForm].jobPlace = this.formStore.applicationData[whichMember].jobName;
+      if (typeof this.formStore.applicationData[whichMember].isDisability === 'boolean')
+        this.formStore[whichForm].isDisability = this.formStore.applicationData[whichMember].isDisability;
+      if (!!this.formStore.applicationData[whichMember].disabilityGroupId) {
+        const disabilityGroup = this.disabilityGroups.find(i => i.id === this.formStore.applicationData[whichMember].disabilityGroupId);
+        this.formStore[whichForm].disabilityGroup = disabilityGroup ? disabilityGroup : new Value();
+      }
       if (whichForm === this.formStore.policyholderFormKey && this.isPension && 'pensionApp' in this.formStore.applicationData && !!this.formStore.applicationData.pensionApp) {
         this.formStore[whichForm].bankInfo.iik = this.formStore.applicationData.pensionApp.account;
         this.formStore[whichForm].bankInfo.bik = this.formStore.applicationData.pensionApp.bankBik;
         const bank = this.banks.find(i => i.ids === this.formStore.applicationData.pensionApp.bankBin);
-        if (bank) {
-          this.formStore[whichForm].bankInfo.bankName = bank;
-          this.formStore[whichForm].bankInfo.bin = bank.ids as string;
-        } else {
-          this.formStore[whichForm].bankInfo.bankName = new Value();
-        }
+        const transferCompany = this.transferContractCompanies.find(i => i.nameRu === this.formStore.applicationData.pensionApp.transferContractCompany);
+        this.formStore[whichForm].bankInfo.bankName = bank ? bank : new Value();
+        this.formStore[whichForm].bankInfo.bin = bank ? String(bank.ids) : '';
+        this.formStore.applicationData.pensionApp.transferContractCompany = transferCompany ? transferCompany : new Value();
       }
     },
     setMembersFieldIndex(whichForm: MultipleMember, whichMember: keyof typeof MemberAppCodes, index: number) {
@@ -2470,6 +2475,13 @@ export const useDataStore = defineStore('data', {
       if ('jobPlace' in this.formStore[whichForm][index] && !!this.formStore.applicationData[whichMember][index].jobName) {
         this.formStore[whichForm][index].jobPlace = this.formStore.applicationData[whichMember][index].jobName;
       }
+      if (typeof this.formStore.applicationData[whichMember][index].isDisability === 'boolean') {
+        this.formStore[whichForm][index].isDisability = this.formStore.applicationData[whichMember][index].isDisability;
+      }
+      if (!!this.formStore.applicationData[whichMember][index].disabilityGroupId) {
+        const disabilityGroup = this.disabilityGroups.find(i => i.id === this.formStore.applicationData[whichMember][index].disabilityGroupId);
+        this.formStore[whichForm][index].disabilityGroup = disabilityGroup ? disabilityGroup : new Value();
+      }
     },
     async signDocument(type: string = 'electronic') {
       try {
@@ -2502,32 +2514,23 @@ export const useDataStore = defineStore('data', {
                     name: this.processCode == 1 ? 'PA_Statement' : 'PA_RefundStatement',
                     format: 'pdf',
                   },
+                  {
+                    processInstanceId: String(this.formStore.applicationData.processInstanceId),
+                    name: 'Agreement',
+                    format: 'pdf',
+                  },
                 ];
               }
-
-            case 'ContractSignedByAuthorizedPerson':
-              return [
-                {
-                  processInstanceId: String(this.formStore.applicationData.processInstanceId),
-                  name: this.processCode == 1 ? 'PA_Contract' : 'PA_Contract',
-                  format: 'pdf',
-                },
-              ];
             case 'ContractSignedByAuthorizedPerson':
               return [
                 {
                   processInstanceId: String(this.formStore.applicationData.processInstanceId),
-                  name: this.processCode == 1 ? 'PA_Contract' : 'PA_Contract',
+                  name: 'PA_Contract',
                   format: 'pdf',
                 },
               ];
             default:
               return [
-                {
-                  processInstanceId: String(this.formStore.applicationData.processInstanceId),
-                  name: 'Agreement',
-                  format: 'pdf',
-                },
                 {
                   processInstanceId: String(this.formStore.applicationData.processInstanceId),
                   name: 'Statement',
@@ -2550,25 +2553,56 @@ export const useDataStore = defineStore('data', {
             await ncaLayerClient.connect();
             activeTokens = await ncaLayerClient.getActiveTokens();
             const storageType = activeTokens[0] || NCALayerClient.fileStorageType;
-            const agreementXml = await this.getDocument(this.formStore.applicationData.processInstanceId as string);
-            const wnd = window.open('about:blank', '', '_blank');
-            wnd?.document.write(agreementXml as any);
-            const signedAgreement = await ncaLayerClient.signXml(storageType, agreementXml, 'SIGNATURE', '');
-            const document = {
-              processInstanceId: String(this.formStore.applicationData.processInstanceId),
-              name: 'PAEnpf_Agreement',
-              format: 'xml',
-            };
-            const signData = await this.api.signXml([document]);
-            let data = new FormData();
-            data.append('processInstanceId', String(this.formStore.applicationData.processInstanceId));
-            data.append('xmlData', signedAgreement);
-            data.append('name', 'PAEnpf_Agreement');
-            data.append('format', 'xml');
-            data.append('EdsXmlId', signData.data);
-            await this.api.uploadXml(data);
-            await this.getSignedDocList(this.formStore.applicationData.processInstanceId);
-            this.showToaster('success', this.t('pension.consentGiven'), 3000);
+            if (this.formStore.applicationData.statusCode === 'ContractSignedByAuthorizedPerson') {
+              const document = await this.generatePDFDocument('PAEnpf_Agreement', '40', 'pdf');
+              const base64EncodedSignature = await ncaLayerClient.basicsSignCMS(storageType, document, NCALayerClient.basicsCMSParams, NCALayerClient.basicsSignerSignAny);
+              const formData = new FormData();
+              formData.append('base64EncodedSignature', base64EncodedSignature);
+              formData.append('processInstanceId', String(this.formStore.applicationData.processInstanceId));
+              formData.append('name', 'PAEnpf_Agreement');
+              formData.append('format', 'pdf');
+              try {
+                await this.api.uploadDigitalCertifijcate(formData);
+                await this.handleTask('accept', String(this.formStore.applicationTaskId));
+              } catch (e) {
+                this.showToaster('error', String(e));
+                return;
+              }
+            } else if (this.formStore.applicationData.statusCode === 'ContractSignedFrom') {
+              const document = await this.generatePDFDocument('PA_Contract', '38', 'pdf');
+              const base64EncodedSignature = await ncaLayerClient.basicsSignCMS(storageType, document, NCALayerClient.basicsCMSParams, NCALayerClient.basicsSignerSignAny);
+              const formData = new FormData();
+              formData.append('base64EncodedSignature', base64EncodedSignature);
+              formData.append('processInstanceId', String(this.formStore.applicationData.processInstanceId));
+              formData.append('name', 'PA_Contract');
+              formData.append('format', 'pdf');
+              try {
+                await this.api.uploadDigitalCertifijcate(formData);
+                await this.handleTask('accept', String(this.formStore.applicationTaskId));
+              } catch (e) {
+                this.showToaster('error', String(e));
+                return;
+              }
+            } else {
+              const agreementXml = await this.getDocument(this.formStore.applicationData.processInstanceId as string);
+              const wnd = window.open('about:blank', '', '_blank');
+              wnd?.document.write(agreementXml as any);
+              const signedAgreement = await ncaLayerClient.signXml(storageType, agreementXml, 'SIGNATURE', '');
+              const document = {
+                processInstanceId: String(this.formStore.applicationData.processInstanceId),
+                name: 'PAEnpf_Agreement',
+                format: 'xml',
+              };
+              const signData = await this.api.signXml([document]);
+              const data = new FormData();
+              data.append('processInstanceId', String(this.formStore.applicationData.processInstanceId));
+              data.append('xmlData', signedAgreement);
+              data.append('name', 'PAEnpf_Agreement');
+              data.append('format', 'xml');
+              data.append('EdsXmlId', signData.data);
+              await this.api.uploadXml(data);
+              await this.getSignedDocList(this.formStore.applicationData.processInstanceId);
+            }
           } catch (error) {
             this.showToaster('error', String(error));
             return;

package/store/rules.ts

@@ -240,19 +240,15 @@ export const rules = {
   checkDate: [
     (v: any) => {
       const today = new Date();
-      const yesterday = new Date();
-      yesterday.setDate(today.getDate() - 1);
       const yourDate = new Date(formatDate(v)!);
-
       if (yourDate.toDateString() === today.toDateString()) {
         return true;
-      } else if (yourDate.toDateString() === yesterday.toDateString()) {
-        return true;
       } else {
         return t('rules.checkDate');
       }
     },
   ],
+  fileRequired: [(v: any) => !!v || t('rules.fileRequired'), (v: any) => (v && v.length > 0) || t('rules.fileRequired')],
   guaranteedPeriodLimit(v: any, termAnnuityPayments: any) {
     if (Number(v) > Number(termAnnuityPayments)) {
       return t('rules.guaranteedPeriodLimit');

package/types/index.ts

@@ -354,7 +354,7 @@ declare global {
 
   type SignDataType = {
     processInstanceId: string;
-    name: 'Statement' | 'Agreement' | 'Contract' | 'PA_Contract' | 'PA_Statement' | 'PA_RefundStatement' | 'PA_RefundAgreement' | 'PAEnpf_Agreement';
+    name: 'Statement' | 'Agreement' | 'Contract' | 'PA_Contract' | 'PA_Statement' | 'PA_RefundStatement' | 'PA_RefundAgreement' | 'PAEnpf_Agreement' | 'InvoicePayment';
     format: 'pdf' | 'xml';
   };