hl-core 0.0.10-beta.85 → 0.0.10-beta.86

package/api/base.api.ts

@@ -327,16 +327,11 @@ export class ApiClass {
       url: '/Arm/api/Dictionary/GetDictionaryItems/DicFileType',
     });
   }
-  async getDicCoverType() {
-    return await this.axiosCall<Value[]>({
-      method: Methods.GET,
-      url: '/Arm/api/Dictionary/GetDictionaryItems/DicCoverType',
-    });
-  }
-  async getProgramType(type: number) {
+
+  async getProgramType() {
     return await this.axiosCall<Value[]>({
       method: Methods.GET,
-      url: `/Arm/api/Dictionary/GetProcessProgramTypes/${type}`,
+      url: '/Arm/api/Dictionary/GetDictionaryItems/DicProgramType',
     });
   }
   async getSource() {
@@ -566,14 +561,6 @@ export class ApiClass {
     });
   }
 
-  async sendToEpayPension(processInstanceId: string | number) {
-    return await this.axiosCall<Types.EpayShortResponse>({
-      method: Methods.POST,
-      url: `/Arm/api/Invoice/sendToEpayPension/${processInstanceId}`,
-      data: {},
-    });
-  }
-
   async calculateWithoutApplication(data: Types.RecalculationDataType, product: string | undefined | null = this.productUrl, processCodeEnum?: number) {
     const params = processCodeEnum !== undefined ? { processCodeEnum } : undefined;
     return await this.axiosCall<Types.RecalculationResponseType>({

package/components/Dialog/Dialog.vue

@@ -111,11 +111,9 @@ export default defineComponent({
 <style>
 .base-dialog .v-card-title {
   font-size: 18px;
-  line-height: 120%;
 }
 .base-dialog .v-card-subtitle {
   font-size: 14px;
-  margin-top: 5px;
 }
 
 .no-hover:hover {

package/components/Dialog/DigitalDocumentsDialog.vue

@@ -1,37 +1,34 @@
 <template>
-  <div :class="[$styles.flexColNav]">
-    <base-form-section class="!mt-0">
-      <v-expansion-panels :flat="true">
-        <v-expansion-panel class="!rounded-[8px]">
-          <v-expansion-panel-title class="!text-[12px]">{{ $appContextStore.t('howToGetDigitalDocument') }}</v-expansion-panel-title>
-          <v-expansion-panel-text class="text-[12px] text-[#464f60]">
-            1. {{ $appContextStore.t('selectDocumentType') }} <br /><br />
-            2. {{ $appContextStore.t('viaEGovMobileAndOtherApps') }}: <br />
-            • {{ $appContextStore.t('openDigitalDocumentsSection') }} <br />
-            • {{ $appContextStore.t('selectDocumentAndGrantAccess') }} <br />
-            • {{ $appContextStore.t('enter6DigitCodeInConfirmationField') }} <br />
-            • {{ $appContextStore.t('clickGetDocument') }} <br /><br />
-            3. {{ $appContextStore.t('viaSms') }}: <br />
-            • {{ $appContextStore.t('clickSendCode') }} <br />
-            • {{ $appContextStore.t('enterReceivedSmsCode') }} <br />
-            • {{ $appContextStore.t('clickGetDocument') }} <br /><br />
-            <template v-if="currentLocale === 'kz'">
-              4. Қате жағдайда <a href="javascript:void(0);" class="text-blue-600" @click.prevent="emit('updateDigitalDocuments')">профильді жаңартуды</a> басыңыз<br />
-            </template>
-            <template v-else>
-              4. При ошибке нажмите <a href="javascript:void(0);" class="text-blue-600" @click.prevent="emit('updateDigitalDocuments')">обновить профиль</a><br />
-            </template>
-          </v-expansion-panel-text>
-        </v-expansion-panel>
-      </v-expansion-panels>
-    </base-form-section>
-    <div class="p-4 d-flex flex-col gap-0.5" :class="[$styles.blueBgLight, $styles.rounded]">
+  <div class="flex flex-col gap-[10px] w-full align-center">
+    <v-expansion-panels :flat="true">
+      <v-expansion-panel class="!rounded-[8px]">
+        <v-expansion-panel-title class="!text-[12px] border border-[#00000014]">{{ $appContextStore.t('howToGetDigitalDocument') }}</v-expansion-panel-title>
+        <v-expansion-panel-text class="text-[12px] text-[#464f60]">
+          1. {{ $appContextStore.t('selectDocumentType') }} <br /><br />
+          2. {{ $appContextStore.t('viaEGovMobileAndOtherApps') }}: <br />
+          • {{ $appContextStore.t('openDigitalDocumentsSection') }} <br />
+          • {{ $appContextStore.t('selectDocumentAndGrantAccess') }} <br />
+          • {{ $appContextStore.t('enter6DigitCodeInConfirmationField') }} <br />
+          • {{ $appContextStore.t('clickGetDocument') }} <br /><br />
+          3. {{ $appContextStore.t('viaSms') }}: <br />
+          • {{ $appContextStore.t('clickSendCode') }} <br />
+          • {{ $appContextStore.t('enterReceivedSmsCode') }} <br />
+          • {{ $appContextStore.t('clickGetDocument') }} <br /><br />
+          <template v-if="currentLocale === 'kz'">
+            4. Қате жағдайда <a href="javascript:void(0);" class="text-blue-600" @click.prevent="emit('updateDigitalDocuments')">профильді жаңартуды</a> басыңыз<br />
+          </template>
+          <template v-else>
+            4. При ошибке нажмите <a href="javascript:void(0);" class="text-blue-600" @click.prevent="emit('updateDigitalDocuments')">обновить профиль</a><br />
+          </template>
+        </v-expansion-panel-text>
+      </v-expansion-panel>
+    </v-expansion-panels>
+    <div class="d-flex flex-col gap-0.5 w-full">
       <base-rounded-select v-model="documentType" class="document-type-select" :items="documentItems" :label="$appContextStore.t('form.documentType')" hide-details />
       <div class="digital-document-otp flex flex-col">
         <base-otp-input v-model="otpCode" @keyup.enter.prevent="otpCode.length === otpLength && emitGetCode()" />
-        <div v-if="!loading">
-          <span v-if="otpSendDisabled" class="block text-center" :class="[$styles.mutedText]">
-            <template v-if="currentLocale === 'kz'">
+        <span v-if="!loading && otpSendDisabled" class="text-center" :class="[$styles.mutedText]">
+          <template v-if="currentLocale === 'kz'">
             <span class="underline underline-offset-2">eGov Mobile</span> немесе <span class="underline underline-offset-2">банк қосымшасынан</span> алынған цифрлық құжат кодын
             енгізіңіз.
           </template>
@@ -39,23 +36,11 @@
             Введите код цифрового документа из <span class="underline underline-offset-2">eGov Mobile</span> или
             <span class="underline underline-offset-2">банковского приложения</span>.
           </template>
-          </span>
-          <template v-else>
-            <span v-if="isActive" class="block text-center" :class="[$styles.mutedText]">
-              Отправить код повторно через
-              <br />
-              <span :class="[$styles.greenText]">{{ timeLeft }} сек</span>
-            </span>
-            <span v-if="canResend" class="block text-center" :class="[$styles.mutedText]">
-              Не получили код?
-              <span class="underline underline-offset-2 cursor-pointer" @click="emitGetCode">Отправить код заново</span>
-            </span>
-          </template>
-        </div>
+        </span>
       </div>
     </div>
-    <div class="w-full d-flex flex-col gap-4">
-      <base-btn v-if="!otpSendDisabled" :disabled="loading || isActive" :loading="loading" :btn="$styles.greenLightBtn" :text="$appContextStore.t('sendSmsCode')" @click="emitGetCode" />
+    <div class="w-full d-flex flex-col sm:flex-row gap-4">
+      <base-btn v-if="!otpSendDisabled" :disabled="loading" :loading="loading" :btn="$styles.whiteBorderBtn" :text="$appContextStore.t('sendSmsCode')" @click="emitGetCode" />
       <base-btn :disabled="loading" :loading="loading" :text="$appContextStore.t('getDocument')" @click="emitGetDocument" />
     </div>
   </div>
@@ -63,7 +48,6 @@
 
 <script setup lang="ts">
 import type { DigitalDocTypes } from '../../types';
-import { useOtpTimer } from '../../composables/index';
 import { useI18n } from 'vue-i18n';
 
 const props = defineProps({
@@ -84,9 +68,9 @@ const props = defineProps({
     default: false,
   },
 });
-const { timeLeft, canResend, isActive, startTimer } = useOtpTimer(60);
 const emit = defineEmits(['getCode', 'getDigitalDocument', 'updateDigitalDocuments']);
 
+const dataStore = useDataStore();
 const documentType = ref<DigitalDocTypes | null>(null);
 const otpCode = ref<string>('');
 const appContextStore = useAppContextStore();
@@ -96,12 +80,8 @@ const emitGetCode = () => {
     showToaster('error', appContextStore.t('selectDocumentType'), 3000);
     return;
   }
-  emit('getCode', {
-    type: documentType.value,
-    onSuccess: () => {
-      startTimer();
-    },
-  });
+
+  emit('getCode', documentType.value);
 };
 
 const emitGetDocument = () => {
@@ -116,8 +96,12 @@ const emitGetDocument = () => {
 
 <style scoped>
 :deep(.v-otp-input__content) {
-  max-width: 100%;
-  gap: 10px !important;
+  max-width: 360px;
+  gap: 12px !important;
+  @media (max-width: 768px) {
+    max-width: 100%;
+    gap: 8px !important;
+  }
 }
 .v-expansion-panel-title {
   height: 60px !important;
@@ -128,7 +112,7 @@ const emitGetDocument = () => {
 }
 .document-type-select:deep(.v-field) {
   height: 60px;
-  border: none !important;
+  border: 1px solid #dadada !important;
 }
 .document-type-select:deep(.v-label.v-field-label--floating) {
   top: 0;

package/components/Form/ManagerAttachment.vue

@@ -1,6 +1,6 @@
 <template>
   <div class="rounded-lg border-[1px]" :class="[$styles.whiteBg, disabled && $styles.disabled]">
-    <v-expansion-panels v-model="panel">
+    <v-expansion-panels>
       <v-expansion-panel class="rounded-lg" elevation="0">
         <v-expansion-panel-title :class="[$styles.textTitle, $styles.greenText]">
           {{ $appContextStore.t('form.attachManager') }}
@@ -43,14 +43,6 @@
               append-inner-icon="mdi mdi-chevron-right"
               @append="openPanel('ManagerPolicy', $appContextStore.t('form.manager'))"
             />
-            <a
-              href="javascript:void(0);"
-              v-if="formStore.ManagerPolicy.nameRu === null && !!currentManager"
-              class="py-1 px-4 text-[14px]"
-              :class="[$styles.blueText]"
-              @click="assignToMe"
-              >Назначить себя</a
-            >
             <base-panel-input
               v-if="isAgentShown"
               class="pl-1 pt-1"
@@ -119,6 +111,7 @@
             </div>
           </div>
         </div>
+
         <base-loader v-if="isPanelLoading" class="absolute mt-10" :size="50" />
       </div>
     </Teleport>
@@ -140,10 +133,6 @@ export default defineComponent({
       type: Boolean,
       default: false,
     },
-    isOpen: {
-      type: Boolean,
-      default: false,
-    },
   },
   setup(props) {
     type ManagerAttachmentFiels = 'SaleChanellPolicy' | 'RegionPolicy' | 'ManagerPolicy' | 'AgentData' | 'ExecutorGPH';
@@ -158,8 +147,6 @@ export default defineComponent({
     const panelValue = ref<FieldTypes>(new Value());
     const searchQuery = ref<string>('');
     const currentDictName = ref<ManagerAttachmentFiels>();
-    const currentManager = ref<Value | null>(null);
-    const panel = ref(props.isOpen ? 0 : null);
 
     const isReadonly = computed(
       () =>
@@ -205,11 +192,10 @@ export default defineComponent({
     const isAgentReadonly = computed(() => {
       if (!isReadonly.value) {
         if (dataStore.isTravelAgent()) return true;
-        if (appContextStore.isLifetrip && (formStore.SaleChanellPolicy.ids == 'ПП' || formStore.SaleChanellPolicy.ids == 'ХЛ')) return true;
+        if (appContextStore.isPension) return true;
         if (appContextStore.isGons) {
           return !dataStore.isServiceManager() && !dataStore.isChiefManagerNSZH() && !dataStore.isChiefSalesManager() && !dataStore.isSalesManager() && !dataStore.isManager();
         }
-        if (appContextStore.isPension) return true;
       }
       return isReadonly.value;
     });
@@ -253,11 +239,6 @@ export default defineComponent({
         if (currentDict === 'ManagerPolicy' && formStore.RegionPolicy.ids) {
           isPanelLoading.value = true;
           await dictionariesStore.filterManagerByRegion(formStore.RegionPolicy.ids as string);
-          if (!currentManager.value) {
-            currentManager.value =
-              (dictionariesStore.ManagerPolicy.find(m => m.code === dataStore.user.code) as Value) ||
-              (dictionariesStore.ManagerPolicy.find(m => m.nameRu?.includes(dataStore.user.fullName as string)) as Value);
-          }
         }
         if (currentDict === 'ExecutorGPH' && formStore.RegionPolicy.ids) {
           isPanelLoading.value = true;
@@ -280,23 +261,7 @@ export default defineComponent({
       }
     };
 
-    const pickPanelValue = async (answer: FieldTypes) => {
-      if (
-        currentDictName.value === 'AgentData' &&
-        appContextStore.isLifetrip &&
-        formStore.SaleChanellPolicy.ids == 'ТАТО' &&
-        'saleChannel' in answer &&
-        answer.saleChannel !== formStore.SaleChanellPolicy.ids
-      ) {
-        return showToaster('error', 'Выберите агента из того же канала продаж');
-      }
-
-      if (currentDictName.value === 'SaleChanellPolicy' && appContextStore.isLifetrip && 'ids' in answer && (answer.ids == 'ПП' || answer.ids == 'ХЛ')) {
-        await dataStore.searchAgentByName('Без агента');
-        const noAgent = dataStore.AgentData.filter(i => String(i.officeId) === String(formStore.RegionPolicy.ids))[0];
-        // @ts-ignore
-        formStore.AgentData = noAgent ? noAgent : new Value();
-      }
+    const pickPanelValue = (answer: FieldTypes) => {
       // @ts-ignore
       formStore[currentDictName.value] = answer;
       isPanelOpen.value = false;
@@ -304,19 +269,13 @@ export default defineComponent({
       searchQuery.value = '';
     };
 
-    const assignToMe = () => {
-      formStore.ManagerPolicy = currentManager.value as Value;
-      if (isPanelOpen.value === true) {
-        isPanelOpen.value = false;
-        dataStore.rightPanel.open = false;
-      }
-    };
-
     watchDebounced(
       searchQuery,
       async searchQuery => {
-        const query = searchQuery ?? '';
-        if (!!query && currentDictName.value === 'AgentData') {
+        if (searchQuery === null) {
+          searchQuery = '';
+        }
+        if (!!searchQuery && currentDictName.value === 'AgentData') {
           await searchAgent();
         }
       },
@@ -344,15 +303,6 @@ export default defineComponent({
       { immediate: true },
     );
 
-    onMounted(async () => {
-      if (dictionariesStore.ManagerPolicy.length === 0 && route.params.taskId !== '0') {
-        await dictionariesStore.filterManagerByRegion(formStore.RegionPolicy.ids as string);
-      }
-      currentManager.value =
-        (dictionariesStore.ManagerPolicy.find(m => m.code === dataStore.user.code) as Value) ||
-        (dictionariesStore.ManagerPolicy.find(m => m.nameRu?.includes(dataStore.user.fullName as string)) as Value);
-    });
-
     onBeforeUnmount(() => {
       if (!isReadonly.value) {
         const areValid = !!formStore.SaleChanellPolicy.nameRu && !!formStore.RegionPolicy.nameRu && !!formStore.ManagerPolicy.nameRu && !!formStore.AgentData.fullName;
@@ -364,14 +314,12 @@ export default defineComponent({
 
     return {
       // State
-      panel,
       formStore,
       isPanelOpen,
       isPanelLoading,
       panelValue,
       searchQuery,
       Value,
-      currentManager,
       currentDictName,
 
       // Computed
@@ -390,7 +338,6 @@ export default defineComponent({
 
       // Functions
       openPanel,
-      assignToMe,
       searchAgent,
       pickPanelValue,
     };

package/components/Input/FormInput.vue

@@ -7,7 +7,7 @@
     :rules="rules"
     :loading="loading"
     :placeholder="placeholder"
-    :label="undefined"
+    :label="label"
     :messages="messages"
     :type="type"
     :variant="variant"
@@ -33,17 +33,6 @@
     @focus="isFocused = true"
     @blur="isFocused = false"
   >
-    <template #label>
-      <div class="flex items-center gap-1 tooltip-label-wrapper">
-        <span>{{ label }}</span>
-        <v-tooltip v-if="!!tooltip" location="top">
-          <template #activator="{ props: tooltipProps }">
-            <v-icon v-bind="tooltipProps" :icon="tooltipIcon" class="cursor-pointer !text-[18px] label-tooltip-icon" color="#a0b3d8" />
-          </template>
-          <span>{{ tooltip }}</span>
-        </v-tooltip>
-      </div>
-    </template>
     <template v-if="appendInnerIcon && appendInnerIcon.length" v-slot:append-inner>
       <v-icon
         v-if="appendInnerIcon.includes('mdi-calendar-blank-outline') === false"
@@ -164,14 +153,6 @@ export default defineComponent({
     bgColor: {
       type: String,
     },
-    tooltip: {
-      type: String,
-      default: '',
-    },
-    tooltipIcon: {
-      type: String,
-      default: 'mdi-information-outline',
-    },
   },
   emits: ['update:modelValue', 'submitted', 'prepend', 'append', 'prepend-out', 'append-out', 'input', 'on-clear'],
 
@@ -241,10 +222,4 @@ export default defineComponent({
   color: #000000 !important;
   font-size: 16px !important;
 }
-.tooltip-label-wrapper {
-  pointer-events: auto !important;
-}
-.label-tooltip-icon {
-  pointer-events: auto !important;
-}
 </style>

package/components/Input/TextAreaField.vue

@@ -8,7 +8,6 @@
     :readonly="props.readonly"
     :color="color"
     :rows="rows"
-    :rules="rules"
     @update:modelValue="$emit('update:modelValue', $event)"
     auto-grow
   ></v-textarea>
@@ -46,10 +45,6 @@ export default defineComponent({
       type: Number,
       default: 5,
     },
-    rules: {
-      type: Array<any>,
-      default: [],
-    },
   },
   emits: ['update:modelValue'],
 

package/components/Layout/Header.vue

@@ -5,7 +5,7 @@
       <v-tooltip v-if="hasMore" :text="$dataStore.isSupport() ? `Нажатий: ${homeClickCount}` : ''" :disabled="!$dataStore.isSupport()">
         <template #activator="{ props: tooltipProps }">
           <v-btn v-bind="tooltipProps" variant="text" size="32" :ripple="false" class="absolute z-10" @click="onHomeClick" @mouseenter="onHomeHover">
-            <img src="~/public/favicon.svg" class="w-6 h-6" alt="home" />
+            <img src="~/assets/favicon.svg" class="w-6 h-6" alt="home" />
           </v-btn>
         </template>
       </v-tooltip>
@@ -74,6 +74,22 @@ export default defineComponent({
   setup(props) {
     const dataStore = useDataStore();
 
+    const homeClickCount = ref(0);
+    const COUNTER_URL = `${import.meta.env.VITE_COUNTER_URL ?? 'http://localhost:3001'}/counter`;
+
+    const onHomeClick = async () => {
+      // umTrackEvent('click-logo', {
+      //   user: dataStore.user.fullName,
+      //   branch: dataStore.user.branchCode,
+      // });
+    };
+
+    const onHomeHover = async () => {
+      if (!dataStore.isSupport()) return;
+      try {
+      } catch {}
+    };
+
     const onClickOutside = () => {
       dataStore.settings.open = false;
     };
@@ -106,7 +122,12 @@ export default defineComponent({
       backIconAnim,
       moreIconAnim,
 
+      // Counter
+      homeClickCount,
+
       // Functions
+      onHomeClick,
+      onHomeHover,
       onClickOutside,
     };
   },

package/components/Menu/MenuHover.vue

@@ -1,8 +1,8 @@
 <template>
   <v-menu v-if="items.length" :activator="activator" location="bottom center" :offset="top" transition="scale-transition">
     <base-form-text-section class="p-4 border-[1px] flex flex-col gap-3 elevation-3 w-[250px]">
-      <div v-for="item of items.filter(i => $dataStore.filters.show(i))" :key="item.id ?? ''">
-        <base-menu-nav-item :class="[$styles.textSimple]" :menu-item="item" @click="$emit(String(item.id!))" />
+      <div v-for="item of items.filter(i => $dataStore.filters.show(i))" :key="(item as any).id">
+        <base-menu-nav-item :class="[$styles.textSimple]" :menu-item="item" @click="$emit((item as any).id)" />
       </div>
     </base-form-text-section>
   </v-menu>

package/components/Menu/MenuNav.vue

@@ -19,7 +19,7 @@
       <slot name="start"></slot>
       <base-fade-transition>
         <div v-if="$dataStore.menuItems && $dataStore.menuItems.length" class="flex flex-col gap-[10px]">
-          <div v-for="(item, index) of $dataStore.menuItems.filter(i => $dataStore.filters.show(i as any))" :key="index">
+          <div v-for="(item, index) of $dataStore.menuItems.filter(i => $dataStore.filters.show(i))" :key="index">
             <base-menu-nav-item
               :menu-item="item"
               :selected="!!selected.title && !!item.title && selected.title === item.title"