hl-core 0.0.10-beta.30 → 0.0.10-beta.31

package/components/Panel/PanelHandler.vue

@@ -73,19 +73,26 @@
       </base-form-section>
     </div>
     <div v-if="!(formStore.signatories.length === 0) && !isQr && !isScansDocuments" :class="[$styles.flexColNav]">
+      <div
+        v-if="(processCode === 19 || processCode === 25) && formStore.applicationData.statusCode === 'AttachAppContractForm'"
+        :class="[$styles.blueBgLight]"
+        class="rounded-lg p-4"
+      >
+        <base-form-toggle v-model="isOnlineEnpf" title="Онлайн подписание согласия для ЕНПФ" :has-border="false" @clicked="setActualEnpf" />
+      </div>
       <div :class="[$styles.blueBgLight]" class="rounded-lg p-4">
-        <v-expansion-panels v-if="formStore.signatories.length" variant="accordion" multiple>
+        <v-expansion-panels v-if="formStore.signatories.length" variant="accordion" :multiple="false">
           <v-expansion-panel v-for="(person, index) of formStore.signatories" :key="person.personId!" class="border-[1px]" elevation="0" bg-color="#FFF">
             <v-expansion-panel-title class="h-[80px]" :class="$styles.textTitle">
               {{ person.longName }}
             </v-expansion-panel-title>
             <v-expansion-panel-text class="border-t-[1px]">
               <section class="flex flex-col" :class="$styles.textSimple">
-                <v-expansion-panels v-if="person.fileDatas.length" v-model="currentFilePanel">
+                <v-expansion-panels v-if="person.fileDatas.length" v-model="currentFilePanel" :multiple="false">
                   <v-expansion-panel
                     v-for="(file, fileIndex) in groupBy(person.fileDatas, 'orderFile')"
-                    :value="fileIndex"
-                    :disabled="inSigningOrder(person.fileDatas, fileIndex) || file[0].isSigned"
+                    :value="`${index} - ${fileIndex}`"
+                    :disabled="inSigningOrder(person.fileDatas, fileIndex) || file.every((f: any) => f.isSigned === true)"
                   >
                     <v-expansion-panel-title v-for="name in file" class="h-[80px]" :class="$styles.textTitle">
                       {{ name.fileName }}
@@ -109,6 +116,9 @@
         </v-expansion-panels>
         <base-list-empty v-else />
       </div>
+      <base-animation>
+        <base-btn v-if="isAllPaperSigned" :text="$dataStore.t('buttons.send')" :loading="loading" @click="$dataStore.panelAction = constants.actions.signed" />
+      </base-animation>
     </div>
   </section>
   <section v-if="choosePayActions">
@@ -243,7 +253,7 @@
 import { DocumentItem, Value } from '../../composables/classes';
 import { HubConnectionBuilder } from '@microsoft/signalr';
 import { uuid } from 'vue-uuid';
