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

package/api/index.ts

@@ -147,21 +147,21 @@ export class ApiClass {
   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 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 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}`,
     });
   }
 
@@ -227,7 +227,7 @@ export class ApiClass {
     });
   }
 
-  async getDicFileTypeList() {
+  async getDicFileTypeList(): Promise<Value[]> {
     return this.axiosCall({
       method: Methods.GET,
       url: '/Arm/api/Dictionary/GetDictionaryItems/DicFileType',
@@ -498,7 +498,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) {
@@ -519,30 +519,37 @@ export class ApiClass {
   async sendUnderwritingCouncilTask(data: any) {
     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/components/Form/ManagerAttachment.vue

@@ -0,0 +1,196 @@
+<template>
+  <div class="rounded-lg border-[1px]" :class="[$libStyles.whiteBg, disabled && $libStyles.disabled]">
+    <div class="mt-3 ml-5">
+      <p :class="[$libStyles.textTitle, $libStyles.greenText]">{{ $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="isReadonly"
+        :clearable="!isReadonly"
+        :label="$t('form.salesChanell')"
+        :rules="$rules.objectRequired"
+        append-inner-icon="mdi mdi-chevron-right"
+        @append="openPanel('SaleChanellPolicy', $t('form.salesChanell'))"
+      ></base-panel-input>
+      <base-panel-input
+        class="pl-1"
+        v-model="formStore.RegionPolicy"
+        :value="formStore.RegionPolicy.nameRu"
+        :readonly="isReadonly"
+        :clearable="!isReadonly"
+        :label="$t('form.Region')"
+        :rules="$rules.objectRequired"
+        append-inner-icon="mdi mdi-chevron-right"
+        @append="openPanel('RegionPolicy', $t('form.Region'))"
+      ></base-panel-input>
+      <base-panel-input
+        class="pl-1"
+        v-model="formStore.ManagerPolicy"
+        :value="formStore.ManagerPolicy.nameRu"
+        :readonly="isReadonly"
+        :clearable="!isReadonly"
+        :label="$t('form.manager')"
+        :rules="$rules.objectRequired"
+        append-inner-icon="mdi mdi-chevron-right"
+        @append="openPanel('ManagerPolicy', $t('form.manager'))"
+      ></base-panel-input>
+      <base-panel-input
+        class="pl-1"
+        v-model="formStore.AgentData"
+        :value="formStore.AgentData.fullName"
+        :readonly="isReadonly"
+        :clearable="!isReadonly"
+        :label="$t('form.agent')"
+        :rules="$rules.agentDataRequired"
+        append-inner-icon="mdi mdi-chevron-right"
+        @append="openPanel('AgentData', $t('form.agent'))"
+      ></base-panel-input>
+    </v-form>
+    <Teleport v-if="isPanelOpen" to="#panel-actions">
+      <div :class="[$libStyles.scrollPage]" class="flex flex-col items-center">
+        <base-rounded-input
+          v-model="searchQuery"
+          :label="$t('labels.search')"
+          class="w-full p-2"
+          :hide-details="true"
+          :append-inner-icon="currentDictName === 'AgentData' ? 'mdi mdi-magnify' : ''"
+          @append="searchAgent"
+        ></base-rounded-input>
+        <div v-if="dictList && isPanelLoading === false" class="w-full flex flex-col gap-2 p-2">
+          <div v-for="(item, index) in dictList" :key="item.id">
+            <base-panel-select-item
+              :key="index"
+              :text="currentDictName === 'AgentData' ? item.fullName : (item.nameRu as string)"
+              :selected="currentDictName === 'AgentData' ? item.fullName === panelValue.fullName : item.nameRu === panelValue.nameRu"
+              @click="pickPanelValue(item)"
+            ></base-panel-select-item>
+          </div>
+        </div>
+        <base-loader v-if="isPanelLoading" class="absolute mt-10" :size="50"></base-loader>
+      </div>
+    </Teleport>
+  </div>
+</template>
+
+<script lang="ts">
+import { Value } from '@/composables/classes';
+
+export default defineComponent({
+  props: {
+    title: {
+      type: String,
+      default: '',
+    },
+    disabled: {
+      type: Boolean,
+      default: false,
+    },
+  },
+  setup(props) {
+    const route = useRoute();
+    const dataStore = useDataStore();
+    const formStore = useFormStore();
+    const isPanelOpen = ref<boolean>(false);
+    const isPanelLoading = ref<boolean>(false);
+    const panelValue = ref<Value & AgentData>(new Value());
+    const searchQuery = ref<string>('');
+    const currentDictName = ref<string>();
+
+    const dictList = computed(() => {
+      if (!currentDictName.value) {
+        return [];
+      }
+      if (currentDictName.value === 'AgentData') {
+        return dataStore[currentDictName.value];
+      } else {
+        // @ts-ignore
+        return dataStore[currentDictName.value].filter((item: Value) => {
+          // @ts-ignore
+          return item.nameRu ? item.nameRu.toLowerCase().includes(searchQuery.value.toLowerCase()) : item.fullName.toLowerCase().includes(searchQuery.value.toLowerCase());
+        });
+      }
+    });
+    const isReadonly = computed(
+      () =>
+        props.disabled ||
+        route.params.taskId === '0' ||
+        (route.params.taskId !== '0' && (!dataStore.isProcessEditable(formStore.applicationData.statusCode) || !dataStore.isTask())),
+    );
+
+    const openPanel = async (currentDict: string, title: string) => {
+      searchQuery.value = '';
+      if (dataStore.isTask() && !props.disabled) {
+        dataStore.panelAction = null;
+        dataStore.panel.open = true;
+        dataStore.panel.title = title;
+        currentDictName.value = currentDict;
+
+        if (currentDict === 'ManagerPolicy') {
+          isPanelLoading.value = true;
+          await dataStore.filterManagerByRegion(formStore.RegionPolicy?.ids);
+        }
+
+        isPanelOpen.value = true;
+        panelValue.value = formStore[currentDict as keyof typeof formStore];
+        isPanelLoading.value = false;
+      } else {
+        dataStore.showToaster('error', dataStore.t('toaster.viewErrorText'));
+      }
+    };
+
+    const searchAgent = async () => {
+      if (searchQuery.value) {
+        isPanelLoading.value = true;
+        await dataStore.searchAgentByName(searchQuery.value);
+        isPanelLoading.value = false;
+      }
+    };
+
+    const pickPanelValue = (answer: any) => {
+      // @ts-ignore
+      formStore[currentDictName.value] = answer;
+      isPanelOpen.value = false;
+      dataStore.panel.open = false;
+      searchQuery.value = '';
+    };
+
+    watch(searchQuery, () => {
+      if (searchQuery.value === null) {
+        searchQuery.value = '';
+      }
+    });
+
+    watch(
+      () => formStore.RegionPolicy,
+      (val, oldVal) => {
+        if (val.ids !== oldVal.ids) {
+          formStore.ManagerPolicy = new Value();
+        }
+      },
+    );
+
+    return {
+      // State
+      formStore,
+      isPanelOpen,
+      isPanelLoading,
+      panelValue,
+      searchQuery,
+      Value,
+      currentDictName,
+
+      // Computed
+      dictList,
+      isReadonly,
+
+      // Functions
+      openPanel,
+      searchAgent,
+      pickPanelValue,
+    };
+  },
+});
+</script>

package/components/Pages/ProductConditions.vue

@@ -440,8 +440,10 @@ export default defineComponent({
           formStore.additionalInsuranceTermsWithout = defaultData.addCovers;
           productConditionsForm.requestedSumInsured = defaultData.amount;
           productConditionsForm.insurancePremiumPerMonth = defaultData.premium;
-          productConditionsForm.processIndexRate = dataStore.processIndexRate.find(i => i.id === defaultData.indexRateId);
-          productConditionsForm.paymentPeriod = dataStore.processPaymentPeriod.find(i => i.id == defaultData.paymentPeriodId);
+          const indexRate = dataStore.processIndexRate.find(i => i.id === defaultData.indexRateId);
+          if (indexRate) productConditionsForm.processIndexRate = indexRate;
+          const paymendPeriod = dataStore.processPaymentPeriod.find(i => i.id == defaultData.paymentPeriodId);
+          if (paymendPeriod) productConditionsForm.paymentPeriod = paymendPeriod;
           productConditionsForm.signDate = reformatDate(defaultData.signDate);
         }
       }

package/composables/classes.ts

@@ -781,6 +781,8 @@ export class DataStoreClass {
     hasInsis: boolean;
     // Калькулятор без ввода данных
     hasCalculator: boolean;
+    // Блок прикрепления к менеджеру
+    hasAttachment: boolean;
   };
   hasLayoutMargins: boolean;
   readonly product: string | null;
@@ -840,9 +842,9 @@ export class DataStoreClass {
   user: User;
   accessToken: string | null = null;
   refreshToken: string | null = null;
-  processCoverTypeSum: any[];
-  processIndexRate: any[];
-  processPaymentPeriod: any[];
+  processCoverTypeSum: Value[];
+  processIndexRate: Value[];
+  processPaymentPeriod: Value[];
   taskList: TaskListItem[];
   processHistory: TaskHistory[];
   contragentList: any[];
@@ -851,11 +853,11 @@ export class DataStoreClass {
   groupCode: string;
   userGroups: Item[];
   onMainPage: boolean;
-  SaleChanellPolicyList: any[];
-  RegionPolicyList: any[];
-  ManagerPolicyList: any[];
-  AgentDataList: any[];
-  riskGroup: any[];
+  SaleChanellPolicy: Value[];
+  RegionPolicy: Value[];
+  ManagerPolicy: Value[];
+  AgentData: AgentData[];
+  riskGroup: Value[];
   constructor() {
     this.controls = {
       onAuth: false,
@@ -865,15 +867,16 @@ export class DataStoreClass {
       hasGKB: false,
       hasInsis: false,
       hasCalculator: false,
+      hasAttachment: true,
     };
     this.hasLayoutMargins = true;
     this.processIndexRate = [];
     this.processPaymentPeriod = [];
     this.questionRefs = [];
-    this.SaleChanellPolicyList = [];
-    this.RegionPolicyList = [];
-    this.ManagerPolicyList = [];
-    this.AgentDataList = [];
+    this.SaleChanellPolicy = [];
+    this.RegionPolicy = [];
+    this.ManagerPolicy = [];
+    this.AgentData = [];
     this.product = import.meta.env.VITE_PRODUCT ? (import.meta.env.VITE_PRODUCT as string) : null;
     this.showNav = true;
     this.menuItems = [];
@@ -949,27 +952,36 @@ export class DataStoreClass {
         id: '1',
         nameKz: '',
         nameRu: '1',
-        isDefault: true,
+        code: '',
+        ids: '',
       },
       {
         id: '2',
         nameKz: '',
         nameRu: '2',
+        code: '',
+        ids: '',
       },
       {
         id: '3',
         nameKz: '',
         nameRu: '3',
+        code: '',
+        ids: '',
       },
       {
         id: '4',
         nameKz: '',
         nameRu: '4',
+        code: '',
+        ids: '',
       },
       {
         id: '5',
         nameKz: '',
         nameRu: '5',
+        code: '',
+        ids: '',
       },
     ];
   }
@@ -997,15 +1009,7 @@ export class FormStoreClass {
   };
   birthInfos: BirthInfoGKB[];
   SaleChanellPolicy: Value;
-  AgentData: {
-    agentId: null;
-    manId: number;
-    fullName: string;
-    officeId: null;
-    officeCode: null;
-    saleChannel: string;
-    managerName: string;
-  };
+  AgentData: AgentData;
   RegionPolicy: Value;
   ManagerPolicy: Value;
   isDisabled: {

package/composables/constants.ts

@@ -7,6 +7,7 @@ export const constants = Object.freeze({
     bolashak: 8,
     liferenta: 9,
     gons: 10,
+    halykkazyna: 11,
   },
 
   editableStatuses: ['StartForm', 'EditBeneficiaryForm', 'EditForm'],

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "hl-core",
-  "version": "0.0.8-beta.4",
+  "version": "0.0.8-beta.5",
   "license": "MIT",
   "private": false,
   "main": "nuxt.config.ts",

package/store/data.store.js

@@ -38,6 +38,7 @@ export const useDataStore = defineStore('data', {
     isLiferenta: state => state.product === 'liferenta',
     isPension: state => state.product === 'pension',
     isGons: state => state.product === 'gons',
+    isKazyna: state => state.product === 'halykkazyna',
     isEveryFormDisabled: state => Object.values(state.formStore.isDisabled).every(i => i === true),
   },
   actions: {
@@ -956,16 +957,23 @@ export const useDataStore = defineStore('data', {
       }
     },
     async getFromApi(whichField, whichRequest, parameter, reset = false) {
+      if (typeof this[whichField].length === 'number' && !!this[whichField].length) return this[whichField];
       const storageValue = JSON.parse(localStorage.getItem(whichField) || 'null');
       const currentHour = new Date().getHours();
+      const currentMinutePart = Math.ceil((new Date().getMinutes() + 1) / 15);
 
       const getDataCondition = () => {
         if (!storageValue) return true;
         const hasHourKey = 'hour' in storageValue;
+        const hasMiniteKey = 'minute' in storageValue;
         const hasModeKey = 'mode' in storageValue;
         const hasValueKey = 'value' in storageValue;
-        if (storageValue && (hasHourKey === false || hasModeKey === false || hasValueKey === false)) return true;
-        if (storageValue && (storageValue.hour !== currentHour || storageValue.mode !== import.meta.env.MODE || storageValue.value.length === 0)) return true;
+        if (storageValue && (hasHourKey === false || hasMiniteKey === false || hasModeKey === false || hasValueKey === false)) return true;
+        if (
+          storageValue &&
+          (storageValue.hour !== currentHour || storageValue.minute !== currentMinutePart || storageValue.mode !== import.meta.env.MODE || storageValue.value.length === 0)
+        )
+          return true;
       };
       if (!!getDataCondition() || reset === true) {
         this[whichField] = [];
@@ -977,6 +985,7 @@ export const useDataStore = defineStore('data', {
               JSON.stringify({
                 value: response,
                 hour: currentHour,
+                minute: currentMinutePart,
                 mode: import.meta.env.MODE,
               }),
             );
@@ -1047,16 +1056,7 @@ export const useDataStore = defineStore('data', {
       });
     },
     async getDicFileTypeList() {
-      try {
-        if (this.dicFileTypeList.length) {
-          return this.dicFileTypeList;
-        } else {
-          this.dicFileTypeList = await this.api.getDicFileTypeList();
-          return this.dicFileTypeList;
-        }
-      } catch (err) {
-        console.log(err.response.data);
-      }
+      return await this.getFromApi('dicFileTypeList', 'getDicFileTypeList');
     },
     async getDocumentIssuers() {
       return await this.getFromApi('documentIssuers', 'getDocumentIssuers');
@@ -1207,6 +1207,9 @@ export const useDataStore = defineStore('data', {
         this.getProcessIndexRate(),
         this.getProcessTariff(),
         this.getProcessPaymentPeriod(),
+        this.getDicFileTypeList(),
+        this.getDictionaryItems('RegionPolicy'),
+        this.getDictionaryItems('SaleChanellPolicy'),
       ]);
     },
     async getUserGroups() {
@@ -1254,15 +1257,12 @@ export const useDataStore = defineStore('data', {
     },
     async searchAgentByName(name) {
       try {
-        this.isLoading = true;
-        this.AgentDataList = await this.api.searchAgentByName(name);
-        if (!this.AgentDataList.length) {
+        this.AgentData = await this.api.searchAgentByName(name);
+        if (!this.AgentData.length) {
           this.showToaster('error', this.t('toaster.notFound'), 1500);
         }
       } catch (err) {
         console.log(err);
-      } finally {
-        this.isLoading = false;
       }
     },
     async setINSISWorkData() {
@@ -1291,14 +1291,14 @@ export const useDataStore = defineStore('data', {
         this.isLoading = false;
       }
     },
-    async filterManagerByRegion(dictName, filterName) {
+    async getDictionaryItems(dictName) {
+      return await this.getFromApi(dictName, 'getDictionaryItems', dictName);
+    },
+    async filterManagerByRegion(filterName) {
       try {
-        this.isLoading = true;
-        this[`${dictName}List`] = await this.api.filterManagerByRegion(dictName, filterName);
+        this.ManagerPolicy = await this.api.filterManagerByRegion('ManagerPolicy', filterName);
       } catch (err) {
         console.log(err);
-      } finally {
-        this.isLoading = false;
       }
     },
     async getUnderwritingCouncilData(id) {
@@ -1981,7 +1981,7 @@ export const useDataStore = defineStore('data', {
           }
         }
       }
-      if (!this.isGons) {
+      if (this.controls.hasAttachment) {
         const areValid = this.formStore.SaleChanellPolicy.nameRu && this.formStore.RegionPolicy.nameRu && this.formStore.ManagerPolicy.nameRu && this.formStore.AgentData.fullName;
         if (areValid) {
           await this.setINSISWorkData();

package/store/messages.ts

@@ -402,6 +402,10 @@ export const messages = {
       homePhone: 'Домашний номер телефон',
       email: 'Email адрес',
       otpCode: 'Код подтверждения',
+      salesChanell: ' Канал продаж',
+      manager: 'Менеджер',
+      attachManager: 'Прикрепление к менеджеру',
+      agent: 'Агент',
     },
     agreementBlock: {
       title: 'Согласие на сбор и обработку пресональных данных',

package/store/rules.js

@@ -13,6 +13,14 @@ export const rules = {
       return t('rules.required');
     },
   ],
+  agentDataRequired: [
+    v => {
+      if (!!v && 'fullName' in v && v.fullName != null) {
+        return true;
+      }
+      return t('rules.required');
+    },
+  ],
   noResident: [
     v => {
       if (!!v && 'nameRu' in v && v.nameRu === 'Нерезидент') {

package/types/index.ts

@@ -300,4 +300,18 @@ declare global {
     taskId: string;
     comment?: string;
   };
+
+  type AgentData = {
+    agentId?: number | null;
+    manId?: number;
+    fullName?: string;
+    officeId?: number | null;
+    officeCode?: string | null;
+    saleChannel?: string;
+    staffId?: number;
+    managerName?: string;
+    mainAgentId?: string | null;
+    agentNo?: string;
+    iin?: string | null;
+  };
 }