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

package/api/base.api.ts

@@ -854,7 +854,7 @@ export class ApiClass {
       url: `/${this.productUrl}/api/Application/SaveInsured`,
       params: {
         processInstanceId,
-        insuredId,
+        insuredId: insuredId !== '0' ? insuredId : undefined,
       },
       data: data,
     });
@@ -866,7 +866,7 @@ export class ApiClass {
       url: `/${this.productUrl}/api/Application/SaveBenificiary`,
       params: {
         processInstanceId,
-        benificiaryId,
+        benificiaryId: benificiaryId !== '0' ? benificiaryId : undefined,
       },
       data: data,
     });
@@ -878,7 +878,7 @@ export class ApiClass {
       url: `/${this.productUrl}/api/Application/SaveBeneficialOwner`,
       params: {
         processInstanceId,
-        benificiaryId,
+        benificiaryId: benificiaryId !== '0' ? benificiaryId : undefined,
       },
       data: data,
     });

package/components/Form/ManagerAttachment.vue

@@ -1,54 +1,60 @@
 <template>
   <div class="rounded-lg border-[1px]" :class="[$styles.whiteBg, disabled && $styles.disabled]">
-    <div class="mt-3 ml-5">
-      <p :class="[$styles.textTitle, $styles.greenText]">{{ $dataStore.t('form.attachManager') }}</p>
-    </div>
-    <v-form ref="vForm" class="flex flex-col mt-1">
-      <base-panel-input
-        class="pl-1"
-        v-model="formStore.SaleChanellPolicy"
-        :value="formStore.SaleChanellPolicy?.nameRu"
-        :readonly="isSaleChanellReadonly"
-        :clearable="!isSaleChanellReadonly"
-        :label="$dataStore.t('form.salesChanell')"
-        :rules="$rules.objectRequired"
-        append-inner-icon="mdi mdi-chevron-right"
-        @append="openPanel('SaleChanellPolicy', $dataStore.t('form.salesChanell'))"
-      />
-      <base-panel-input
-        class="pl-1"
-        v-model="formStore.RegionPolicy"
-        :value="formStore.RegionPolicy?.nameRu"
-        :readonly="isRegionReadonly"
-        :clearable="!isRegionReadonly"
-        :label="$dataStore.t('form.Region')"
-        :rules="$rules.objectRequired"
-        append-inner-icon="mdi mdi-chevron-right"
-        @append="openPanel('RegionPolicy', $dataStore.t('form.Region'))"
-      />
-      <base-panel-input
-        class="pl-1"
-        v-model="formStore.ManagerPolicy"
-        :value="formStore.ManagerPolicy?.nameRu"
-        :readonly="isManagerReadonly"
-        :clearable="!isManagerReadonly"
-        :label="$dataStore.t('form.manager')"
-        :rules="$rules.objectRequired"
-        append-inner-icon="mdi mdi-chevron-right"
-        @append="openPanel('ManagerPolicy', $dataStore.t('form.manager'))"
-      />
-      <base-panel-input
-        class="pl-1"
-        v-model="formStore.AgentData"
-        :value="formStore.AgentData?.fullName"
-        :readonly="isAgentReadonly"
-        :clearable="!isAgentReadonly"
-        :label="$dataStore.t('form.agent')"
-        :rules="$rules.agentDataRequired"
-        append-inner-icon="mdi mdi-chevron-right"
-        @append="openPanel('AgentData', $dataStore.t('form.agent'))"
-      />
-    </v-form>
+    <v-expansion-panels>
+      <v-expansion-panel class="rounded-lg" elevation="0">
+        <v-expansion-panel-title :class="[$styles.textTitle, $styles.greenText]">
+          {{ $dataStore.t('form.attachManager') }}
+        </v-expansion-panel-title>
+        <v-expansion-panel-text class="border-t-[1px] no-padding">
+          <v-form ref="vForm" class="flex flex-col divide-y">
+            <base-panel-input
+              class="pl-1 pt-1"
+              v-model="formStore.SaleChanellPolicy"
+              :value="formStore.SaleChanellPolicy?.nameRu"
+              :readonly="isSaleChanellReadonly"
+              :clearable="!isSaleChanellReadonly"
+              :label="$dataStore.t('form.salesChanell')"
+              :rules="$rules.objectRequired"
+              append-inner-icon="mdi mdi-chevron-right"
+              @append="openPanel('SaleChanellPolicy', $dataStore.t('form.salesChanell'))"
+            />
+            <base-panel-input
+              class="pl-1 pt-1"
+              v-model="formStore.RegionPolicy"
+              :value="formStore.RegionPolicy?.nameRu"
+              :readonly="isRegionReadonly"
+              :clearable="!isRegionReadonly"
+              :label="$dataStore.t('form.Region')"
+              :rules="$rules.objectRequired"
+              append-inner-icon="mdi mdi-chevron-right"
+              @append="openPanel('RegionPolicy', $dataStore.t('form.Region'))"
+            />
+            <base-panel-input
+              class="pl-1 pt-1"
+              v-model="formStore.ManagerPolicy"
+              :value="formStore.ManagerPolicy?.nameRu"
+              :readonly="isManagerReadonly"
+              :clearable="!isManagerReadonly"
+              :label="$dataStore.t('form.manager')"
+              :rules="$rules.objectRequired"
+              append-inner-icon="mdi mdi-chevron-right"
+              @append="openPanel('ManagerPolicy', $dataStore.t('form.manager'))"
+            />
+            <base-panel-input
+              class="pl-1 pt-1"
+              v-model="formStore.AgentData"
+              :value="formStore.AgentData?.fullName"
+              :readonly="isAgentReadonly"
+              :clearable="!isAgentReadonly"
+              :label="$dataStore.t('form.agent')"
+              :rules="$rules.agentDataRequired"
+              append-inner-icon="mdi mdi-chevron-right"
+              @append="openPanel('AgentData', $dataStore.t('form.agent'))"
+            />
+          </v-form>
+        </v-expansion-panel-text>
+      </v-expansion-panel>
+    </v-expansion-panels>
     <Teleport v-if="isPanelOpen" to="#right-panel-actions">
       <div :class="[$styles.scrollPage]" class="flex flex-col items-center">
         <base-rounded-input
