hl-core 0.0.9-beta.34 → 0.0.9-beta.35

package/api/base.api.ts

@@ -690,14 +690,14 @@ export class ApiClass {
   }
 
   async getTripInsuredAmount(data: getTripInsuredAmountRequest) {
-    return this.axiosCall<TripInsuranceAmount>({
+    return await this.axiosCall<TripInsuranceAmount>({
       method: Methods.POST,
       url: `/${this.productUrl}/api/Application/InsuranceAmountOptions`,
       data: data,
     });
   }
   async downloadTemplate(fileType: number) {
-    return this.axiosCall({
+    return await this.axiosCall({
       method: Methods.GET,
       url: `/${this.productUrl}/api/Application/DownloadTemplate?fileType=${fileType}`,
       responseType: 'arraybuffer',
@@ -705,7 +705,7 @@ export class ApiClass {
   }
 
   async sendTemplateToEmail(email: string) {
-    return this.axiosCall({
+    return await this.axiosCall({
       method: Methods.GET,
       url: `/${this.productUrl}/api/Application/SendTemplateToEmail?emailTo=${email}`,
     });
@@ -782,8 +782,8 @@ export class ApiClass {
     });
   }
 
-  async getClientData(clientId: string) {
-    return this.axiosCall({
+  async getClientData<T>(clientId: string) {
+    return await this.axiosCall<T>({
       method: Methods.GET,
       url: `/${this.productUrl}/api/Application/GetClientData`,
       params: {
@@ -792,18 +792,18 @@ export class ApiClass {
     });
   }
 
-  async getInsuredData(insuredId: string) {
-    return this.axiosCall({
+  async getInsuredData<T>(insuredId: string) {
+    return await this.axiosCall<T>({
       method: Methods.GET,
-      url: `/${this.productUrl}/api/Application/GetClientData`,
+      url: `/${this.productUrl}/api/Application/GetInsuredData`,
       params: {
         insuredId,
       },
     });
   }
 
-  async getBeneficiaryData(beneficiaryId: string) {
-    return this.axiosCall({
+  async getBeneficiaryData<T>(beneficiaryId: string) {
+    return await this.axiosCall<T>({
       method: Methods.GET,
       url: `/${this.productUrl}/api/Application/GetBeneficiaryData`,
       params: {
@@ -812,47 +812,51 @@ export class ApiClass {
     });
   }
 
-  async saveClientData(clientId: string) {
-    return this.axiosCall({
+  async saveClientData<T>(clientId: string, data: T) {
+    return await this.axiosCall({
       method: Methods.POST,
       url: `/${this.productUrl}/api/Application/SaveClient`,
       params: {
         clientId,
       },
+      data: data,
     });
   }
 
-  async saveInsuredData(processInstanceId: string, insuredId: string) {
-    return this.axiosCall({
+  async saveInsuredData<T>(processInstanceId: string, insuredId: string, data: T) {
+    return await this.axiosCall({
       method: Methods.POST,
       url: `/${this.productUrl}/api/Application/SaveInsured`,
       params: {
         processInstanceId,
         insuredId,
       },
+      data: data,
     });
   }
 
-  async saveBeneficiaryData(processInstanceId: string, benificiaryId: string) {
-    return this.axiosCall({
+  async saveBeneficiaryData<T>(processInstanceId: string, benificiaryId: string, data: T) {
+    return await this.axiosCall({
       method: Methods.POST,
       url: `/${this.productUrl}/api/Application/SaveBenificiary`,
       params: {
         processInstanceId,
         benificiaryId,
       },
+      data: data,
     });
   }
 
-  async setApplicationData() {
-    return this.axiosCall({
+  async setApplicationData(data: SetApplicationRequest) {
+    return await this.axiosCall({
       method: Methods.POST,
       url: `/${this.productUrl}/api/Application/SetApplicationData`,
+      data: data,
     });
   }
 
   async calculate(processInstanceId: string) {
-    return this.axiosCall({
+    return await this.axiosCall({
       method: Methods.POST,
       url: `/${this.productUrl}/api/Application/Calculator`,
       params: {

package/components/Form/DynamicForm.vue

@@ -12,7 +12,7 @@
             v-for="(item, index) of panelList.filter(i => i.nameRu && (i.nameRu as string).match(new RegExp(searchQuery, 'i')))"
             :key="index"
             :text="(item.nameRu as string)"
-            :selected="item.nameRu === panelValue.nameRu"
+            :selected="item.nameRu === panelValue"
             @click="pickPanelValue(item)"
           />
         </div>
@@ -35,7 +35,7 @@ export default defineComponent({
   setup() {
     const dataStore = useDataStore();
     const isPanelOpen = ref<boolean>(false);
-    const panelValue = ref<Value>(new Value());
+    const panelValue = ref<any>(new Value());
     const panelList = ref<Value[]>([]);
     const isPanelLoading = ref<boolean>(false);
     const searchQuery = ref<string>('');
@@ -80,6 +80,7 @@ export default defineComponent({
         isPanelOpen.value = true;
         dataStore.rightPanel.open = true;
         dataStore.rightPanel.title = dataStore.t(listOfPanelTitles[field.fetchFrom]);
+        panelValue.value = field.modelValue;
         panelList.value = (await dataStore[field.fetchFrom]()) as Value[];
         isPanelLoading.value = false;
       }

package/components/Pages/Anketa.vue

@@ -375,6 +375,10 @@ export default defineComponent({
       await onInit();
     });
 
+    onUnmounted(() => {
+      dataStore.abortRequests();
+    });
+
     watch(
       () => dataStore.rightPanel.open,
       () => {

package/components/Pages/ProductConditions.vue

@@ -457,10 +457,10 @@
             :value="term.coverSumName"
             :readonly="isTermsDisabled"
             :clearable="false"
-            :label="term.coverTypeName"
+            :label="coverTypeName(term)"
             append-inner-icon="mdi mdi-chevron-right"
             :suffix="!!term.amount ? `${formatTermValue(term.amount)} ${currencySymbolsAddTerm}` : ''"
-            @append="openTermPanel(term.coverTypeName, $dataStore.getAdditionalInsuranceTermsAnswers, term.coverTypeId, index)"
+            @append="openTermPanel(coverTypeName(term), $dataStore.getAdditionalInsuranceTermsAnswers, term.coverTypeId, index)"
           />
         </div>
       </base-form-section>
@@ -1198,6 +1198,14 @@ export default defineComponent({
       }
       return true;
     };
+
+    const coverTypeName = (term: AddCover) => {
+      if (whichProduct.value === 'lifebusiness') {
+        return String(term.coverTypeNameRu);
+      }
+      return term.coverTypeName;
+    };
+
     const submitForm = async () => {
       vForm.value.validate().then(async (v: { valid: Boolean; errors: any }) => {
         if (v.valid) {
@@ -1557,6 +1565,7 @@ export default defineComponent({
       pickfixInsValue,
       openFixInsPanel,
       pickCoverPeriodValue,
+      coverTypeName,
     };
   },
 });

package/composables/axios.ts

@@ -4,6 +4,7 @@ import interceptors from '../api/interceptors';
 export const useAxiosInstance = (baseURL: string) => {
   const axiosInstance = axios.create({
     baseURL: baseURL,
+    signal: useDataStore().rController.signal,
   });
   interceptors(axiosInstance);
 

package/composables/constants.ts

@@ -18,7 +18,7 @@ export const constants = Object.freeze({
     checkcontract: 2,
   },
   extractedProducts: ['dso', 'uu'],
-  editableStatuses: [Statuses.StartForm, Statuses.EditBeneficiaryForm, Statuses.EditForm],
+  editableStatuses: [Statuses.StartForm, Statuses.EditBeneficiaryForm, Statuses.EditForm, Statuses.InputDataForm],
   documentsLinkVisibleStatuses: [
     Statuses.DocumentsSignedFrom,
     Statuses.UnderwriterForm,
@@ -26,13 +26,22 @@ export const constants = Object.freeze({
     Statuses.Completed,
     Statuses.InsurancePremiumOnlinePaid,
   ],
-  returnStatementStatuses: [Statuses.DocumentsSignedFrom, Statuses.ContractSignedFrom, Statuses.WaitingInsurancePremiumForm, Statuses.UnderwriterForm],
+  returnStatementStatuses: [
+    Statuses.DocumentsSignedFrom,
+    Statuses.DocumentsSignedClientFrom,
+    Statuses.ContractSignedFrom,
+    Statuses.WaitingInsurancePremiumForm,
+    Statuses.UnderwriterForm,
+    Statuses.InputDataForm,
+  ],
   cancelApplicationStatuses: [
     Statuses.StartForm,
     Statuses.EditForm,
     Statuses.EditBeneficiaryForm,
     Statuses.WaitingInsurancePremiumForm,
     Statuses.DocumentsSignedFrom,
+    Statuses.DocumentsSignedClientFrom,
+    Statuses.InputDataForm,
     Statuses.ContractSignedFrom,
   ],
   gbdErrors: ['INVALID', 'TIMEOUT', 'ERROR', 'NOT_FOUND'],

package/locales/ru.json

@@ -478,7 +478,12 @@
     "contracts": "Контракты",
     "contragents": "Контрагенты",
     "stateRegistrationDate": "Дата государственной регистрации",
-    "numberRegistration": "Номер государственной регистрации"
+    "numberRegistration": "Номер государственной регистрации",
+    "id": "ID",
+    "sum": "Минимальная сумма",
+    "changes": "Кол-во изменений",
+    "termDays": "Срок договора в днях",
+    "termYears": "Срок договора в годах"
   },
   "agent": {
     "currency": "Валюта",
@@ -750,7 +755,8 @@
     "noResidentOffline": "Обратитесь в филиал для оффлайн оформления нерезидента",
     "calculationPreliminary": "Расчет предварительный. Требуется заполнить все необходимые данные",
     "planDate": "Дата должна превышать сегодняшнюю дату",
-    "iik": "ИИК должен состоять из 20 символов"
+    "iik": "ИИК должен состоять из 20 символов",
+    "dataInPast": "Указанная дата осталась в прошлом"
   },
   "code": "КЭС",
   "fontSize": "Размер шрифта",
@@ -888,7 +894,8 @@
   "clients": {
     "listInsured": "Список Застрахованных",
     "templateInsured": "Шаблон для заполнения данных Застрахованных",
-    "sendListToFill": "Отправить список Страхователю для заполнения",
+    "sendListToFill": "Скачать или Отправить список Страхователю для заполнения",
+    "sendDeclarationToFill": "Скачать или Отправить декларацию Страхователю для заполнения",
     "completedListInsured": "Заполненный список Застрахованных",
     "selectInsSum": "Выберите страховую сумму",
     "isPolicyholderBeneficialOwner": "Является ли Страхователь Бенефициарным собственником",
@@ -902,6 +909,7 @@
     "documentsBeneficialOwner": "Документы Бенефициарного собственника",
     "coveragePeriod": "Период покрытия",
     "attachScansSignDocs": "Вложить сканы подписанных документов",
+    "declarationHealthInsured": "Декларация о здоровье Застрахованных",
     "form": {
       "calculation": "Расчеты",
       "paymentAmount": "Размер выплаты",

package/package.json

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

package/store/data.store.ts

@@ -22,6 +22,7 @@ export const useDataStore = defineStore('data', {
     formStore: useFormStore(),
     // contragent: useContragentStore(),
     api: new ApiClass(),
+    rController: new AbortController(),
     yearEnding: (year: number) => yearEnding(year, constants.yearTitles, constants.yearCases),
     currentDate: () => new Date(Date.now() - new Date().getTimezoneOffset() * 60 * 1000).toISOString().slice(0, -1),
     showToaster: (type: 'success' | 'error' | 'warning' | 'info', msg: string, timeout?: number) =>
@@ -77,6 +78,14 @@ export const useDataStore = defineStore('data', {
         childFrame.contentWindow.postMessage({ action: action, value: value }, '*');
       }
     },
+    abortRequests() {
+      try {
+        this.rController.abort();
+        this.rController = new AbortController();
+      } catch (err) {
+        console.log(err);
+      }
+    },
     async copyToClipboard(text: unknown) {
       if (typeof text === 'string' || typeof text === 'number') {
         if (navigator.clipboard && window.isSecureContext) {
@@ -206,6 +215,9 @@ export const useDataStore = defineStore('data', {
     isSupervisor() {
       return this.isRole(constants.roles.Supervisor);
     },
+    isHeadManager() {
+      return this.isRole(constants.roles.HeadManager);
+    },
     isProcessEditable(statusCode?: keyof typeof Statuses) {
       const getEditibleStatuses = () => {
         const defaultStatuses = constants.editableStatuses;
@@ -1810,22 +1822,7 @@ export const useDataStore = defineStore('data', {
     async calculatePrice(taskId?: string) {
       this.isLoading = true;
       try {
-        const priceForm: {
-          processInstanceId?: string | number | null;
-          id?: string | null;
-          addCoversDto?: AddCover[];
-          insuredAmountId?: string | number | null;
-          age?: string | number | null;
-          lifeTripCountries?: string[] | null;
-          tripPurposeId?: string | number | null;
-          workTypeId?: string | number | null;
-          sportsTypeId?: string | number | null;
-          singleTripDays?: number;
-          multipleTripMaxDays?: number;
-          tripInsurancePeriod?: number;
-          startDate?: string | null;
-          endDate?: string | null;
-        } = {};
+        const priceForm: SetApplicationRequest = {};
         priceForm.insuredAmountId = this.formStore.productConditionsForm.calculatorForm.amount.id;
         priceForm.age = this.formStore.productConditionsForm.calculatorForm.age;
         priceForm.lifeTripCountries = this.formStore.productConditionsForm.calculatorForm.countries!.map(item => item.id as string);
@@ -1906,7 +1903,6 @@ export const useDataStore = defineStore('data', {
         this.formStore.ManagerPolicy.ids = applicationData.insisWorkDataApp.managerPolicy;
         this.formStore.SaleChanellPolicy.nameRu = applicationData.insisWorkDataApp.saleChanellPolicyName;
         this.formStore.SaleChanellPolicy.ids = applicationData.insisWorkDataApp.saleChanellPolicy;
-
         this.formStore.AgentData.fullName = applicationData.insisWorkDataApp.agentName;
         this.formStore.AgentData.agentId = applicationData.insisWorkDataApp.agentId;
 

package/store/rules.ts

@@ -212,6 +212,17 @@ export const rules = {
   ],
   policyholderAgeLimit: [(v: any) => v >= 18 || t('rules.policyholderAgeLimit')],
   beneficiaryAgeLimit: [(v: any) => v <= 15 || t('rules.beneficiaryAgeLimit')],
+  dateInPast: [
+    (v: any) => {
+      const givenDate = new Date(formatDate(v)!);
+      const currentDate = new Date();
+      if (givenDate.getTime() < currentDate.getTime()) {
+        return t('rules.dataInPast');
+      } else {
+        return true;
+      }
+    },
+  ],
   guaranteedPeriodLimit(v: any, termAnnuityPayments: any) {
     if (Number(v) > Number(termAnnuityPayments)) {
       return t('rules.guaranteedPeriodLimit');

package/types/enum.ts

@@ -52,6 +52,7 @@ export enum Roles {
   ManagerHalykBank = 'ManagerHalykBank',
   ServiceManager = 'ServiceManager',
   DRNSJ = 'DRNSJ',
+  HeadManager = 'HeadManager',
 }
 
 export enum Statuses {
@@ -67,6 +68,9 @@ export enum Statuses {
   WaitingInsurancePremiumForm = 'WaitingInsurancePremiumForm',
   CheckFinCenterForm = 'CheckFinCenterForm',
   RegistryFinCenterForm = 'RegistryFinCenterForm',
+  DocumentsSignedClientFrom = 'DocumentsSignedClientFrom',
+  InputDataForm = 'InputDataForm',
+  ApproveForm = 'ApproveForm',
 }
 
 export enum MemberCodes {

package/types/index.ts

@@ -323,6 +323,8 @@ declare global {
     coverPeriodName?: string;
     coverPeriodCode?: string;
     calculatorValue?: number;
+    coverTypeNameRu?: string;
+    coverTypeNameKz?: string;
   }
 
   type SignUrlType = {
@@ -621,6 +623,64 @@ declare global {
     tripInsurancePeriod?: number;
     startDate?: string | null;
     endDate?: string | null;
+    policyId?: number;
+    policyNumber?: string;
+    contractDate?: string;
+    contractEndDate?: string;
+    amount?: number;
+    premium?: number;
+    mainCoverPremium?: number;
+    currency?: string;
+    isSpokesman?: boolean;
+    coverPeriod?: number;
+    payPeriod?: number;
+    indexRateId?: string;
+    indexRateCode?: string;
+    indexRateName?: string;
+    paymentPeriodId?: string;
+    paymentPeriodName?: string;
+    lifeMultiply?: number;
+    lifeAdditive?: number;
+    adbMultiply?: number;
+    adbAdditive?: number;
+    disabilityMultiply?: number;
+    disabilityAdditive?: number;
+    documentSignTypeId?: string;
+    documentSignTypeCode?: string;
+    documentSignTypeName?: string;
+    isDocumentsSigned?: boolean;
+    paymentTypeId?: string;
+    paymentTypeName?: string;
+    isPayed?: boolean;
+    underwritingType?: number;
+    calcDirect?: number;
+    tariffId?: string;
+    tariffName?: string;
+    riskGroup?: number;
+    riskGroup2?: number;
+    lifeMultiplyClient?: number;
+    lifeAdditiveClient?: number;
+    annuityTypeId?: string;
+    annuityTypeName?: string;
+    annuityPaymentPeriodId?: string;
+    annuityPaymentPeriodName?: string;
+    guaranteedPaymentPeriod?: number;
+    paymentPeriod?: number;
+    annuityMonthPay?: number;
+    annuityPaymentBeginDate?: string;
+    annuityPaymentEndDate?: string;
+    calcDate?: string;
+    guaranteedPaymentBeginDate?: string;
+    guaranteedPaymentEndDate?: string;
+    annuityPaymentAmount?: number;
+    countPay?: number;
+    guaranteedPeriod?: number;
+    dateFirstPay?: string;
+    effectiveAnnualpercentage?: number;
+    factorCurrentValueGP?: number;
+    alfa?: number;
+    gamma?: number;
+    mrpPayment?: number;
   };
 
   type KGDResponse = {