-import type { Api, SignUrlType } from '../../types';
+import type * as Types from '../../types';
 import { CoreEnums } from '../../types/enum';
 
 export default defineComponent({
@@ -266,15 +276,15 @@ export default defineComponent({
     const isOfflinePay = ref<boolean>(false);
     const isQrDialog = ref<boolean>(false);
     const email = ref<string>('');
-    const signOptions = ref<Api.Sign.New.Response>();
-    const signingFiles = ref<Api.Sign.New.FileDatas[]>([]);
-    const allDocumentsSigned = ref<boolean>(false);
+    const signOptions = ref<Types.Api.Sign.New.Response>();
+    const signingFiles = ref<Types.Api.Sign.New.FileDatas[]>([]);
+    const isOnlineEnpf = ref<boolean>(true);
     const currentFilePanel = ref<string[]>([]);
 
     const vForm = ref<any>();
     const isSendNumberOpen = ref<boolean>(false);
     const phoneNumber = ref<string | null>(formStore.policyholderForm.phoneNumber ?? '');
-    const selectedClient = ref<SignUrlType>();
+    const selectedClient = ref<Types.SignUrlType>();
     const documentDict = computed(() => dataStore.dicFileTypeList.find(i => i.nameRu === 'Решение АС'));
     const affiliationDocument = computed(() => formStore.signedDocumentList.find((file: DocumentItem) => file.fileTypeName === 'Решение АС'));
     const affiliationData = ref<{
@@ -290,9 +300,10 @@ export default defineComponent({
     const affiliationFormData = ref(new FormData());
     const scansFormData = ref(new FormData());
     const scansFiles = ref<any[]>([]);
+    const isAllPaperSigned = computed(() => formStore.signatories.every((person: any) => person.fileDatas.every((file: any) => file.isSigned === true && file.signedType === 2)));
     const processCode = formStore.applicationData.processCode;
 
-    const openSmsPanel = (signInfo: SignUrlType) => {
+    const openSmsPanel = (signInfo: Types.SignUrlType) => {
       if (signInfo) {
         isSendNumberOpen.value = true;
         selectedClient.value = signInfo;
@@ -418,7 +429,7 @@ export default defineComponent({
     };
 
     const sendFilesNew = async () => {
-      if (scansFiles.value.length !== signOptions.value?.signIds.length) {
+      if (scansFiles.value.length !== signingFiles.value.length) {
         dataStore.showToaster('warning', dataStore.t('toaster.notAllDocumentsAttached'));
         return;
       }
@@ -428,14 +439,13 @@ export default defineComponent({
             await dataStore.api.file.uploadFilesNew(f.groupId, f.data);
           }),
         );
+        await checkIfAllSigned(true);
         scansFiles.value = [];
-        closePanel();
-        dataStore.showToaster('info', 'Документы подписаны');
-        await dataStore.handleTask(constants.actions.signed, route.params.taskId as string);
+        isScansDocuments.value = false;
+        dataStore.showToaster('info', 'Документы загружены успешно');
       } catch (err) {
         return ErrorHandler(err);
       }
-      closePanel();
     };
 
     const sendFiles = async () => {
@@ -506,7 +516,11 @@ export default defineComponent({
         }
       }
       if (dataStore.isPension) {
-        await dataStore.getSignedDocList(formStore.applicationData.processInstanceId);
+        if (formStore.applicationData.pensionApp) {
+          const isOnlineEnpfAgreement = formStore.applicationData.pensionApp.isOnlineEnpfAgreement;
+          isOnlineEnpf.value = isOnlineEnpfAgreement === null ? true : isOnlineEnpfAgreement;
+          await dataStore.getSignedDocList(formStore.applicationData.processInstanceId);
+        }
       }
     };
 
@@ -562,13 +576,13 @@ export default defineComponent({
         dataStore.panelAction === constants.actions.return ||
         dataStore.panelAction === constants.actions.rejectclient,
     );
-    const acceptAction = computed(() => dataStore.panelAction === constants.actions.accept);
+    const acceptAction = computed(() => dataStore.panelAction === constants.actions.accept || (dataStore.isPension && dataStore.panelAction === constants.actions.signed));
     const signingActions = computed(() => dataStore.panelAction === constants.actions.sign);
     const payingActions = computed(() => dataStore.panelAction === constants.actions.pay);
     const affiliateActions = computed(() => dataStore.panelAction === constants.actions.affiliate);
     const chooseSignActions = computed(() => dataStore.controls.hasChooseSign && dataStore.panelAction === constants.actions.chooseSign);
     const choosePayActions = computed(() => dataStore.controls.hasChoosePay && dataStore.panelAction === constants.actions.choosePay);
-    const isNewSign = computed(() => (dataStore.isPension && !useEnv().isProduction) || dataStore.isGons);
+    const isNewSign = computed(() => dataStore.isPension || dataStore.isGons);
     const paymentPeriod = computed(() => formStore.productConditionsForm.paymentPeriod.nameRu);
     const insurancePremiumPerMonth = computed(() => {
       if (dataStore.isGons && formStore.productConditionsForm.currency.code === 'USD') {
@@ -588,7 +602,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 || dataStore.isUU || dataStore.isPrePension) {
+      if (dataStore.isLifetrip || dataStore.isDas || dataStore.isUU || dataStore.isPrePension || dataStore.isPension) {
         return false;
       }
       if (dataStore.isFinCenter()) {
@@ -774,7 +788,7 @@ export default defineComponent({
       await dataStore.generateDocument();
     };
 
-    const convertQr = async (url: string | null, template?: Api.GenerateShortLink.Templates) => {
+    const convertQr = async (url: string | null, template?: Types.Api.GenerateShortLink.Templates) => {
       if (url) {
         const shortedUrl = await dataStore.generateShortLink(url, template);
         qrUrl.value = typeof shortedUrl === 'string' && !!shortedUrl ? shortedUrl : url;
@@ -833,17 +847,18 @@ export default defineComponent({
       }, {});
     };
 
-    const checkIfAllSigned = async () => {
+    const checkIfAllSigned = async (sendTask: boolean = false) => {
       await dataStore.generateSign(route.params.taskId as string);
-      formStore.signatories.find((person: any) => {
+      formStore.signatories.find(async (person: any) => {
         if (person.fileDatas.find((file: any) => file.isSigned === false) === undefined) {
-          if (formStore.applicationData.statusCode !== 'ContractSignedFrom')
-            dataStore.showToaster(
-              'success',
-              dataStore.t(`pension.${formStore.applicationData.statusCode === 'HeadManagerForm' ? 'signInProcessManager' : 'signInProcess'}`),
-              30000,
-            );
-          allDocumentsSigned.value = true;
+          if (formStore.applicationData.statusCode !== 'ContractSignedFrom') {
+            // TODO better if condition
+            // dataStore.showToaster(
+            //   'success',
+            //   dataStore.t(`pension.${formStore.applicationData.statusCode === 'HeadManagerForm' ? 'signInProcessManager' : 'signInProcess'}`),
+            //   30000,
+            // );
+          }
         }
       });
     };
@@ -854,13 +869,9 @@ export default defineComponent({
         ...formStore.signatories[index],
         signType: signType,
         fileDatas: file,
-      };
+      } as Types.Api.Sign.New.GeneralResponse;
       try {
-        signOptions.value = await dataStore.api.file.generalSign(data);
-        const message = [];
-        for (let i of file) {
-          message.push(i.fileName);
-        }
+        signOptions.value = await dataStore.generalSign(data);
         if (signOptions.value) {
           switch (signType) {
             case CoreEnums.Sign.Types.electronic:
@@ -871,8 +882,7 @@ export default defineComponent({
               break;
             case CoreEnums.Sign.Types.scans:
               isScansDocuments.value = true;
-              signingFiles.value = data.fileDatas;
-              message.length = 0;
+              signingFiles.value = data.fileDatas && Array.isArray(data.fileDatas) ? data.fileDatas.filter(i => i.isSigned !== true) : [];
               break;
             case CoreEnums.Sign.Types.qr:
               if (!signOptions.value.signatureDocumentGroupId) return dataStore.showToaster('error', 'Ошибка подписи документов', 10000);
@@ -887,21 +897,18 @@ export default defineComponent({
             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) {
+                if (response === null) {
                   dataStore.showToaster('error', 'Ошибка подписи документов', 10000);
-                  message.length = 0;
                   break;
                 }
+                if (!response) break;
               }
               break;
             default:
               break;
           }
         }
-        if (message.length) {
-          // dataStore.showToaster('info', 'Подписывается: ' + message.join(', '), 5000);
-          await checkIfAllSigned();
-        }
+        await checkIfAllSigned();
         currentFilePanel.value = [];
       } catch (err) {
         ErrorHandler(err);
@@ -909,6 +916,16 @@ export default defineComponent({
       loading.value = false;
     };
 
+    const setActualEnpf = useDebounceFn(async () => {
+      try {
+        await dataStore.api.file.setActualEnpf({ processId: String(formStore.applicationData.processInstanceId), isOnlineEnpfAgreement: isOnlineEnpf.value });
+        await dataStore.generateSign(String(route.params.taskId));
+      } catch (err) {
+        ErrorHandler(err);
+      }
+      currentFilePanel.value = [];
+    }, 1000);
+
     return {
       // State
       formStore,
@@ -932,7 +949,7 @@ export default defineComponent({
       email,
       signOptions,
       signingFiles,
-      allDocumentsSigned,
+      isOnlineEnpf,
       currentFilePanel,
 
       // Functions
@@ -951,6 +968,7 @@ export default defineComponent({
       handlePayAction,
       payEpay,
       convertQr,
+      setActualEnpf,
       sendInvoiceToEmail,
       hasConditionsAction,
 
@@ -963,6 +981,7 @@ export default defineComponent({
       affiliateActions,
       chooseSignActions,
       paymentPeriod,
+      isAllPaperSigned,
       insurancePremiumPerMonth,
       requestedSumInsured,
       affiliationDocument,

package/composables/classes.ts

@@ -97,6 +97,7 @@ export class IDocument {
   signed?: boolean | null;
   signId?: string | null;
   certificateDate?: string | null;
+  signedType?: number;
 
   constructor(
     id?: string,
@@ -113,6 +114,7 @@ export class IDocument {
     signed?: boolean | null,
     signId?: string | null,
     certificateDate?: string | null,
+    signedType?: number,
   ) {
     this.id = id;
     this.processInstanceId = processInstanceId;
@@ -128,6 +130,7 @@ export class IDocument {
     this.signed = signed;
     this.signId = signId;
     this.certificateDate = certificateDate;
+    this.signedType = signedType;
   }
 }
 
@@ -148,9 +151,10 @@ export class DocumentItem extends IDocument {
       signed,
       signId,
       certificateDate,
+      signedType,
     }: IDocument = new IDocument(),
   ) {
-    super(id, processInstanceId, iin, fileTypeId, fileTypeName, fileTypeNameRu, fileId, page, fileName, fileTypeCode, sharedId, signed, signId, certificateDate);
+    super(id, processInstanceId, iin, fileTypeId, fileTypeName, fileTypeNameRu, fileId, page, fileName, fileTypeCode, sharedId, signed, signId, certificateDate, signedType);
   }
 }
 
@@ -1394,6 +1398,7 @@ export class FormStoreClass {
     beneficiaryForm: boolean;
     beneficialOwnerForm: boolean;
     insuredForm: boolean;
+    slaveInsuredForm: boolean;
     policyholdersRepresentativeForm: boolean;
     productConditionsForm: boolean;
     calculatorForm: boolean;
@@ -1429,6 +1434,7 @@ export class FormStoreClass {
     parentPolicyDto?: Types.ParentPolicyDto | null;
     insisWorkDataApp?: Types.InsisWorkDataApp;
     addCoverDto?: Types.AddCover[];
+    slave?: any;
   };
   policyholderForm: Member;
   policyholderFormKey: StoreMembers.policyholderForm;
@@ -1441,14 +1447,17 @@ export class FormStoreClass {
   beneficialOwnerFormIndex: number;
   beneficialOwnerFormKey: StoreMembers.beneficialOwnerForm;
   insuredForm: Member[];
+  slaveInsuredForm: Member;
   insuredFormKey: StoreMembers.insuredForm;
   insuredFormIndex: number;
   productConditionsForm: ProductConditions;
   productConditionsFormKey: string;
+  pensionApp: any;
   questionnaireByHealth: any;
   questionnaireByCritical: any[];
   canBeClaimed: boolean | null;
   applicationTaskId: string | null;
+  requiredDocuments: RequiredDocument[];
 
   constructor() {
     this.regNumber = null;
@@ -1519,6 +1528,7 @@ export class FormStoreClass {
       beneficiaryForm: true,
       beneficialOwnerForm: true,
       insuredForm: true,
+      slaveInsuredForm: true,
       policyholdersRepresentativeForm: true,
       productConditionsForm: true,
       calculatorForm: true,
@@ -1547,6 +1557,7 @@ export class FormStoreClass {
     this.beneficialOwnerFormIndex = 0;
     this.beneficialOwnerFormKey = StoreMembers.beneficialOwnerForm;
     this.insuredForm = [new Member()];
+    this.slaveInsuredForm = new Member();
     this.insuredFormKey = StoreMembers.insuredForm;
     this.insuredFormIndex = 0;
     this.productConditionsForm = new ProductConditions();
@@ -1555,6 +1566,7 @@ export class FormStoreClass {
     this.questionnaireByCritical = [];
     this.canBeClaimed = null;
     this.applicationTaskId = null;
+    this.requiredDocuments = [];
   }
 }
 
@@ -1788,13 +1800,13 @@ export class TransferContract {
   id: string | null;
   transferContractIsOppv: boolean;
   transferContractFirstPaymentDate: string;
-  transferContractAmount: number;
+  transferContractAmount: number | string;
   transferContractDate: string;
   transferContractNumber: string;
   transferContractRegNumber: string;
   transferContract: boolean;
   transferContractCompany: Value;
-  transferContractMonthCount: number;
+  transferContractMonthCount: number | null;
 
   constructor() {
     this.id = null;
@@ -1806,6 +1818,10 @@ export class TransferContract {
     this.transferContract = false;
     this.transferContractRegNumber = '';
     this.transferContractCompany = new Value();
-    this.transferContractMonthCount = 0;
+    this.transferContractMonthCount = null;
   }
 }
+
+export class RequiredDocument extends Value {
+  iin: string = '';
+}

package/composables/constants.ts

@@ -21,6 +21,8 @@ export const constants = Object.freeze({
     halykkazynaap: 20,
     balam: 21,
     halykkazynaapsms: 23,
+    pensionannuityrefundnew: 24,
+    pensionannuityjointnew: 25,
   },
   amlProducts: {
     checkcontragent: 1,
@@ -39,6 +41,7 @@ export const constants = Object.freeze({
   returnStatementStatuses: [
     Statuses.ApproveForm,
     Statuses.ActuaryForm,
+    Statuses.JuristForm,
     Statuses.DsoUsnsForm,
     Statuses.AccountantForm,
     Statuses.UnderwriterForm,
@@ -104,6 +107,11 @@ export const constants = Object.freeze({
     questionnaireInsured: 35,
     invoicePayment: 36,
   },
+  fileTypes: {
+    pdf: 'application/pdf',
+    docx: 'application/vnd.openxmlformats-officedocument.wordprocessingml.document',
+    doc: 'application/msword',
+  },
   regex: {
     isoDate: /^(\d{4})-(\d{2})-(\d{2})T(\d{2}):(\d{2}):(\d{2}(?:\.\d*)?)((-(\d{2}):(\d{2})|Z)?)$/,
   },

package/composables/index.ts

@@ -158,6 +158,8 @@ export const parseProcents = (val: string | number) => (val ? Number(((val as nu
 
 export const formatProcents = (val: string | number) => (val ? Number(((val as number) / 100).toFixed(2)) : Number(val));
 
+export const formatSpacedNumber = (val: any) => ((!isNaN(val) && val !== null) || typeof val === 'string' ? Number(String(val).replace(/\s/g, '')) : 0);
+
 export const sanitizeURL = (text: string) => (text ? text.replace(/\r?\n|\r|\\|"/g, '') : '');
 
 export const sanitize = (text: string) =>
@@ -808,7 +810,7 @@ export class RoleController {
   hasAccess = () => {
     const baseAccessRoles = this.isAdmin() || this.isSupport() || this.isAnalyst() || this.isDrn();
     return {
-      invoiceInfo: this.isAdmin(),
+      invoiceInfo: this.isAdmin() || this.isSupport(),
       toLKA: this.isAgent() || this.isManagerHalykBank() || baseAccessRoles,
       toAML: this.isCompliance() || baseAccessRoles,
       toAULETTI: this.isAgentAuletti() || this.isManagerAuletti() || baseAccessRoles,
@@ -832,6 +834,7 @@ export class RoleController {
         this.isDrn() ||
         this.isUrp() ||
         this.isUsns() ||
+        this.isJurist() ||
         this.isAccountant() ||
         this.isBranchDirector() ||
         this.isUSNSACCINS() ||

package/locales/ru.json

@@ -135,14 +135,17 @@
     "templateDownloaded": "Шаблон скачан",
     "templateSentToEmail": "Шаблона отправлен на почту",
     "fileOnlyBelow5mb": "Максимальный размер документа для загрузки - 5 МБ.",
+    "fileOnlyBelow10mb": "Максимальный размер документа для загрузки - 10 МБ.",
     "fileOnlyBelow20mb": "Максимальный размер документа для загрузки - 20 МБ.",
     "onlyPDF": "Загружать документы можно только в формате PDF",
+    "onlyWithFormat": "Загружать документы можно только в формате {format}",
     "notAllDocumentsAttached": "Не все документы вложены",
     "needAttachQuestionnaire": "Нужно вложить анкету для клиентов",
     "notZeroPremium": "Общая страховая премия не должен быть 0",
     "requiredFieldsLB": "Обязательные поля: №, Ф.И.О, Пол, Должность, Дата рождения, ИИН, Страховая сумма",
     "duplicateClient": "В списке присутствуют повторяющиеся клиенты",
     "notParsedDocument": "Не удалось получить данные",
+    "successProfile": "Профиль успешно обновлен",
     "errorOsns": "По данному БИН на дату заключения заявления не найден договор ОСНС. Просим проверить БИН Страхователя.",
     "needDigDoc": "Нужно получить цифровой документ {text}",
     "notDigDoc": "Выданный документ не найден"
@@ -564,8 +567,8 @@
     "frequencyPayments": "Периодичность аннуитетной выплаты",
     "paymentPeriod": "Период осуществления страховых выплат",
     "insuranceProgramType": "Вид программы страхования",
-    "pensionAmount": "Аннуитетная страховая премия",
-    "pensionPayment": "Периодичная аннуитетная выплата",
+    "pensionAmount": "Страховая премия",
+    "pensionPayment": "Аннуитетная выплата, тенге:",
     "male": "Мужской",
     "female": "Женский",
     "parentContractID": "Идентификатор родительского контракта",
@@ -576,7 +579,7 @@
     "KSJagreement": "Договор с другой КСЖ",
     "ENPFnote": "Выписка из ЕНПФ",
     "getDataENPF": "Получить данные с ЕНПФ",
-    "compulsoryProfMonthCount": "Количество месяцев уплаты ОППВ (не менее 2 месяцев)",
+    "compulsoryProfMonthCount": "Количество месяцев уплаты ОППВ (не менее 60 месяцев)",
     "insuredIIN": "ИИН «Страхователя»",
     "ifHasRelationBeneficiary": "Включите, если у Страхователя есть Родственные связи с Выгодоприобретателем",
     "complianceFinMonitoring": "Приложение 6/ПОДФТ",
@@ -587,13 +590,16 @@
     "transferContractFirstPaymentDate": "Дата начала выплат по договору с КСЖ",
     "companyName": "Наименование компании по страхованию жизни",
     "bankInvalid": "Некорректные банковские данные",
-    "globalId": "Уникальный номер договора (globalId)",
+    "globalId": "Уникальный номер договора с ЕСБД (globalId)",
     "oppvMonthsCheck": "ВНИМАНИЕ! НЕОБХОДИМО ПРОВЕРИТЬ НАЛИЧИЕ ОТЧИСЛЕНИЙ 60 МЕСЯЦЕВ ПО ПРИЗНАКУ 'ОППВ'",
     "signInProcess": "После подписания всех документов данная заявка перейдет к Подписанту вашего Региона",
     "signInProcessManager": "Договор будет подписан в течение минуты",
-    "transferRegNumber": "Номер и серия договора",
+    "transferRegNumber": "Номер и серия договора с КСЖ",
     "contragentSelect": "Выбор контрагента",
-    "fileError": "Ошибка прикрепления файла"
+    "fileError": "Ошибка прикрепления файла",
+    "parentContractNextPay": "Возврат с учетом очередной выплаты",
+    "parentContractNextPayDate": "Очередная выплата по графику",
+    "oppvPaymentCertificate": "Справка о количество взносов за счет ОППВ"
   },
   "agent": {
     "currency": "Валюта",

package/package.json

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