@@ -247,3 +253,9 @@ export default defineComponent({
   },
 });
 </script>
+
+<style scoped>
+.no-padding :deep(.v-expansion-panel-text__wrapper) {
+  padding: 0 !important;
+}
+</style>

package/components/Input/Datepicker.vue

@@ -7,10 +7,7 @@
     @update:modelValue="$emit('update:modelValue', $event)"
     locale="ru"
     model-type="dd.MM.yyyy"
-    position="left"
-    menu-class-name="!left-[30vw] md:!left-[70vw] lg:!left-[75vw]"
-    :teleport="teleport"
-    :offset="-50"
+    :teleport="true"
     :close-on-scroll="true"
     :enable-time-picker="false"
     cancel-text="Отменить"
@@ -36,10 +33,6 @@ export default defineComponent({
       type: Boolean,
       default: false,
     },
-    teleport: {
-      type: String,
-      default: '.v-form',
-    },
   },
 });
 </script>

package/components/Input/FormInput.vue

@@ -39,7 +39,6 @@
         v-if="appendInnerIcon.includes('mdi-calendar-blank-outline') && !props.readonly"
         :model-value="modelValue"
         @update:modelValue="$emit('update:modelValue', $event)"
-        :teleport="teleport"
       />
     </template>
     <template v-if="loading" #loader>
@@ -139,10 +138,9 @@ export default defineComponent({
     const submitted = (event: any) => {
       emit('submitted', event);
     };
-
     return {
-      submitted,
       props,
+      submitted,
     };
   },
 });

package/components/Pages/MemberForm.vue

@@ -1,17 +1,21 @@
 <template>
   <section class="flex flex-col gap-4 px-[10px]">
     <v-form v-if="member" ref="vForm" @submit="submitForm" class="max-h-[80svh] overflow-y-scroll">
