hl-core 0.0.10-beta.25 → 0.0.10-beta.26

package/components/Panel/PanelHandler.vue

@@ -73,21 +73,18 @@
       </base-form-section>
     </div>
     <div v-if="!(formStore.signatories.length === 0) && !isQr && !isScansDocuments" :class="[$styles.flexColNav]">
-      <div v-if="(processCode == 19 || processCode == 4) && 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="false">
+        <v-expansion-panels v-if="formStore.signatories.length" variant="accordion" multiple>
           <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" :multiple="false">
+                <v-expansion-panels v-if="person.fileDatas.length" v-model="currentFilePanel">
                   <v-expansion-panel
                     v-for="(file, fileIndex) in groupBy(person.fileDatas, 'orderFile')"
-                    :value="`${index} - ${fileIndex}`"
+                    :value="fileIndex"
                     :disabled="inSigningOrder(person.fileDatas, fileIndex) || file[0].isSigned"
                   >
                     <v-expansion-panel-title v-for="name in file" class="h-[80px]" :class="$styles.textTitle">
@@ -252,7 +249,7 @@
 import { DocumentItem, Value } from '../../composables/classes';
 import { HubConnectionBuilder } from '@microsoft/signalr';
 import { uuid } from 'vue-uuid';
-import type * as Types from '../../types';
+import type { Api, SignUrlType } from '../../types';
 import { CoreEnums } from '../../types/enum';
 
 export default defineComponent({
@@ -275,16 +272,15 @@ export default defineComponent({
     const isOfflinePay = ref<boolean>(false);
     const isQrDialog = ref<boolean>(false);
     const email = ref<string>('');
-    const signOptions = ref<Types.Api.Sign.New.Response>();
-    const signingFiles = ref<Types.Api.Sign.New.FileDatas[]>([]);
+    const signOptions = ref<Api.Sign.New.Response>();
+    const signingFiles = ref<Api.Sign.New.FileDatas[]>([]);
     const allDocumentsSigned = ref<boolean>(false);
-    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<Types.SignUrlType>();
+    const selectedClient = ref<SignUrlType>();
     const documentDict = computed(() => dataStore.dicFileTypeList.find(i => i.nameRu === 'Решение АС'));
     const affiliationDocument = computed(() => formStore.signedDocumentList.find((file: DocumentItem) => file.fileTypeName === 'Решение АС'));
     const affiliationData = ref<{
@@ -302,7 +298,7 @@ export default defineComponent({
     const scansFiles = ref<any[]>([]);
     const processCode = formStore.applicationData.processCode;
 
-    const openSmsPanel = (signInfo: Types.SignUrlType) => {
+    const openSmsPanel = (signInfo: SignUrlType) => {
       if (signInfo) {
         isSendNumberOpen.value = true;
         selectedClient.value = signInfo;
@@ -516,8 +512,6 @@ export default defineComponent({
         }
       }
       if (dataStore.isPension) {
-        const isOnlineEnpfAgreement = formStore.applicationData.pensionApp.isOnlineEnpfAgreement;
-        isOnlineEnpf.value = isOnlineEnpfAgreement === null ? true : isOnlineEnpfAgreement;
         await dataStore.getSignedDocList(formStore.applicationData.processInstanceId);
       }
     };
@@ -778,7 +772,7 @@ export default defineComponent({
       await dataStore.generateDocument();
     };
 
-    const convertQr = async (url: string | null, template?: Types.Api.GenerateShortLink.Templates) => {
+    const convertQr = async (url: string | null, template?: Api.GenerateShortLink.Templates) => {
       if (url) {
         const shortedUrl = await dataStore.generateShortLink(url, template);
         qrUrl.value = typeof shortedUrl === 'string' && !!shortedUrl ? shortedUrl : url;
@@ -858,9 +852,9 @@ export default defineComponent({
         ...formStore.signatories[index],
         signType: signType,
         fileDatas: file,
-      } as Types.Api.Sign.New.GeneralResponse;
+      };
       try {
-        signOptions.value = await dataStore.generalSign(data);
+        signOptions.value = await dataStore.api.file.generalSign(data);
         const message = [];
         for (let i of file) {
           message.push(i.fileName);
@@ -875,7 +869,7 @@ export default defineComponent({
               break;
             case CoreEnums.Sign.Types.scans:
               isScansDocuments.value = true;
-              signingFiles.value = data.fileDatas ?? [];
+              signingFiles.value = data.fileDatas;
               message.length = 0;
               break;
             case CoreEnums.Sign.Types.qr:
@@ -913,16 +907,6 @@ 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,
@@ -946,7 +930,6 @@ export default defineComponent({
       email,
       signOptions,
       signingFiles,
-      isOnlineEnpf,
       allDocumentsSigned,
       currentFilePanel,
 
@@ -966,7 +949,6 @@ export default defineComponent({
       handlePayAction,
       payEpay,
       convertQr,
-      setActualEnpf,
       sendInvoiceToEmail,
       hasConditionsAction,
 

package/components/Utilities/Chip.vue

@@ -1,5 +1,5 @@
 <template>
-  <label v-if="chip && chip.title" class="transition-all leading-6 px-3 py-1 rounded-pill border-[1px] border-white mr-4 whitespace-nowrap" :class="[textSize, color]"
+  <label v-if="chip && chip.title" class="transition-all leading-6 px-3 rounded-pill border-[1px] border-white mr-4 whitespace-nowrap" :class="[textSize, color]"
     >{{ chip.title }}<v-tooltip v-if="chip.description" activator="parent" location="bottom" :max-width="maxWidth">{{ chip.description }}</v-tooltip></label
   >
 </template>

package/composables/classes.ts

@@ -825,7 +825,6 @@ export class ProductConditions {
   fixInsSum: number | string | null;
   calcDate: string | null;
   contractEndDate: string | null;
-  currency: Value;
 
   constructor(
     insuranceCase = null,
@@ -874,7 +873,6 @@ export class ProductConditions {
     fixInsSum = null,
     calcDate = null,
     contractEndDate = null,
-    currency = new Value(),
   ) {
     this.requestedSumInsuredInDollar = null;
     this.insurancePremiumPerMonthInDollar = null;
@@ -927,7 +925,6 @@ export class ProductConditions {
     this.fixInsSum = fixInsSum;
     this.calcDate = calcDate;
     this.contractEndDate = contractEndDate;
-    this.currency = currency;
   }
 
   getSingleTripDays() {
@@ -1386,7 +1383,6 @@ export class FormStoreClass {
     beneficiaryForm: boolean;
     beneficialOwnerForm: boolean;
     insuredForm: boolean;
-    slaveInsuredForm: boolean;
     policyholdersRepresentativeForm: boolean;
     productConditionsForm: boolean;
     calculatorForm: boolean;
@@ -1421,7 +1417,6 @@ export class FormStoreClass {
     policyAppDto?: Types.PolicyAppDto;
     insisWorkDataApp?: Types.InsisWorkDataApp;
     addCoverDto?: Types.AddCover[];
-    slave?: any;
   };
   policyholderForm: Member;
   policyholderFormKey: StoreMembers.policyholderForm;
@@ -1434,7 +1429,6 @@ export class FormStoreClass {
   beneficialOwnerFormIndex: number;
   beneficialOwnerFormKey: StoreMembers.beneficialOwnerForm;
   insuredForm: Member[];
-  slaveInsuredForm: Member;
   insuredFormKey: StoreMembers.insuredForm;
   insuredFormIndex: number;
   productConditionsForm: ProductConditions;
@@ -1511,7 +1505,6 @@ export class FormStoreClass {
       beneficiaryForm: true,
       beneficialOwnerForm: true,
       insuredForm: true,
-      slaveInsuredForm: true,
       policyholdersRepresentativeForm: true,
       productConditionsForm: true,
       calculatorForm: true,
@@ -1540,7 +1533,6 @@ 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();

package/composables/constants.ts

@@ -36,7 +36,6 @@ export const constants = Object.freeze({
   returnStatementStatuses: [
     Statuses.ApproveForm,
     Statuses.ActuaryForm,
-    Statuses.JuristForm,
     Statuses.DsoUsnsForm,
     Statuses.AccountantForm,
     Statuses.UnderwriterForm,
@@ -163,20 +162,4 @@ export const constants = Object.freeze({
       ids: '',
     },
   ],
-  currencyList: [
-    {
-      code: 'KZT',
-      id: '1',
-      nameKz: 'Тенге',
-      nameRu: 'Тенге',
-      ids: '',
-    },
-    {
-      code: 'USD',
-      id: '2',
-      nameKz: 'С индексацией на курс USD',
-      nameRu: 'С индексацией на курс USD',
-      ids: '',
-    },
-  ],
 });

package/composables/index.ts

@@ -822,7 +822,6 @@ export class RoleController {
         this.isDrn() ||
         this.isUrp() ||
         this.isUsns() ||
-        this.isJurist() ||
         this.isAccountant() ||
         this.isBranchDirector() ||
         this.isUSNSACCINS() ||

package/locales/ru.json

@@ -395,7 +395,6 @@
     "insurancePremiumAmount": "Размер Страховой премии (страховой взнос) в тенге",
     "insurancePremiumAmountInDollar": "Размер Страховой премии (страховой взнос) в долларах",
     "dollarExchangeRateNBRK": "Курс доллара НБРК",
-    "exchangeRateSettlementDate": "Курс на дату расчета (USD/KZT)",
     "contractDate": "Дата контракта",
     "guaranteedTermAnnuityPayments": "Гарантированный срок аннуитетных выплат",
     "guaranteedPeriod": "Укажите период гарантированного срока",
@@ -585,9 +584,7 @@
     "signInProcessManager": "Договор будет подписан в течение минуты",
     "transferRegNumber": "Номер и серия договора",
     "contragentSelect": "Выбор контрагента",
-    "fileError": "Ошибка прикрепления файла",
-    "parentContractNextPay": "Возврат с учетом очередной выплаты",
-    "parentContractNextPayDate": "Очередная выплата по графику"
+    "fileError": "Ошибка прикрепления файла"
   },
   "agent": {
     "currency": "Валюта",

package/package.json

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