hl-core 0.0.8-beta.3 → 0.0.8-beta.30

package/api/index.ts

@@ -13,7 +13,10 @@ export class ApiClass {
 
   private async axiosCall<T>(config: AxiosRequestConfig): Promise<T> {
     const dataStore = useDataStore();
-    if ((dataStore.isEFO && !this.baseURL) || (!dataStore.isEFO && (!this.baseURL || !this.productUrl))) {
+    if (dataStore.isBridge && !this.baseURL) {
+      console.error('No Axios baseURL');
+    }
+    if (!dataStore.isBridge && !dataStore.isCalculator && (!this.baseURL || !this.productUrl)) {
       console.error('No Axios baseURL or productURL');
     }
     const { data } = await useAxios(this.baseURL).request<T>(config);
@@ -137,31 +140,63 @@ export class ApiClass {
     });
   }
 
+  async getDicAnnuityTypeList(): Promise<Value[]> {
+    return this.axiosCall({
+      method: Methods.GET,
+      url: '/Arm/api/Dictionary/GetDictionaryItems/DicAnnuityType',
+    });
+  }
+
+  async getCurrencies(): Promise<{ eur: number; usd: number }> {
+    return this.axiosCall({
+      method: Methods.GET,
+      url: '/Ekk/api/Currency/GetExchange',
+    });
+  }
+
   async getContragent(queryData: any) {
     return this.axiosCall({
       method: Methods.GET,
-      url: `/Ekk/api/Contragentinsis/Contragent?Iin=${queryData.iin}&FirstName=${queryData.firstName}&LastName=${queryData.lastName}&MiddleName${queryData.middleName}`,
+      url: `/Ekk/api/Contragentinsis/Contragent?Iin=${queryData.iin}&FirstName=${queryData.firstName}&LastName=${queryData.lastName}&MiddleName=${queryData.middleName}`,
     });
   }
 
+  async getInsurancePay(): Promise<Value[]> {
+    return this.axiosCall({ method: Methods.GET, url: '/Arm/api/Dictionary/GetDictionaryItems/DicBeneficiaryInsurancePay' });
+  }
+
   async getQuestionList(surveyType: string, processInstanceId: string, insuredId: number | string): Promise<AnketaFirst> {
     return this.axiosCall({
       method: Methods.GET,
-      url: `/Baiterek/api/Application/Anketa/${surveyType}/${processInstanceId}/${insuredId}`,
+      url: `/${this.productUrl}/api/Application/Anketa/${surveyType}/${processInstanceId}/${insuredId}`,
+    });
+  }
+
+  async getClientQuestionList(surveyType: string, processInstanceId: string, insuredId: number | string): Promise<AnketaFirst> {
+    return this.axiosCall({
+      method: Methods.GET,
+      url: `/${this.productUrl}/api/Application/AnketaClient/${surveyType}/${processInstanceId}/${insuredId}`,
     });
   }
 
   async getQuestionListSecond(surveyType: string, processInstanceId: string, insuredId: number | string): Promise<AnketaSecond[]> {
     return this.axiosCall({
       method: Methods.GET,
-      url: `/Baiterek/api/Application/Anketa/${surveyType}/${processInstanceId}/${insuredId}`,
+      url: `/${this.productUrl}/api/Application/Anketa/${surveyType}/${processInstanceId}/${insuredId}`,
+    });
+  }
+
+  async getClientQuestionListSecond(surveyType: string, processInstanceId: string, insuredId: number | string): Promise<AnketaSecond[]> {
+    return this.axiosCall({
+      method: Methods.GET,
+      url: `/${this.productUrl}/api/Application/AnketaClient/${surveyType}/${processInstanceId}/${insuredId}`,
     });
   }
 
   async definedAnswers(filter: string) {
     return this.axiosCall({
       method: Methods.GET,
-      url: `/ekk/api/Contragentinsis/DictionaryItems/Questionary?filter=${filter}`,
+      url: `/Ekk/api/Contragentinsis/DictionaryItems/Questionary?filter=${filter}`,
     });
   }
 
@@ -201,6 +236,13 @@ export class ApiClass {
     });
   }
 