-      <div v-if="memberSetting && memberSetting.has === true && memberSetting.isMultiple === true" class="flex items-center mt-[14px] min-h-[54px]">
-        <div :class="[$styles.blueBgLight]" class="flex flex-wrap items-center gap-2 p-1 rounded-t-[8px] h-full">
+      <div
+        v-if="memberSetting && memberSetting.has === true && whichForm !== 'policyholderForm' && whichForm !== 'policyholdersRepresentativeForm'"
+        class="flex items-center mt-[14px] min-h-[54px]"
+      >
+        <div :class="[$styles.blueBgLight]" class="flex flex-wrap items-center gap-2 p-2 rounded-t-[8px] h-full">
           <div
             v-for="(each, index) of formStore[whichForm]"
             :key="index"
-            class="pl-3 pr-1 py-1 rounded-[8px] cursor-pointer flex items-center"
-            :class="[Number(whichIndex) === index ? `${$styles.blueBg} ${$styles.whiteText}` : '', $styles.textSimple]"
+            class="rounded-[8px] cursor-pointer flex items-center"
+            :class="[Number(whichIndex) === index ? `${$styles.blueBg} ${$styles.whiteText}` : '', $styles.textSimple, isDisabled ? 'py-2 px-3' : 'py-1 pr-1 pl-3']"
             @click.self="index !== Number(whichIndex) ? selectMember(index) : null"
           >
             {{ `${$dataStore.menu.selectedItem.title} ${index + 1}` }}
             <v-btn
+              v-if="!isDisabled"
               icon="mdi-close !text-[20px]"
               size="x-small"
               :disabled="!memberStore.canMemberDeleted(whichForm, index) && !memberStore.canMemberCleared(whichForm, index)"
@@ -21,11 +25,23 @@
             />
           </div>
         </div>
-        <v-btn class="ml-2" icon="mdi-plus !text-[24px]" @click="memberStore.addMember(whichForm)" size="small" color="#A0B3D8" variant="tonal" />
+        <v-btn
+          v-if="!isDisabled && memberSetting.isMultiple === true"
+          class="ml-2"
+          icon="mdi-plus !text-[24px]"
+          @click="memberStore.addMember(whichForm)"
+          size="small"
+          color="#A0B3D8"
+          variant="tonal"
+        />
       </div>
       <base-form-section
         :title="$dataStore.t('form.personalData')"
-        :class="[memberSetting && memberSetting.has === true && memberSetting.isMultiple === true ? 'rounded-t-0 !mt-[-5px]' : 'mt-[14px]']"
+        :class="[
+          memberSetting && memberSetting.has === true && whichForm !== 'policyholderForm' && whichForm !== 'policyholdersRepresentativeForm'
+            ? 'rounded-t-0 !mt-[-5px]'
+            : 'mt-[14px]',
+        ]"
       >
         <base-panel-input
           v-if="$dataStore.isLifetrip"

package/components/Panel/PanelHandler.vue

