hl-core 0.0.8-beta.4 → 0.0.8-beta.40

package/api/index.ts

@@ -1,5 +1,6 @@
-import { useAxios } from '@/composables/axios';
-import { Value, IDocument } from '@/composables/classes';
+import { MemberCodes } from '../types/enum';
+import { useAxios } from '../composables/axios';
+import { Value, IDocument } from '../composables/classes';
 import { AxiosRequestConfig } from 'axios';
 
 enum Methods {
@@ -12,10 +13,6 @@ export class ApiClass {
   private readonly productUrl: string = import.meta.env.VITE_PRODUCT_URL as string;
 
   private async axiosCall<T>(config: AxiosRequestConfig): Promise<T> {
-    const dataStore = useDataStore();
-    if ((dataStore.isEFO && !this.baseURL) || (!dataStore.isEFO && (!this.baseURL || !this.productUrl))) {
-      console.error('No Axios baseURL or productURL');
-    }
     const { data } = await useAxios(this.baseURL).request<T>(config);
     return data;
   }
@@ -137,31 +134,66 @@ export class ApiClass {
     });
   }
 
-  async getContragent(queryData: any) {
+  async getDicAnnuityTypeList(): Promise<Value[]> {
     return this.axiosCall({
       method: Methods.GET,
-      url: `/Ekk/api/Contragentinsis/Contragent?Iin=${queryData.iin}&FirstName=${queryData.firstName}&LastName=${queryData.lastName}&MiddleName${queryData.middleName}`,
+      url: '/Arm/api/Dictionary/GetDictionaryItems/DicAnnuityType',
     });
   }
 
-  async getQuestionList(surveyType: string, processInstanceId: string, insuredId: number | string): Promise<AnketaFirst> {
+  async getCurrencies(): Promise<{ eur: number; usd: number }> {
     return this.axiosCall({
       method: Methods.GET,
-      url: `/Baiterek/api/Application/Anketa/${surveyType}/${processInstanceId}/${insuredId}`,
+      url: '/Ekk/api/Currency/GetExchange',
     });
   }
 
-  async getQuestionListSecond(surveyType: string, processInstanceId: string, insuredId: number | string): Promise<AnketaSecond[]> {
+  async getContragent(queryData: GetContragentRequest): Promise<GetContragentResponse> {
     return this.axiosCall({
       method: Methods.GET,
-      url: `/Baiterek/api/Application/Anketa/${surveyType}/${processInstanceId}/${insuredId}`,
+      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 | number, insuredId: number | string): Promise<AnketaFirst> {
+    return this.axiosCall({
+      method: Methods.GET,
+      url: `/${this.productUrl}/api/Application/Anketa/${surveyType}/${processInstanceId}/${insuredId}`,
+    });
+  }
+
+  async getClientQuestionList(surveyType: string, processInstanceId: string | number, 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 | number, insuredId: number | string): Promise<AnketaSecond[]> {
+    return this.axiosCall({
+      method: Methods.GET,
+      url: `/${this.productUrl}/api/Application/Anketa/${surveyType}/${processInstanceId}/${insuredId}`,
+    });
+  }
+
+  async getClientQuestionListSecond(surveyType: string, processInstanceId: string | number, 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}`,
     });
   }
 
@@ -187,7 +219,7 @@ export class ApiClass {
     });
   }
 
-  async getAdditionalInsuranceTermsAnswers(processCode: string | number, questionId: string) {
+  async getAdditionalInsuranceTermsAnswers(processCode: string | number, questionId: string): Promise<AddCoverAnswer[]> {
     return this.axiosCall({
       method: Methods.GET,
       url: `/Arm/api/Dictionary/ProcessCoverTypeSum/${processCode}/${questionId}`,
@@ -201,14 +233,27 @@ export class ApiClass {
     });
   }
 
-  async getContragentById(id: any) {
+  async getProcessAnnuityPaymentPeriod(processCode: string | number) {
+    return this.axiosCall({
+      method: Methods.GET,
+      url: `/Arm/api/Dictionary/ProcessAnnuityPaymentPeriod/${processCode}`,
+    });
+  }
+
+  async getContragentById(id: number): Promise<GetContragentResponse> {
     return this.axiosCall({
       method: Methods.GET,
       url: `/Ekk/api/Contragentinsis/Contragent?PersonId=${id}`,
     });
   }
 
-  async saveContragent(data: any) {
+  async saveContragent(data: {
+    contragent: ContragentType;
+    questionaries: ContragentQuestionaries[];
+    contacts: ContragentContacts[];
+    documents: ContragentDocuments[];
+    addresses: ContragentAddress[];
+  }): Promise<number> {
     return this.axiosCall({
       method: Methods.POST,
       url: `/Ekk/api/Contragentinsis/SaveContragent`,
@@ -227,35 +272,35 @@ export class ApiClass {
     });
   }
 
-  async getDicFileTypeList() {
+  async getDicFileTypeList(): Promise<Value[]> {
     return this.axiosCall({
       method: Methods.GET,
       url: '/Arm/api/Dictionary/GetDictionaryItems/DicFileType',
     });
   }
 
-  async getContrAgentData(personId: string | number) {
+  async getContrAgentData(personId: string | number): Promise<ContragentQuestionaries[]> {
     return this.axiosCall({
       method: Methods.GET,
       url: `/Ekk/api/Contragentinsis/Questionaries?PersonId=${personId}`,
     });
   }
 
-  async getContrAgentContacts(personId: string | number) {
+  async getContrAgentContacts(personId: string | number): Promise<ContragentContacts[]> {
     return this.axiosCall({
       method: Methods.GET,
       url: `/Ekk/api/Contragentinsis/Contacts?PersonId=${personId}`,
     });
   }
 
-  async getContrAgentDocuments(personId: string | number) {
+  async getContrAgentDocuments(personId: string | number): Promise<ContragentDocuments[]> {
     return this.axiosCall({
       method: Methods.GET,
       url: `/Ekk/api/Contragentinsis/Documents?PersonId=${personId}`,
     });
   }
 
-  async getContrAgentAddress(personId: string | number) {
+  async getContrAgentAddress(personId: string | number): Promise<ContragentAddress[]> {
     return this.axiosCall({
       method: Methods.GET,
       url: `/Ekk/api/Contragentinsis/Address?PersonId=${personId}`,
@@ -276,6 +321,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 +372,6 @@ export class ApiClass {
     return this.axiosCall({
       method: Methods.GET,
       url: '/Arm/api/Bpm/ProcessList',
-      timeout: 10000,
     });
   }
 
@@ -333,20 +385,20 @@ export class ApiClass {
     });
   }
 
-  async getApplicationData(id: string) {
+  async getApplicationData(id: string): Promise<any> {
     return this.axiosCall({
       url: `/${this.productUrl}/api/Application/applicationData?Id=${id} `,
     });
   }
 
-  async getCalculation(id: string) {
+  async getCalculation(id: string): Promise<Number> {
     return this.axiosCall({
       method: Methods.POST,
       url: `/${this.productUrl}/api/Application/Calculator?processInstanceId=${id}`,
     });
   }
 
-  async setApplication(data: any) {
+  async setApplication(data: { policyAppDto: PolicyAppDto; addCoversDto: AddCover[] }): Promise<void> {
     return this.axiosCall({
       method: Methods.POST,
       url: `/${this.productUrl}/api/Application/SetApplicationData`,
@@ -382,7 +434,7 @@ export class ApiClass {
     });
   }
 
-  async setMember(whichMember: string, data: any) {
+  async setMember(whichMember: keyof typeof MemberCodes, data: any) {
     return this.axiosCall({
       method: Methods.POST,
       url: `/Arm/api/BpmMembers/Set${whichMember}`,
@@ -390,28 +442,35 @@ export class ApiClass {
     });
   }
 
-  async deleteMember(whichMember: string, id: number | string) {
+  async deleteMember(whichMember: keyof typeof MemberCodes, id: number | string) {
     return this.axiosCall({
       method: Methods.POST,
       url: `/Arm/api/BpmMembers/Delete${whichMember}/${id}`,
     });
   }
 
-  async getInvoiceData(processInstanceId: string): Promise<EpayResponse> {
+  async getInvoiceData(processInstanceId: string | number): Promise<EpayResponse> {
     return this.axiosCall({
       method: Methods.GET,
       url: `/Arm/api/Invoice/InvoiceData?processInstanceId=${processInstanceId}`,
     });
   }
 
-  async createInvoice(processInstanceId: string, amount: number | string): Promise<string> {
+  async getProcessHistoryLog(historyId: string) {
+    return this.axiosCall({
+      method: Methods.GET,
+      url: `/Arm/api/Bpm/ProcessHistoryLog/${historyId}`,
+    });
+  }
+
+  async createInvoice(processInstanceId: string | number, amount: number | string): Promise<string> {
     return this.axiosCall({
       method: Methods.POST,
       url: `/Arm/api/Invoice/CreateInvoice/${processInstanceId}/${amount}`,
     });
   }
 
-  async sendToEpay(processInstanceId: string): Promise<EpayShortResponse> {
+  async sendToEpay(processInstanceId: string | number): Promise<EpayShortResponse> {
     return this.axiosCall({
       method: Methods.POST,
       url: `/Arm/api/Invoice/SendToEpay/${processInstanceId}`,
@@ -426,7 +485,7 @@ export class ApiClass {
     });
   }
 
-  async getSignedDocList(data: { processInstanceId: string }): Promise<IDocument[]> {
+  async getSignedDocList(data: { processInstanceId: string | number }): Promise<IDocument[]> {
     return this.axiosCall({
       method: Methods.POST,
       url: '/File/api/Data/List',
@@ -434,18 +493,18 @@ export class ApiClass {
     });
   }
 
-  async calculateWithoutApplication(data: RecalculationDataType): Promise<RecalculationResponseType> {
+  async calculateWithoutApplication(data: RecalculationDataType, product: string | undefined | null = 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: string | undefined | null = this.productUrl): Promise<RecalculationDataType> {
     return this.axiosCall({
       method: Methods.GET,
-      url: `/${this.productUrl}/api/Application/DefaultCalculatorValues`,
+      url: `/${product}/api/Application/DefaultCalculatorValues`,
     });
   }
 
@@ -498,7 +557,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 +575,47 @@ 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 filterManagerByRegion(dictName: string, filterName: string) {
+  async getDictionaryItems(dictName: string): Promise<Value[]> {
+    return this.axiosCall({
+      method: Methods.GET,
+      url: `/Ekk/api/ContragentInsis/DictionaryItems/${dictName}`,
+    });
+  }
+
+  async filterManagerByRegion(dictName: string, filterName: string): Promise<Value[]> {
     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) {
+  async setINSISWorkData(data: InsisWorkDataApp) {
     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}`,
+    });
+  }
+
+  async isCourseChanged(processInstanceId: string): Promise<boolean> {
     return this.axiosCall({
       method: Methods.GET,
-      url: `/ekk/api/ContragentInsis/AgentByName?fullName=${name}`,
+      url: `/${this.productUrl}/api/Application/IsCourseChanged?processInstanceId=${processInstanceId}`,
     });
   }
 }

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/Button/Btn.vue

@@ -11,7 +11,7 @@
       $libStyles[`btnH${$capitalize(size)}` as keyof typeof $libStyles],
     ]"
   >