+  async getProcessAnnuityPaymentPeriod(processCode: string | number) {
+    return this.axiosCall({
+      method: Methods.GET,
+      url: `/Arm/api/Dictionary/ProcessAnnuityPaymentPeriod/${processCode}`,
+    });
+  }
+
   async getContragentById(id: any) {
     return this.axiosCall({
       method: Methods.GET,
@@ -227,7 +269,7 @@ export class ApiClass {
     });
   }
 
-  async getDicFileTypeList() {
+  async getDicFileTypeList(): Promise<Value[]> {
     return this.axiosCall({
       method: Methods.GET,
       url: '/Arm/api/Dictionary/GetDictionaryItems/DicFileType',
@@ -276,6 +318,14 @@ export class ApiClass {
     });
   }
 
+  async registerNumber(data: RegNumberDataType): Promise<string> {
+    return this.axiosCall({
+      method: Methods.POST,
+      url: `/${this.productUrl}/api/Application/FinCenterRegNumberSave`,
+      data: data,
+    });
+  }
+
   async sendSms(data: SmsDataType): Promise<void> {
     return this.axiosCall({
       method: Methods.POST,
@@ -319,7 +369,6 @@ export class ApiClass {
     return this.axiosCall({
       method: Methods.GET,
       url: '/Arm/api/Bpm/ProcessList',
-      timeout: 10000,
     });
   }
 
@@ -404,6 +453,13 @@ export class ApiClass {
     });
   }
 
+  async getProcessHistoryLog(historyId: string) {
+    return this.axiosCall({
+      method: Methods.GET,
+      url: `/Arm/api/Bpm/ProcessHistoryLog/${historyId}`,
+    });
+  }
+
   async createInvoice(processInstanceId: string, amount: number | string): Promise<string> {
     return this.axiosCall({
       method: Methods.POST,
@@ -434,18 +490,18 @@ export class ApiClass {
     });
   }
 
-  async calculateWithoutApplication(data: RecalculationDataType): Promise<RecalculationResponseType> {
+  async calculateWithoutApplication(data: RecalculationDataType, product = this.productUrl): Promise<RecalculationResponseType> {
     return this.axiosCall({
       method: Methods.POST,
-      url: `/${this.productUrl}/api/Application/Calculate`,
+      url: `/${product}/api/Application/Calculate`,
       data: data,
     });
   }
 
-  async getDefaultCalculationData(): Promise<RecalculationDataType> {
+  async getDefaultCalculationData(product = this.productUrl): Promise<RecalculationDataType> {
     return this.axiosCall({
       method: Methods.GET,
-      url: `/${this.productUrl}/api/Application/DefaultCalculatorValues`,
+      url: `/${product}/api/Application/DefaultCalculatorValues`,
     });
   }
 
@@ -498,7 +554,7 @@ export class ApiClass {
   }
 
   async getProcessTariff(code: number | string = 5) {
-    return this.axiosCall({ url: `/arm/api/Dictionary/ProcessTariff/${code}` });
+    return this.axiosCall({ url: `/Arm/api/Dictionary/ProcessTariff/${code}` });
   }
 
   async setConfirmation(data: any) {
@@ -516,33 +572,40 @@ export class ApiClass {
     });
   }
 
-  async sendUnderwritingCouncilTask(data: any) {
+  async sendUnderwritingCouncilTask(data: Partial<SendTask>): Promise<void> {
     return this.axiosCall({
       method: Methods.POST,
-      url: '/arm/api/UnderwritingCouncil/SendTask',
+      url: '/Arm/api/UnderwritingCouncil/SendTask',
       data: data,
     });
   }
 
+  async getDictionaryItems(dictName: string): Promise<Value[]> {
+    return this.axiosCall({
+      method: Methods.GET,
+      url: `/Ekk/api/ContragentInsis/DictionaryItems/${dictName}`,
+    });
+  }
+
   async filterManagerByRegion(dictName: string, filterName: string) {
     return this.axiosCall({
       method: Methods.GET,
-      url: `/ekk/api/ContragentInsis/DictionaryItems/${dictName}?filter=${filterName}`,
+      url: `/Ekk/api/ContragentInsis/DictionaryItems/${dictName}?filter=${filterName}`,
     });
   }
 
   async setINSISWorkData(data: any) {
     return this.axiosCall({
       method: Methods.POST,
-      url: `/arm/api/Bpm/SetInsisWorkData`,
+      url: `/Arm/api/Bpm/SetInsisWorkData`,
       data: data,
     });
   }
 
-  async searchAgentByName(name: string) {
+  async searchAgentByName(name: string): Promise<AgentData[]> {
     return this.axiosCall({
       method: Methods.GET,
-      url: `/ekk/api/ContragentInsis/AgentByName?fullName=${name}`,
+      url: `/Ekk/api/ContragentInsis/AgentByName?fullName=${name}`,
     });
   }
 }

package/api/interceptors.ts

@@ -4,7 +4,9 @@ export default function (axios: AxiosInstance) {
   axios.interceptors.request.use(
     request => {
       const dataStore = useDataStore();
-      request.headers.Authorization = `Bearer ${dataStore.accessToken}`;
+      if (dataStore.accessToken) {
+        request.headers.Authorization = `Bearer ${dataStore.accessToken}`;
+      }
       return request;
     },
     error => {
@@ -17,19 +19,21 @@ export default function (axios: AxiosInstance) {
     },
     error => {
       const dataStore = useDataStore();
-      const router = useRouter();
-      if (error.response.status === 401) {
-        dataStore.$reset();
-        localStorage.clear();
-        if (dataStore.isEFO) {
-          router.push({ name: 'Auth', query: { error: 401 } });
-        } else {
-          dataStore.sendToParent(constants.postActions.Error401, 401);
+      if (!dataStore.isCalculator) {
+        const router = useRouter();
+        if (error.response.status === 401) {
+          dataStore.$reset();
+          localStorage.clear();
+          if (dataStore.isBridge) {
+            router.push({ name: 'Auth', query: { error: 401 } });
+          } else {
+            dataStore.sendToParent(constants.postActions.Error401, 401);
+          }
         }
-      }
-      if (error.response.status >= 500) {
-        if (router.currentRoute.value.name !== 'Auth') {
-          dataStore.showToaster('error', error.stack, 5000);
+        if (error.response.status >= 500) {
+          if (router.currentRoute.value.name !== 'Auth') {
+            dataStore.showToaster('error', error.stack, 5000);
+          }
         }
       }
       return Promise.reject(error);

package/components/Dialog/Dialog.vue

@@ -1,15 +1,16 @@
 <template>
-  <v-dialog v-model="fieldModel">
+  <v-dialog :model-value="modelValue" @update:modelValue="$emit('update:modelValue', $event)" :persistent="true">
     <v-card class="self-center w-full sm:w-3/4 md:w-2/3 lg:w-2/4 xl:w-[600px] rounded-lg !p-2">
       <v-card-title>
         <slot v-if="!title" name="title"></slot>
         {{ title }}
+        <v-btn class="!absolute top-2 right-3" icon="mdi mdi-window-close" variant="plain" @click="$emit('update:modelValue', null)"></v-btn>
       </v-card-title>
       <v-card-subtitle>
         <slot v-if="!subtitle" name="subtitle"></slot>
         {{ subtitle }}
       </v-card-subtitle>
-      <v-card-actions class="gap-[16px]">
+      <v-card-actions class="gap-[16px] m-2">
         <base-btn v-if="actions === 'default'" class="!w-fit px-6" size="sm" :text="$t('confirm.yes')" :btn="$libStyles.blueBtn" @click="$emit('yes')"></base-btn>
         <base-btn v-if="actions === 'default'" class="!w-fit px-6" size="sm" :text="$t('confirm.no')" :btn="$libStyles.blueBtn" @click="$emit('no')" />
         <slot v-if="actions !== 'default'" name="actions"></slot>
@@ -27,7 +28,9 @@ export default defineComponent({
     },
     title: {
       type: String,
-      default: '',
+      default() {
+        return useDataStore().t('dialog.title');
+      },
     },
     subtitle: {
       type: String,
@@ -38,39 +41,6 @@ export default defineComponent({
       default: 'default',
     },
   },
-  emits: ['update:modelValue', 'submitted', 'yes', 'no'],
-  setup(props, { emit }) {
-    const fieldModel = ref(props.modelValue);
-
-    const updateValue = (event: boolean) => {
-      fieldModel.value = event;
-    };
-
-    const submitted = (event: any) => {
-      emit('submitted', event);
-    };
-
-    watch(
-      fieldModel,
-      () => {
-        emit('update:modelValue', fieldModel.value);
-      },
-      { immediate: true },
-    );
-
-    watch(
-      () => props.modelValue,
-      () => {
-        fieldModel.value = props.modelValue;
-      },
-      { immediate: true },
-    );
-
-    return {
-      fieldModel,
-      submitted,
-      updateValue,
-    };
-  },
+  emits: ['update:modelValue', 'yes', 'no'],
 });
 </script>

package/components/Form/FormBlock.vue

@@ -1,54 +1,78 @@
 <template>
-  <div class="pt-3 rounded-lg border-[1px]" :class="[$libStyles.whiteBg]">
+  <div class="pt-3 rounded-lg border-[1px]" :class="[$libStyles.whiteBg, disabled && $libStyles.disabled]">
     <div class="ml-5">
-      <p :class="[$libStyles.textTitle, $libStyles.greenText]">{{ title }}</p>
+      <div class="flex justify-between mr-5">
+        <p :class="[$libStyles.textTitle, $libStyles.greenText]">{{ title }}</p>
+        <div
+          v-if="isMultiple && more && !isShort && isActionsAvailable"
+          :class="[$libStyles.blueBg, $libStyles.whiteText, $libStyles.textSimple, disabled ? $libStyles.disabled : 'cursor-pointer']"
+          class="hidden lg:flex transition-all rounded-lg h-[36px] flex items-center font-medium justify-center opacity-50 hover:opacity-90 w-[120px]"
+          @click="!disabled && memberStore.addMember(whichForm)"
+        >
+          {{ $t('buttons.add') }}
+        </div>
+      </div>
       <p v-if="!!subtitle" :class="[$libStyles.greyText, $libStyles.textSimple]">{{ subtitle }}</p>
     </div>
-    <div class="ml-5 mt-6 grid grid-cols-4 md:gap-5 md:grid-cols-4 lg:grid-cols-7 auto-rows-fr items-center">
+    <div
+      class="ml-5 mt-6 grid auto-rows-fr items-center"
+      :class="[isShort ? 'grid-cols-2 md:gap-5 md:grid-cols-2 lg:grid-cols-2 mb-6' : 'grid-cols-4 md:gap-5 md:grid-cols-4 lg:grid-cols-7 ']"
+    >
       <span :class="[$libStyles.textSimple]" class="font-medium">{{ $t('form.fullName') }}</span>
       <span :class="[$libStyles.textSimple]" class="font-medium">{{ $t('form.iin') }}</span>
-      <span :class="[$libStyles.textSimple]" class="font-medium hidden lg:block"> {{ $t('form.gender') }}</span>
-      <span :class="[$libStyles.textSimple]" class="font-medium"> {{ $t('form.birthDate') }} </span>
-      <span :class="[$libStyles.textSimple]" class="font-medium hidden lg:block">{{ $t('form.Country') }} </span>
-      <span :class="[$libStyles.textSimple]" class="font-medium hidden lg:block"> {{ $t('code') }}</span>
+      <span v-if="!isShort" :class="[$libStyles.textSimple]" class="font-medium hidden lg:block"> {{ $t('form.gender') }}</span>
+      <span v-if="!isShort" :class="[$libStyles.textSimple]" class="font-medium"> {{ $t('form.birthDate') }} </span>
+      <span v-if="!isShort" :class="[$libStyles.textSimple]" class="font-medium hidden lg:block">{{ $t('form.Country') }} </span>
+      <span v-if="!isShort" :class="[$libStyles.textSimple]" class="font-medium hidden lg:block"> {{ $t('code') }}</span>
     </div>
-    <div v-if="isMultiple" class="ml-5 flex flex-col">
-      <div v-for="(each, index) of member" :key="index" class="grid grid-cols-4 md:gap-5 md:grid-cols-4 lg:grid-cols-7 auto-rows-fr items-center relative">
+    <div v-if="isMultiple" class="ml-5 flex flex-col" :class="[isShort ? 'mb-6' : '']">
+      <div
+        v-for="(each, index) of member"
+        :key="index"
+        class="grid auto-rows-fr items-center relative"
+        :class="[isShort ? 'grid-cols-2 md:gap-5 md:grid-cols-2 lg:grid-cols-2' : 'grid-cols-4 md:gap-5 md:grid-cols-4 lg:grid-cols-7']"
+      >
         <span :class="[getMemberInfo(each).fullName === null && $libStyles.emptyBlockCol]">{{ getMemberInfo(each).fullName }}</span>
         <span :class="[getMemberInfo(each).iin === null && $libStyles.emptyBlockCol]">{{ getMemberInfo(each).iin }}</span>
-        <span :class="[getMemberInfo(each).gender === null && $libStyles.emptyBlockCol]" class="hidden lg:block">{{ getMemberInfo(each).gender }} </span>
-        <span :class="[getMemberInfo(each).birthDate === null && $libStyles.emptyBlockCol]"> {{ getMemberInfo(each).birthDate }} </span>
-        <span :class="[getMemberInfo(each).birthPlace === null && $libStyles.emptyBlockCol]" class="hidden lg:block"> {{ getMemberInfo(each).birthPlace }} </span>
-        <span :class="[getMemberInfo(each).sectorCode === null && $libStyles.emptyBlockCol]" class="hidden lg:block"> {{ getMemberInfo(each).sectorCode }} </span>
+        <span v-if="!isShort" :class="[getMemberInfo(each).gender === null && $libStyles.emptyBlockCol]" class="hidden lg:block">{{ getMemberInfo(each).gender }} </span>
+        <span v-if="!isShort" :class="[getMemberInfo(each).birthDate === null && $libStyles.emptyBlockCol]"> {{ getMemberInfo(each).birthDate }} </span>
+        <span v-if="!isShort" :class="[getMemberInfo(each).birthPlace === null && $libStyles.emptyBlockCol]" class="hidden lg:block"> {{ getMemberInfo(each).birthPlace }} </span>
+        <span v-if="!isShort" :class="[getMemberInfo(each).sectorCode === null && $libStyles.emptyBlockCol]" class="hidden lg:block"> {{ getMemberInfo(each).sectorCode }} </span>
         <div
-          class="rounded-br-lg transition-all h-[70px] w-[60px] place-self-end cursor-pointer"
-          :class="[$libStyles.blueBgLight, $libStyles.blueBgLightHover]"
-          @click="$emit('onMore', { whichForm, index })"
+          v-if="!isShort"
+          class="rounded-br-lg transition-all h-[70px] w-[60px] place-self-end"
+          :class="[$libStyles.blueBgLight, $libStyles.blueBgLightHover, disabled ? $libStyles.disabled : 'cursor-pointer']"
+          @click="!disabled && $emit('onMore', { whichForm, index })"
         >
           <i class="mdi mdi-dots-vertical text-xl absolute top-[20px] right-[20px]"> </i>
         </div>
       </div>
     </div>
-    <div v-else class="ml-5 grid grid-cols-4 md:gap-5 md:grid-cols-4 lg:grid-cols-7 auto-rows-fr items-center relative">
+    <div
+      v-else
+      class="ml-5 grid auto-rows-fr items-center relative"
+      :class="[isShort ? 'grid-cols-2 md:gap-5 md:grid-cols-2 lg:grid-cols-2' : 'grid-cols-4 md:gap-5 md:grid-cols-4 lg:grid-cols-7']"
+    >
       <span :class="[getMemberInfo(member).fullName === null && $libStyles.emptyBlockCol]">{{ getMemberInfo(member).fullName }}</span>
       <span :class="[getMemberInfo(member).iin === null && $libStyles.emptyBlockCol]">{{ getMemberInfo(member).iin }}</span>
-      <span :class="[getMemberInfo(member).gender === null && $libStyles.emptyBlockCol]" class="hidden lg:block">{{ getMemberInfo(member).gender }} </span>
-      <span :class="[getMemberInfo(member).birthDate === null && $libStyles.emptyBlockCol]"> {{ getMemberInfo(member).birthDate }} </span>
-      <span :class="[getMemberInfo(member).birthPlace === null && $libStyles.emptyBlockCol]" class="hidden lg:block"> {{ getMemberInfo(member).birthPlace }} </span>
-      <span :class="[getMemberInfo(member).sectorCode === null && $libStyles.emptyBlockCol]" class="hidden lg:block"> {{ getMemberInfo(member).sectorCode }} </span>
+      <span v-if="!isShort" :class="[getMemberInfo(member).gender === null && $libStyles.emptyBlockCol]" class="hidden lg:block">{{ getMemberInfo(member).gender }} </span>
+      <span v-if="!isShort" :class="[getMemberInfo(member).birthDate === null && $libStyles.emptyBlockCol]"> {{ getMemberInfo(member).birthDate }} </span>
+      <span v-if="!isShort" :class="[getMemberInfo(member).birthPlace === null && $libStyles.emptyBlockCol]" class="hidden lg:block"> {{ getMemberInfo(member).birthPlace }} </span>
+      <span v-if="!isShort" :class="[getMemberInfo(member).sectorCode === null && $libStyles.emptyBlockCol]" class="hidden lg:block"> {{ getMemberInfo(member).sectorCode }} </span>
       <div
-        class="rounded-br-lg transition-all h-[70px] w-[60px] place-self-end cursor-pointer"
-        :class="[$libStyles.blueBgLight, $libStyles.blueBgLightHover]"
-        @click="$emit('onMore', { whichForm })"
+        v-if="!isShort"
+        class="rounded-br-lg transition-all h-[70px] w-[60px] place-self-end"
+        :class="[$libStyles.blueBgLight, $libStyles.blueBgLightHover, disabled ? $libStyles.disabled : 'cursor-pointer']"
+        @click="!disabled && $emit('onMore', { whichForm })"
       >
         <i class="mdi mdi-dots-vertical text-xl absolute top-[20px] right-[20px]"> </i>
       </div>
     </div>
     <div
-      v-if="isMultiple && more"
-      :class="[$libStyles.blueBg, $libStyles.whiteText, $libStyles.textSimple]"
-      class="cursor-pointer rounded-b-lg h-[36px] flex items-center font-medium justify-center"
-      @click="memberStore.addMember(whichForm)"
+      v-if="isMultiple && more && !isShort && isActionsAvailable"
+      :class="[$libStyles.blueBg, $libStyles.whiteText, $libStyles.textSimple, disabled ? $libStyles.disabled : 'cursor-pointer']"
+      class="block lg:hidden transition-all rounded-b-lg h-[36px] flex items-center font-medium justify-center opacity-50 hover:opacity-90"
+      @click="!disabled && memberStore.addMember(whichForm)"
     >
       {{ $t('buttons.add') }}
     </div>
@@ -76,6 +100,14 @@ export default defineComponent({
       type: Boolean,
       default: false,
     },
+    disabled: {
+      type: Boolean,
+      default: false,
+    },
+    type: {
+      type: String as PropType<'short' | 'default'>,
+      default: 'default',
+    },
   },
   emits: ['onMore', 'addMember'],
   setup(props) {
@@ -86,6 +118,9 @@ export default defineComponent({
     const isMultiple = ref(multipleMembers.includes(props.whichForm));
     const member: Member = formStore[props.whichForm as MemberKeys];
 
+    const isShort = computed(() => props.type === 'short');
+    const isActionsAvailable = computed(() => memberStore.isStatementEditible(props.whichForm));
+
     const getMemberInfo = (memberData: Member) => {
       return {
         fullName: computed(() => (memberData && memberData.getFullNameShorted() ? memberData.getFullNameShorted() : null)).value,
@@ -105,6 +140,8 @@ export default defineComponent({
       isMultiple,
 
       // Computed
+      isShort,
+      isActionsAvailable,
 
       // Functions
       getMemberInfo,

package/components/Form/FormSection.vue

@@ -1,6 +1,9 @@
 <template>
   <section :class="[$libStyles.blueBgLight, $libStyles.rounded]" class="mt-[14px] p-4 flex flex-col gap-[1px]">
-    <h2 :class="[$libStyles.textTitle]" class="font-medium text-center w-full mb-4">{{ title }}</h2>
+    <h2 :class="[$libStyles.textTitle]" class="font-medium text-center w-full mb-4">
+      {{ title }}
+      <slot name="icon"></slot>
+    </h2>
     <slot></slot>
   </section>
 </template>