@@ -331,7 +331,7 @@ export default defineComponent({
       //   loading.value = false;
       //   return;
       // }
-      if (dataStore.isAML || dataStore.isCheckContract || dataStore.isCheckContragent) {
+      if (dataStore.isAML || dataStore.isCheckContract || dataStore.isCheckContragent || dataStore.isDas) {
         emit('task', [dataStore.panelAction, route.params.taskId as string, actionCause.value]);
       } else {
         await dataStore.handleTask(dataStore.panelAction, route.params.taskId as string, actionCause.value);
@@ -420,7 +420,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) {
+      if (dataStore.isLifetrip || dataStore.isDas) {
         return false;
       }
       if (dataStore.isFinCenter()) {

package/composables/classes.ts

@@ -1494,7 +1494,7 @@ export class MemberV2 {
     date: string | null;
   };
   kbe: string | null;
-  typeOfEconomicActivity: string | null;
+  typeOfEconomicActivity: Value;
   legalAddress: Address;
   actualAddress: Address;
   activityTypes: {
@@ -1548,7 +1548,7 @@ export class MemberV2 {
       date: null,
     };
     this.kbe = null;
-    this.typeOfEconomicActivity = null;
+    this.typeOfEconomicActivity = new Value();
     this.legalAddress = new Address();
     this.actualAddress = new Address();
     this.activityTypes = [

package/composables/constants.ts

@@ -2,7 +2,8 @@ import { Actions, PostActions, Roles, Statuses } from '../types/enum';
 
 export const constants = Object.freeze({
   products: {
-    pensionannuity: 1,
+    // TODO remove this after PA will be ready
+    pensionannuity: import.meta.env.VITE_MODE === 'production' ? 0 : 1,
     baiterek: 3,
     halykmycar: 5,
     lifetrip: 7,
@@ -22,6 +23,7 @@ export const constants = Object.freeze({
   editableStatuses: [Statuses.StartForm, Statuses.EditBeneficiaryForm, Statuses.EditForm, Statuses.InputDataForm],
   documentsLinkVisibleStatuses: [
     Statuses.DocumentsSignedFrom,
+    Statuses.DocumentsSignedClientFrom,
     Statuses.UnderwriterForm,
     Statuses.AffilationResolutionForm,
     Statuses.Completed,
@@ -33,7 +35,7 @@ export const constants = Object.freeze({
     Statuses.ContractSignedFrom,
     Statuses.WaitingInsurancePremiumForm,
     Statuses.UnderwriterForm,
-    Statuses.InputDataForm,
+    Statuses.ApproveForm,
   ],
   cancelApplicationStatuses: [
     Statuses.StartForm,
@@ -42,7 +44,6 @@ export const constants = Object.freeze({
     Statuses.WaitingInsurancePremiumForm,
     Statuses.DocumentsSignedFrom,
     Statuses.DocumentsSignedClientFrom,
-    Statuses.InputDataForm,
     Statuses.ContractSignedFrom,
   ],
   gbdErrors: ['INVALID', 'TIMEOUT', 'ERROR', 'NOT_FOUND'],

package/composables/index.ts

@@ -184,12 +184,13 @@ export const ESBDMessage = (ESBDObject: any, initialPoint: any) => {
 
 export const ErrorHandler = (err: unknown, errorText?: string) => {
   console.log(err);
+  const dataStore = useDataStore();
   if (err instanceof AxiosError) {
     if ('response' in err && err.response && err.response.data) {
       if ('status' in err.response && err.response.status === 403) {
-        useDataStore().showToaster('error', useDataStore().t('toaster.noPermission'), 10000);
+        dataStore.showToaster('error', dataStore.t('toaster.noPermission'), 10000);
       } else if (err.response.data) {
-        useDataStore().showToaster('error', errorText ? errorText : err.response.data, 10000);
+        dataStore.showToaster('error', errorText ? errorText : err.response.data, 10000);
       }
     }
   }

package/locales/ru.json

@@ -27,7 +27,8 @@
     "noOtpResponse": "Отсутствует ответ при отправке OTP кода",
     "noOtpCode": "Заполните поля: ИИН, Номер телефона, Код подтверждения",
     "memberCopy": "Ошибка при копировании данных участников",
-    "memberSave": "Ошибка при сохранении данных участников"
+    "memberSave": "Ошибка при сохранении данных участников",
+    "notValidIik": "Некорректный ИИК"
   },
   "toaster": {
     "wrongFormatOf": "Некорректный формат \"{text}\"",
@@ -762,7 +763,7 @@
     "iik": "ИИК должен состоять из 20 символов",
     "dataInPast": "Указанная дата осталась в прошлом"
   },
-  "code": "КЭС",
+  "code": "КСЭ",
   "fontSize": "Размер шрифта",
   "policyholdersRepresentative": {
     "name": "ФИО",
@@ -816,7 +817,7 @@
     "job": "Профессия",
     "jobPosition": "Должность",
     "jobPlace": "Место работы",
-    "jobDesk": "Занимаемая должность и точная описание служебных обязанностей",
+    "jobDesk": "Занимаемая должность и точное описание служебных обязанностей",
     "placeRegistration": "Место жительство или регистрации",
     "placePermanent": "Постоянный адрес проживания",
     "sameAddress": "Совпадает ли адрес с адресом Страхователя?",

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "hl-core",
-  "version": "0.0.9-beta.38",
+  "version": "0.0.9-beta.40",
   "license": "MIT",
   "private": false,
   "main": "nuxt.config.ts",

package/store/data.store.ts

@@ -1252,14 +1252,14 @@ export const useDataStore = defineStore('data', {
           if (!!keys.deepKey) {
             if (!!keys.subDeepKey) {
               //@ts-ignore
-              return this.states.filter(i => i.code === member[keys.key][keys.deepKey][keys.subDeepKey].ids);
+              return this.states.filter(i => i.code === member[keys.key][keys.deepKey][keys.subDeepKey].ids || i.code === member[keys.key][keys.deepKey][keys.subDeepKey].id);
             } else {
               //@ts-ignore
-              return this.states.filter(i => i.code === member[keys.key][keys.deepKey].ids);
+              return this.states.filter(i => i.code === member[keys.key][keys.deepKey].ids || i.code === member[keys.key][keys.deepKey].id);
             }
           } else {
             //@ts-ignore
-            return this.states.filter(i => i.code === member[keys.key].ids);
+            return this.states.filter(i => i.code === member[keys.key].ids || i.code === member[keys.key].id);
           }
         }
       } else {
@@ -1275,14 +1275,14 @@ export const useDataStore = defineStore('data', {
           if (!!keys.deepKey) {
             if (!!keys.subDeepKey) {
               //@ts-ignore
-              return this.regions.filter(i => i.code === member[keys.key][keys.deepKey][keys.subDeepKey].ids);
+              return this.regions.filter(i => i.code === member[keys.key][keys.deepKey][keys.subDeepKey].ids || i.code === member[keys.key][keys.deepKey][keys.subDeepKey].id);
             } else {
               //@ts-ignore
-              return this.regions.filter(i => i.code === member[keys.key][keys.deepKey].ids);
+              return this.regions.filter(i => i.code === member[keys.key][keys.deepKey].ids || i.code === member[keys.key][keys.deepKey].id);
             }
           } else {
             //@ts-ignore
-            return this.regions.filter(i => i.code === member[keys.key].ids);
+            return this.regions.filter(i => i.code === member[keys.key].ids || i.code === member[keys.key].id);
           }
         }
       } else {
@@ -1301,14 +1301,14 @@ export const useDataStore = defineStore('data', {
           if (!!keys.deepKey) {
             if (!!keys.subDeepKey) {
               //@ts-ignore
-              return this.cities.filter(i => i.code === member[keys.key][keys.deepKey][keys.subDeepKey].ids);
+              return this.cities.filter(i => i.code === member[keys.key][keys.deepKey][keys.subDeepKey].ids || i.code === member[keys.key][keys.deepKey][keys.subDeepKey].id);
             } else {
               //@ts-ignore
-              return this.cities.filter(i => i.code === member[keys.key][keys.deepKey].ids);
+              return this.cities.filter(i => i.code === member[keys.key][keys.deepKey].ids || i.code === member[keys.key][keys.deepKey].id);
             }
           } else {
             //@ts-ignore
-            return this.cities.filter(i => i.code === member[keys.key].ids);
+            return this.cities.filter(i => i.code === member[keys.key].ids || i.code === member[keys.key].id);
           }
         }
       } else {

package/types/enum.ts

@@ -8,18 +8,43 @@ export enum StoreMembers {
 
 export enum Actions {
   accept = 'accept',
+  acceptCustom = 'acceptCustom',
+
   rejectclient = 'rejectclient',
+  rejectclientCustom = 'rejectclientCustom',
+
   reject = 'reject',
+  rejectCustom = 'rejectCustom',
+
   return = 'return',
+  returnCustom = 'returnCustom',
+
   claim = 'claim',
+  claimCustom = 'claimCustom',
+
   sign = 'sign',
+  signCustom = 'signCustom',
+
   signed = 'signed',
+  signedCustom = 'signedCustom',
+
   pay = 'pay',
+  payCustom = 'payCustom',
+
   register = 'register',
+  registerCustom = 'registerCustom',
+
   send = 'send',
+  sendCustom = 'sendCustom',
+
   affiliate = 'affiliate',
+  affiliateCustom = 'affiliateCustom',
+
   template = 'template',
+  templateCustom = 'templateCustom',
+
   chooseSign = 'chooseSign',
+  chooseSignCustom = 'chooseSignCustom',
 }
 
 export enum PostActions {