-    <base-loader v-if="loading" :size="24" color="#FFF" bg-color="" :width="2"></base-loader>
+    <base-loader v-if="loading" :size="24" color="#FFF" bg-color="" :width="2" />
     <span v-if="!loading">{{ text }}</span>
   </button>
 </template>

package/components/Button/ScrollButtons.vue

@@ -1,6 +1,6 @@
 <template>
   <div class="absolute bottom-[12%] right-1 flex flex-col gap-4">
-    <v-btn style="backdrop-filter: blur(5px)" color="#A0B3D8"  variant="outlined" icon="mdi mdi-arrow-up" @click="$emit('up')"></v-btn>
-    <v-btn style="backdrop-filter: blur(5px)" color="#A0B3D8"  variant="outlined" icon="mdi mdi-arrow-down" @click="$emit('down')"></v-btn>
+    <v-btn style="backdrop-filter: blur(5px)" color="#A0B3D8" variant="outlined" icon="mdi mdi-arrow-up" @click="$emit('up')" />
+    <v-btn style="backdrop-filter: blur(5px)" color="#A0B3D8" variant="outlined" icon="mdi mdi-arrow-down" @click="$emit('down')" />
   </div>
 </template>

package/components/Complex/Page.vue

@@ -9,7 +9,7 @@
       :title="title"
       @onBack="$emit('onBack')"
       @onMore="$emit('onMore')"
