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

package/api/base.api.ts

@@ -509,6 +509,14 @@ export class ApiClass {
     });
   }
 
+  async signQR(data: SignDataType[]) {
+    return await this.axiosCall({
+      method: Methods.POST,
+      url: '/File/api/Sign/SignQr',
+      data: data,
+    });
+  }
+
   async generateDocument(data: SignDataType) {
     return await this.axiosCall<void>({
       method: Methods.POST,
@@ -661,6 +669,13 @@ export class ApiClass {
     });
   }
 
+  async checkAccountNumber(iik: string) {
+    return await this.axiosCall<boolean>({
+      method: Methods.GET,
+      url: `/Arm/api/Bpm/CheckAccountNumber?account=${iik}`,
+    });
+  }
+
   async searchAgentByName(name: string) {
     return await this.axiosCall<AgentData[]>({
       method: Methods.GET,

package/components/Form/FormData.vue

@@ -50,6 +50,14 @@
           </v-row>
         </div>
       </div>
+      <div
+        v-if="typeof block.headerBtn === 'object'"
+        :class="[$styles.blueBg, $styles.whiteText, $styles.textSimple, block.disabled ? $styles.disabled : 'cursor-pointer']"
+        class="flex lg:hidden transition-all rounded-b-lg h-[36px] items-center font-medium justify-center opacity-50 hover:opacity-90"
+        @click="!block.disabled && block.headerBtn.action()"
+      >
+        {{ block.headerBtn.text }}
+      </div>
     </div>
   </base-animation>
 </template>

package/components/Layout/Header.vue

@@ -2,6 +2,13 @@
   <header class="relative w-full min-h-[70px] text-center font-medium align-middle flex items-center border-b-[1px]" :class="[$styles.blueBgLight, $styles.textSimple]">
     <i v-if="hasBack" @click="$emit('onBack')" class="absolute left-5 mdi text-xl cursor-pointer transition-all" :class="[backIcon, backIconAnim]"></i>
     <span class="mx-10">{{ title }}</span>
+    <i
+      v-if="hasInfo && infoItems && infoItems.length && infoItems.filter(i => (typeof i.show === 'boolean' ? i.show : true)).length"
+      class="mdi text-xl cursor-pointer transition-all opacity-70"
+      :class="[infoIcon, $styles.blueText]"
+    >
+      <base-info-menu :options="infoItems" @clicked="$dataStore.copyToClipboard($event, false)" />
+    </i>
     <i
       v-if="hasMore"
       @click="$emit('onMore')"
@@ -13,6 +20,8 @@
 </template>
 
 <script lang="ts">
+import { MenuItem } from '../../composables/classes';
+
 export default defineComponent({
   props: {
     hasBack: {
@@ -35,6 +44,18 @@ export default defineComponent({
       type: String,
       default: 'mdi-dots-vertical',
     },
+    hasInfo: {
+      type: Boolean,
+      default: false,
+    },
+    infoIcon: {
+      type: String,
+      default: '',
+    },
+    infoItems: {
+      type: Array as PropType<Array<MenuItem>>,
+      default: [],
+    },
     title: {
       type: String,
       default: '',

package/components/Menu/InfoMenu.vue

@@ -0,0 +1,35 @@
+<template>
+  <v-menu
+    v-if="options && options.length && options.filter(i => (typeof i.show === 'boolean' ? i.show : true)).length"
+    open-on-click
+    activator="parent"
+    :close-on-content-click="false"
+    transition="scale-transition"
+  >
+    <base-form-text-section class="p-1 border-[1px] flex flex-col gap-3 elevation-3 w-[250px]">
+      <v-list lines="two" density="compact" class="!p-0">
+        <v-list-item v-for="(option, index) of options.filter(i => (typeof i.show === 'boolean' ? i.show : true))" :key="index" class="!px-3">
+          <v-list-item-title :class="[$styles.greenText]">{{ option.title }}</v-list-item-title>
+          <v-list-item-subtitle class="!opacity-50">{{ option.description }}</v-list-item-subtitle>
+          <template v-slot:append>
+            <v-btn color="#faae17" :icon="option.icon ? option.icon : 'mdi-content-copy'" variant="text" size="small" @click="$emit('clicked', option.title)"></v-btn>
+          </template>
+        </v-list-item>
+      </v-list>
+    </base-form-text-section>
+  </v-menu>
+</template>
+
+<script lang="ts">
+import { MenuItem } from '../../composables/classes';
+
+export default defineComponent({
+  emits: ['clicked'],
+  props: {
+    options: {
+      type: Array as PropType<Array<MenuItem>>,
+      default: [],
+    },
+  },
+});
+</script>

package/components/Menu/MenuNav.vue

@@ -6,6 +6,9 @@
       :has-back="hasBack"
       :back-icon="backIcon"
       :has-more="hasMore"
+      :has-info="hasInfo"
+      :info-icon="infoIcon"
+      :info-items="infoItems"
       :hide-more-on-lg="false"
       :more-icon="moreIcon"
       @onBack="$emit('onBack')"
@@ -68,6 +71,18 @@ export default defineComponent({
       type: Boolean,
       default: false,
     },
+    hasInfo: {
+      type: Boolean,
+      default: false,
+    },
+    infoIcon: {
+      type: String,
+      default: '',
+    },
+    infoItems: {
+      type: Array as PropType<Array<MenuItem>>,
+      default: [],
+    },
     backIcon: {
       type: String,
       default: 'mdi-arrow-left',

package/components/Pages/MemberForm.vue

@@ -1338,12 +1338,12 @@ export default {
       selectedIndex.value = index;
     };
 
-    const deleteMember = async (index: number) => {
-      await memberStore.deleteMember(route.params.taskId as string, whichForm.value, index);
+    const deleteMember = async () => {
+      await memberStore.deleteMember(route.params.taskId as string, whichForm.value, selectedIndex.value);
       const currentIndex = Number(whichIndex.value);
-      if (index <= currentIndex) {
+      if (selectedIndex.value <= currentIndex) {
         const newIndex = ref<number>(currentIndex - 1 > 0 ? currentIndex - 1 : 0);
-        await selectMember(newIndex.value, index === currentIndex ? true : undefined);
+        await selectMember(newIndex.value, selectedIndex.value === currentIndex ? true : undefined);
       }
       deletionDialog.value = false;
     };

package/components/Panel/PanelHandler.vue

@@ -51,10 +51,13 @@
     </div>
     <div v-if="isQr" :class="[$styles.flexColNav]">
       <base-form-section :title="''">
-        <img width="135" height="135" class="ma-auto" v-if="qrUrl" :src="qrUrl" alt="" />
-        <span :class="[$styles.textSimple]" class="mt-3 text-center">{{ $dataStore.t('sign.scanQrCode') }}</span>
-        <base-btn class="mt-10" :loading="loading" :text="$dataStore.t('sign.copyEgov')" @click="$dataStore.copyToClipboard(qrUrl)" />
-        <base-btn :text="$dataStore.t('buttons.cancel')" :btn="$styles.whiteBtn" @click="isQr = false" />
+        <base-loader v-if="isQrLoading" class="self-center m-5 opacity-70" />
+        <div v-if="qrUrl && !isQrLoading">
+          <img width="135" height="135" class="ma-auto" :src="qrUrl" alt="" />
+          <span :class="[$styles.textSimple]" class="mt-3 text-center d-block">{{ $dataStore.t('sign.scanQrCode') }}</span>
+        </div>
+        <base-btn class="mt-10" :loading="loading" :text="$dataStore.t('sign.copyEgov')" @click="$dataStore.copyToClipboard(urlCopy)" />
+        <base-btn :text="$dataStore.t('buttons.cancel')" :btn="$styles.whiteBtn" @click="closeQrPanel" />
       </base-form-section>
     </div>
   </section>
@@ -165,6 +168,7 @@
 
 <script lang="ts">
 import { DocumentItem, Value } from '../../composables/classes';
+import { HubConnectionBuilder } from '@microsoft/signalr';
 
 export default defineComponent({
   emits: ['task'],
@@ -180,6 +184,9 @@ export default defineComponent({
     const isElectronicContract = ref<boolean>(true);
     const email = ref<string>('');
     const qrUrl = ref<string>('');
+    const connection = ref<any>(null);
+    const isQrLoading = ref<boolean>(false);
+    const urlCopy = ref<string>('');
 
     const vForm = ref<any>();
     const isSendNumberOpen = ref<boolean>(false);
@@ -472,17 +479,68 @@ export default defineComponent({
         isScansDocuments.value = true;
       }
       if (type === 'qr') {
-        await generateQR();
-        isQr.value = true;
+        const result = (await dataStore.signDocument('qr')) as any;
+        if (result && result.data) {
+          const groupId = result.data[0].signatureDocumentGroupId;
+          await generateQR(groupId);
+          isQr.value = true;
+        }
       }
       loading.value = false;
     };
 
     // TODO Рефактор QR c npm
-    const generateQR = async () => {
+    const generateQR = async (groupId: string) => {
       const uuid = crypto.randomUUID();
-      const qrValue = `${getValuePerEnv('qrGenUrl')}/${uuid}`;
+      const qrValue = `${getValuePerEnv('qrGenUrl')}/${uuid}/${groupId}`;
       qrUrl.value = `https://api.qrserver.com/v1/create-qr-code/?size=135x135&data=${qrValue}`;
+
+      if (dataStore.isLifeBusiness) {
+        //для юр лиц
+        urlCopy.value = `https://egovbusiness.page.link/?link=${qrValue}?mgovSign&amp;apn=kz.mobile.mgov.business&amp;isi=1597880144&amp;ibi=kz.mobile.mgov.business`;
+      } else {
+        //для физ лиц
+        urlCopy.value = `https://mgovsign.page.link/?link=${qrValue}?mgovSign&amp;apn=kz.mobile.mgov&amp;isi=1476128386&amp;ibi=kz.egov.mobile`;
+      }
+
+      await startConnection(uuid);
+    };
+
+    const startConnection = async (uuid: string) => {
+      connection.value = new HubConnectionBuilder().withUrl(`https://test-sign.halyklife.kz/qrhub/${uuid}`).withAutomaticReconnect().build();
+      try {
+        await connection.value.start();
+        console.log('SignalR connection started.');
+        connection.value.on('QR', async (message: any) => {
+          if (message === 'Opened') {
+            isQrLoading.value = true;
+          }
+          if (message === 'Signed') {
+            isQrLoading.value = false;
+            dataStore.showToaster('success', dataStore.t('sign.successQrSigned'));
+            qrUrl.value = '';
+            isQr.value = false;
+            dataStore.panel.open = false;
+            dataStore.panelAction = null;
+            await stopConnection();
+          }
+        });
+      } catch (err) {
+        console.error('Error starting SignalR connection:', err);
+      }
+    };
+
+    const closeQrPanel = async () => {
+      isQr.value = false;
+      isQrLoading.value = false;
+      await stopConnection();
+    };
+
+    const stopConnection = async () => {
+      if (connection.value) {
+        await connection.value.stop();
+        console.log('SignalR connection stopped.');
+      }
     };
 
     const generateDocument = async () => {
@@ -506,6 +564,8 @@ export default defineComponent({
       isQr,
       qrUrl,
       scansFiles,
+      isQrLoading,
+      urlCopy,
 
       // Functions
       closePanel,
@@ -519,6 +579,7 @@ export default defineComponent({
       onFileChangeScans,
       sendFiles,
       onClearFile,
+      closeQrPanel,
 
       // Computed
       buttonText,

package/composables/classes.ts

@@ -930,6 +930,9 @@ export class DataStoreClass {
     loading: boolean;
     backIcon: string;
     moreIcon: string;
+    hasInfo: boolean;
+    infoIcon: string;
+    infoItems: MenuItem[];
     onBack: any;
     onLink: any;
     selectedItem: MenuItem;
@@ -982,6 +985,7 @@ export class DataStoreClass {
   economySectorCode: Value[];
   economicActivityType: Value[];
   gender: Value[];
+  authorityBasis: Value[];
   fontSize: number;
   isFontChangerOpen: boolean = false;
   isLoading: boolean = false;
@@ -1094,6 +1098,9 @@ export class DataStoreClass {
       loading: false,
       backIcon: 'mdi-arrow-left',
       moreIcon: 'mdi-dots-vertical',
+      hasInfo: false,
+      infoIcon: 'mdi-information-outline',
+      infoItems: [],
       onBack: {},
       onLink: {},
       selectedItem: new MenuItem(),
@@ -1155,6 +1162,7 @@ export class DataStoreClass {
     this.economySectorCode = [];
     this.economicActivityType = [];
     this.gender = [new Value(0, null), new Value(1, 'Мужской'), new Value(2, 'Женский')];
+    this.authorityBasis = [];
     this.fontSize = 14;
     this.isFontChangerOpen = false;
     this.isLoading = false;
@@ -1245,6 +1253,7 @@ export class FormStoreClass {
     isPolicyholderBeneficialOwner: boolean;
     clientId: string | null;
     insuredFile: any;
+    isPanelInside: boolean;
   };
   additionalInsuranceTerms: AddCover[];
   additionalInsuranceTermsWithout: AddCover[];
@@ -1302,6 +1311,7 @@ export class FormStoreClass {
   isPolicyholderIPDL: boolean = false;
   applicationData: {
     processInstanceId: number | string;
+    regNumber?: string;
     statusCode?: keyof typeof Statuses;
     clientApp?: any;
     insuredApp?: any;
@@ -1357,6 +1367,7 @@ export class FormStoreClass {
       accidentIncidents: [],
       clientId: null,
       insuredFile: null,
+      isPanelInside: false,
     };
     this.additionalInsuranceTerms = [];
     this.additionalInsuranceTermsWithout = [];

package/composables/constants.ts

@@ -65,6 +65,7 @@ export const constants = Object.freeze({
     rejectLetter: 23,
     application1: 33,
     insuredsList: 34,
+    questionnaireInsured: 35,
   },
   fixInsAmount: [
     {

package/composables/index.ts

@@ -295,9 +295,9 @@ export const getValuePerEnv = (which: WhichValuePerEnv) => {
     };
   } = {
     qrGenUrl: {
-      production: 'mobileSign:https://test-sign.halyklife.kz/EgovQr',
-      development: 'mobileSign:https://test-sign.halyklife.kz/EgovQr',
-      test: 'mobileSign:https://test-sign.halyklife.kz/EgovQr',
+      production: 'mobileSign:https://test-sign.halyklife.kz/EgovQrCms',
+      development: 'mobileSign:https://test-sign.halyklife.kz/EgovQrCms',
+      test: 'mobileSign:https://test-sign.halyklife.kz/EgovQrCms',
     },
   };
   return valuesPerEnv[which][useEnv().envMode as Envs];

package/layouts/default.vue

@@ -10,6 +10,9 @@
         :back-icon="$dataStore.menu.backIcon ?? 'mdi-arrow-left'"
         :more-icon="$dataStore.menu.moreIcon ?? 'mdi-dots-vertical'"
         :has-more="'hasMore' in $route.meta ? !!$route.meta.hasMore : true"
+        :has-info="$dataStore.menu.hasInfo"
+        :info-icon="$dataStore.menu.infoIcon"
+        :info-items="$dataStore.menu.infoItems"
         :class="{
           // @ts-ignore
           '!hidden': !$display().lgAndUp.value && !!$dataStore.menu.selectedItem.title,

package/locales/ru.json

@@ -269,7 +269,8 @@
     "showQR": "Показать QR-код",
     "timer": "Вы создали счет на оплату, через 00:59 сек счет станет не активным",
     "copyEgov": "Скопировать ссылку на подпись через Egov",
-    "scanQrCode": "Отсканируйте этот QR-код в приложении, чтобы осуществить подписание"
+    "scanQrCode": "Отсканируйте этот QR-код в приложении, чтобы осуществить подписание",
+    "successQrSigned": "Заявление и Договор подписаны Страхователем"
   },
   "questionnaireType": {
     "byHealth": "Анкета по здоровью Застрахованного",

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "hl-core",
-  "version": "0.0.9-beta.37",
+  "version": "0.0.9-beta.38",
   "license": "MIT",
   "private": false,
   "main": "nuxt.config.ts",
@@ -51,6 +51,7 @@
   "dependencies": {
     "@intlify/unplugin-vue-i18n": "0.12.2",
     "@mdi/font": "7.3.67",
+    "@microsoft/signalr": "^7.0.12",
     "@nuxtjs/tailwindcss": "6.8.0",
     "@pinia/nuxt": "0.4.11",
     "@vuepic/vue-datepicker": "7.2.0",

package/store/data.store.ts

@@ -87,7 +87,7 @@ export const useDataStore = defineStore('data', {
         console.log(err);
       }
     },
-    async copyToClipboard(text: unknown) {
+    async copyToClipboard(text: unknown, showError: boolean = true) {
       if (typeof text === 'string' || typeof text === 'number') {
         if (navigator.clipboard && window.isSecureContext) {
           if (this.isBridge) {
@@ -113,7 +113,7 @@ export const useDataStore = defineStore('data', {
           }
         }
       } else {
-        this.showToaster('error', this.t('toaster.noUrl'));
+        if (showError) this.showToaster('error', this.t('toaster.noUrl'));
       }
     },
     getFilesByIIN(iin: string) {
@@ -1361,7 +1361,7 @@ export const useDataStore = defineStore('data', {
       return await this.getFromApi('economySectorCode', 'getSectorCode');
     },
     async getEconomicActivityType() {
-      if (this.isDas) return await this.getFromApi('economicActivityType', 'getEconomicActivityType');
+      if (this.isLifeBusiness || this.isDas || this.isUU) return await this.getFromApi('economicActivityType', 'getEconomicActivityType');
     },
     async getFamilyStatuses() {
       return await this.getFromApi('familyStatuses', 'getFamilyStatuses');
@@ -1370,7 +1370,7 @@ export const useDataStore = defineStore('data', {
       return await this.getFromApi('relations', 'getRelationTypes');
     },
     async getBanks() {
-      if (this.isLifeBusiness || this.isDas) return await this.getFromApi('banks', 'getBanks');
+      if (this.isLifeBusiness || this.isDas || this.isUU) return await this.getFromApi('banks', 'getBanks');
     },
     async getProcessIndexRate() {
       if (this.processCode) {
@@ -1420,6 +1420,9 @@ export const useDataStore = defineStore('data', {
     getGenderList() {
       return this.gender;
     },
+    async getAuthorityBasis() {
+      if (this.isDas || this.isLifeBusiness || this.isUU) return await this.getFromApi('authorityBasis', 'getArmDicts', 'DicAuthorityBasis');
+    },
     async getAllFormsData() {
       await Promise.allSettled([
         this.getCountries(),
@@ -1455,6 +1458,7 @@ export const useDataStore = defineStore('data', {
         this.getProcessGfot(),
         this.getBanks(),
         this.getEconomicActivityType(),
+        this.getAuthorityBasis(),
       ]);
     },
     async getQuestionList(
@@ -2355,7 +2359,7 @@ export const useDataStore = defineStore('data', {
         this.formStore[whichForm][index].jobPlace = this.formStore.applicationData[whichMember][index].jobName;
       }
     },
-    async signDocument() {
+    async signDocument(type: string = 'electronic') {
       try {
         if (this.formStore.signUrls.length) {
           return this.formStore.signUrls;
@@ -2386,9 +2390,14 @@ export const useDataStore = defineStore('data', {
           }
         };
         const data = prepareSignDocuments();
-        const result = await this.api.signDocument(data);
-        this.formStore.signUrls = result;
-        return this.formStore.signUrls;
+        if (type === 'qr') {
+          const groupId = await this.api.signQR(data);
+          return groupId;
+        } else {
+          const result = await this.api.signDocument(data);
+          this.formStore.signUrls = result;
+          return this.formStore.signUrls;
+        }
       } catch (err) {
         ErrorHandler(err);
       }
@@ -2416,6 +2425,9 @@ export const useDataStore = defineStore('data', {
           case constants.documentTypes.application1:
             link.setAttribute('download', 'Приложение №1.xls');
             break;
+          case constants.documentTypes.questionnaireInsured:
+            link.setAttribute('download', 'Анкета Застрахованного.docx');
+            break;
         }
         document.body.appendChild(link);
         link.click();
@@ -3364,6 +3376,14 @@ export const useDataStore = defineStore('data', {
         return null;
       }
     },
+    async checkAccountNumber(iik: string) {
+      try {
+        const checked = await this.api.checkAccountNumber(iik);
+        return checked;
+      } catch (err) {
+        return ErrorHandler(err);
+      }
+    },
     async isCourseChanged(processInstanceId: string) {
       try {
         const response = await this.api.isCourseChanged(processInstanceId);