-    ></base-header>
+    />
     <slot></slot>
   </base-content>
 </template>

package/components/Dialog/Dialog.vue

@@ -1,17 +1,18 @@
 <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-card-title>
       <v-card-subtitle>
         <slot v-if="!subtitle" name="subtitle"></slot>
         {{ subtitle }}
       </v-card-subtitle>
-      <v-card-actions class="gap-[16px]">
-        <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')" />
+      <v-card-actions class="gap-[16px] m-2">
+        <base-btn v-if="actions === 'default'" class="!w-fit px-6" size="sm" :text="$dataStore.t('confirm.yes')" :btn="$libStyles.blueBtn" @click="$emit('yes')" />
+        <base-btn v-if="actions === 'default'" class="!w-fit px-6" size="sm" :text="$dataStore.t('confirm.no')" :btn="$libStyles.blueBtn" @click="$emit('no')" />
         <slot v-if="actions !== 'default'" name="actions"></slot>
       </v-card-actions>
     </v-card>
@@ -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/Dialog/FamilyDialog.vue

@@ -1,7 +1,10 @@
 <template>
   <v-list lines="two" v-if="formStore.birthInfos && formStore.birthInfos.length" class="w-full !py-0">
-    <v-list-item @click="$emit('reset')" :append-icon="selected && Object.keys(selected).length === 0 ? `mdi-radiobox-marked ${$libStyles.greenText}` : 'mdi-radiobox-blank text-[#636363]'">
-      <v-list-item-title :class="[$libStyles.greenText, $libStyles.textTitle]">{{ $t('form.notChosen') }}</v-list-item-title>
+    <v-list-item
+      @click="$emit('reset')"
+      :append-icon="selected && Object.keys(selected).length === 0 ? `mdi-radiobox-marked ${$libStyles.greenText}` : 'mdi-radiobox-blank text-[#636363]'"
+    >
+      <v-list-item-title :class="[$libStyles.greenText, $libStyles.textTitle]">{{ $dataStore.t('form.notChosen') }}</v-list-item-title>
     </v-list-item>
     <v-list-item
       v-for="familyMember of formStore.birthInfos"
@@ -13,12 +16,12 @@
         `${familyMember.childSurName} ${familyMember.childName} ${familyMember.childPatronymic ? familyMember.childPatronymic : ''}`
       }}</v-list-item-title>
       <v-list-item-subtitle :class="[$libStyles.textSimple]"
-        ><span>{{ `${$t('form.iin')}:` }}</span
+        ><span>{{ `${$dataStore.t('form.iin')}:` }}</span
         >{{ ` ${$reformatIin(familyMember.childIIN!)}` }}</v-list-item-subtitle
       >
     </v-list-item>
   </v-list>
-  <base-list-empty class="w-full" v-else></base-list-empty>
+  <base-list-empty class="w-full" v-else />
 </template>
 
 <script lang="ts">