hl-core 0.0.9-beta.41 → 0.0.9-beta.42

package/api/base.api.ts

@@ -750,7 +750,7 @@ export class ApiClass {
     });
   }
 
-  async saveClientAcivityTypes(clientId: string | number, data: any) {
+  async saveClientActivityTypes(clientId: string | number, data: any) {
     return await this.axiosCall({
       method: Methods.POST,
       url: `/${this.productUrl}/api/Application/saveClientAcivityTypes/?clientId=${clientId}`,

package/components/Input/Datepicker.vue

@@ -1,5 +1,6 @@
 <template>
   <vue-date-picker
+    class="base-datepicker"
     :model-value="modelValue"
     :clearable="false"
     :disabled="disabled"
@@ -10,12 +11,16 @@
     :teleport="true"
     :close-on-scroll="true"
     :enable-time-picker="false"
+    :six-weeks="true"
     cancel-text="Отменить"
     select-text="Выбрать"
   >
     <template #trigger>
       <v-icon icon="mdi mdi-calendar-blank-outline cursor-pointer" />
     </template>
+    <template #action-preview="{ value }">
+      {{ reformatDate(value) }}
+    </template>
   </vue-date-picker>
 </template>
 
@@ -36,3 +41,36 @@ export default defineComponent({
   },
 });
 </script>
+
+<style>
+:root {
+  --dp-menu-min-width: 300px;
+  --dp-border-radius: 10px;
+  --dp-cell-border-radius: 9999px;
+}
+
+.dp__calendar_item .dp__active_date {
+  @apply bg-[#A0B3D8];
+}
+.dp__calendar_item .dp__today {
+  @apply border-[#A0B3D8];
+}
+.dp__calendar_item .dp__today:not(.dp__active_date) {
+  @apply border-[#009C73];
+}
+.dp__overlay_cell_active {
+  @apply !bg-[#A0B3D8];
+}
+.dp__action_button {
+  @apply h-auto px-3 py-1 text-[14px] rounded-lg;
+}
+.dp__action_cancel {
+  @apply hover:border-[#A0B3D8];
+}
+.dp__action_select {
+  @apply bg-[#009C73] hover:bg-[#00a277] text-white px-4;
+}
+.dp__selection_preview[title*='/'] {
+  @apply rounded-lg border-[1px] px-3 py-1 text-[14px] text-[#009C73];
+}
+</style>

package/components/Input/FileInput.vue

@@ -14,7 +14,11 @@
     :label="label"
     @click:append-inner="$emit('append-inner', $event)"
     @click:clear="$emit('on-clear')"
-  />
+  >
+    <template v-slot:loader>
+      <v-progress-linear v-if="loading" color="#A0B3D8" height="3" indeterminate />
+    </template>
+  </v-file-input>
 </template>
 
 <script lang="ts">
@@ -34,6 +38,10 @@ export default defineComponent({
         return useDataStore().t('labels.chooseDoc');
       },
     },
+    loading: {
+      type: Boolean,
+      default: false,
+    },
   },
   emits: ['input', 'append-inner', 'on-clear'],
 });

package/components/Input/TextInput.vue

@@ -63,7 +63,8 @@ export default defineComponent({
         cancelText: 'Закрыть',
         closeOnScroll: true,
         transitions: false,
-        teleport: true
+        teleport: true,
+        sixWeeks: true,
       };
     });
 

package/components/Layout/SettingsPanel.vue

@@ -80,7 +80,7 @@ const hasHistory = computed(() => {
   return !dataStore.isLKA;
 });
 
-const hasFAQ = computed(() => !useEnv().isProduction && router.hasRoute('FAQ'));
+const hasFAQ = computed(() => router.hasRoute('FAQ'));
 
 const openHistory = async () => {
   dataStore.sendToParent(constants.postActions.toStatementHistory, dataStore.isBridge || dataStore.isDSO || dataStore.isUU ? '' : dataStore.product);

package/components/Pages/ProductConditions.vue

@@ -243,16 +243,13 @@
           :label="$dataStore.t('productConditionsForm.statePremium7')"
           :suffix="$constants.currencySymbols.kzt"
         />
-        <base-panel-input
+        <base-form-input
           v-if="hasAgencyPart"
-          v-model="productConditionsForm.processTariff"
-          :value="productConditionsForm.processTariff?.nameRu"
-          :readonly="isDisabled"
-          :clearable="!isDisabled"
-          :rules="$rules.objectRequired"
+          v-model="productConditionsForm.agentCommission"
           :label="$dataStore.t('productConditionsForm.agencyPart')"
-          append-inner-icon="mdi mdi-chevron-right"
-          @append="openPanel($dataStore.t('productConditionsForm.agencyPart'), $dataStore.processTariff, 'processTariff', $dataStore.getProcessTariff)"
+          :readonly="isDisabledAgentCommission"
+          :clearable="!isDisabledAgentCommission"
+          :rules="$rules.required.concat($rules.numbers, $rules.agentCommission)"
         />
         <base-panel-input
           v-if="hasProcessGfot"
@@ -459,7 +456,13 @@
             :clearable="false"
             :label="coverTypeName(term)"
             append-inner-icon="mdi mdi-chevron-right"
-            :suffix="!!term.amount ? `${formatTermValue(term.amount)} ${currencySymbolsAddTerm}` : ''"
+            :suffix="
+              whichProduct === 'lifebusiness' && term.coverTypeCode === 6
+                ? String(term.coverPeriodName ?? '')
+                : !!term.amount
+                ? `${formatTermValue(term.amount)} ${currencySymbolsAddTerm}`
+                : ''
+            "
             @append="openTermPanel(coverTypeName(term), $dataStore.getAdditionalInsuranceTermsAnswers, term.coverTypeId, index)"
           />
         </div>
@@ -473,7 +476,7 @@
       @click="submitForm"
     />
     <div v-if="$dataStore.isTask() && $dataStore.isUnderwriter() && !isRecalculationDisabled" class="flex gap-3">
-      <base-btn :text="$dataStore.t('buttons.calcSum')" type="submit" @click.prevent="underwriterCalculate('sum')" :loading="isCalculating" />
+      <base-btn :text="$dataStore.t('buttons.calcSum')" v-if="hasCalcSum" type="submit" @click.prevent="underwriterCalculate('sum')" :loading="isCalculating" />
       <base-btn :text="$dataStore.t('buttons.calcPremium')" type="submit" @click.prevent="underwriterCalculate('premium')" :loading="isCalculating" />
     </div>
     <Teleport v-if="isPanelOpen" to="#right-panel-actions">
@@ -519,45 +522,23 @@
       <div :class="[$styles.scrollPage]" class="flex flex-col items-center">
         <base-rounded-input v-model.trim="searchQuery" :label="$dataStore.t('labels.search')" class="w-full p-2" :hide-details="true" />
         <div v-if="panelList && isPanelLoading === false" class="w-full flex flex-col gap-2 p-2">
-          <base-panel-select-item
-            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 === termValue?.coverSumName"
-            @click="pickTermValue(item)"
-          />
+          <div v-for="(item, index) of panelList.filter(i => i.nameRu && (i.nameRu as string).match(new RegExp(searchQuery, 'i')))">
+            <v-expansion-panels v-if="panelCodeList.includes(String(item.code)) && whichProduct === 'lifebusiness'" variant="accordion">
+              <v-expansion-panel class="hover:bg-[#f5f8fd]" elevation="0" bg-color="#F3F6FC">
+                <v-expansion-panel-title @click="pickTermValue(item)">
+                  {{ item.nameRu }}
+                </v-expansion-panel-title>
+                <v-expansion-panel-text class="border-t-[1px] border-t-white cursor-pointer" :class="[$styles.textSimple]" v-for="(i, idx) of subPanelList">
+                  <base-panel-select-item class="!p-0" :key="idx" :text="(i.nameRu as string)" :selected="i.code === subTermValue" @click="pickSubTermValue(item, i)" />
+                </v-expansion-panel-text>
+              </v-expansion-panel>
+            </v-expansion-panels>
+            <base-panel-select-item v-else :key="index" :text="(item.nameRu as string)" :selected="item.nameRu === termValue?.coverSumName" @click="pickTermValue(item)" />
+          </div>
         </div>
         <base-loader v-if="isPanelLoading" class="absolute mt-10" :size="50" />
       </div>
     </Teleport>
-    <Teleport v-if="isFixInsAmountPanelOpen" to="#right-panel-actions">
-      <div :class="[$styles.scrollPage]" class="flex flex-col items-center">
-        <base-rounded-input v-model.trim="searchQuery" :label="$dataStore.t('labels.search')" class="w-full p-2" :hide-details="true" />
-        <div class="w-full flex flex-col gap-2 p-2">
-          <base-panel-select-item
-            v-for="(item, index) of $constants.fixInsAmount.filter(i => i.nameRu && (i.nameRu as string).match(new RegExp(searchQuery, 'i')))"
-            :key="index"
-            :text="(item.nameRu as string)"
-            :selected="item.code === fixInsValue"
-            @click="pickfixInsValue(item)"
-          />
-        </div>
-      </div>
-    </Teleport>
-    <Teleport v-if="isCoverPeriodPanelOpen" to="#right-panel-actions">
-      <div :class="[$styles.scrollPage]" class="flex flex-col items-center">
-        <base-rounded-input v-model.trim="searchQuery" :label="$dataStore.t('labels.search')" class="w-full p-2" :hide-details="true" />
-        <div class="w-full flex flex-col gap-2 p-2">
-          <base-panel-select-item
-            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.code === coverPeriodValue"
-            @click="pickCoverPeriodValue(item)"
-          />
-        </div>
-      </div>
-    </Teleport>
   </section>
 </template>
 
@@ -588,18 +569,17 @@ export default defineComponent({
     const isPanelLoading = ref<boolean>(false);
     const isPanelOpen = ref<boolean>(false);
     const isTermsPanelOpen = ref<boolean>(false);
-    const isFixInsAmountPanelOpen = ref<boolean>(false);
-    const isCoverPeriodPanelOpen = ref<boolean>(false);
-    const fixInsValue = ref<string | number>();
-    const coverPeriodValue = ref<string>('');
     const panelValue = ref<Value>(new Value());
     const termValue = ref<AddCover>();
+    const subTermValue = ref<string>('');
     const panelList = ref<Value[]>([]);
+    const subPanelList = ref<Value[]>([]);
     const productConditionsForm = formStore.productConditionsForm;
     const currentPanel = ref<keyof typeof productConditionsForm>();
     const currentIndex = ref<number>();
     const searchQuery = ref<string>('');
     const whichSum = ref<'insurancePremiumPerMonth' | 'requestedSumInsured' | ''>('');
+    const panelCodeList = ['processcovertypesum', 'fixedinssum'];
 
     const additionalTerms = ref<AddCover[]>([]);
 
@@ -628,6 +608,9 @@ export default defineComponent({
       if (whichProduct.value === 'gons') {
         return true;
       }
+      if (whichProduct.value === 'lifebusiness' && dataStore.isUnderwriter()) {
+        return false;
+      }
       return isDisabled.value;
     });
     const isTask = computed(() => (route.params.taskId === '0' && props.isCalculator === true) || dataStore.isTask());
@@ -635,12 +618,12 @@ export default defineComponent({
     const isUnderwriterRole = computed(() => dataStore.isUnderwriter() || dataStore.isAdmin() || dataStore.isSupport());
     const insurancePremiumPerMonthRule = computed(() => (!!productConditionsForm.insurancePremiumPerMonth ? dataStore.rules.required.concat(dataStore.rules.sums) : []));
     const insurancePremiumPerMonthDisabled = computed(() => {
-      if (dataStore.isUnderwriter() && !isRecalculationDisabled.value) {
-        return false;
-      }
       if (whichProduct.value === 'lifebusiness') {
         return true;
       }
+      if (dataStore.isUnderwriter() && !isRecalculationDisabled.value) {
+        return false;
+      }
       return isDisabled.value;
     });
     const requestedSumInsuredRule = computed(() => (!!productConditionsForm.requestedSumInsured ? dataStore.rules.required.concat(dataStore.rules.sums) : []));
@@ -797,12 +780,12 @@ export default defineComponent({
       if (whichProduct.value === 'halykkazyna') {
         return true;
       }
-      if (dataStore.isUnderwriter() && !isRecalculationDisabled.value) {
-        return false;
-      }
       if (whichProduct.value === 'lifebusiness' && productConditionsForm.processGfot.id !== null) {
         return true;
       }
+      if (dataStore.isUnderwriter() && !isRecalculationDisabled.value) {
+        return false;
+      }
       return isDisabled.value;
     });
     const isDisabledSumDollar = computed(() => {
@@ -837,8 +820,23 @@ export default defineComponent({
       if (whichProduct.value === 'lifebusiness' && !!productConditionsForm.requestedSumInsured) {
         return true;
       }
+      if (dataStore.isUnderwriter()) {
+        return false;
+      }
       return isDisabled.value;
     });
+    const isDisabledAgentCommission = computed(() => {
+      if (whichProduct.value === 'lifebusiness' || dataStore.isUnderwriter()) {
+        return false;
+      }
+      return isDisabled.value;
+    });
+    const hasCalcSum = computed(() => {
+      if (whichProduct.value === 'lifebusiness') {
+        return false;
+      }
+      return true;
+    });
     const formatTermValue = (term: number) => {
       if (term !== null) {
         const termNumber = Number(term);
@@ -907,36 +905,47 @@ export default defineComponent({
       }
     };
     const pickTermValue = async (item: Value) => {
-      dataStore.rightPanel.open = false;
-      isTermsPanelOpen.value = false;
+      if (!panelCodeList.includes(item.code as string) && whichProduct.value === 'lifebusiness') {
+        dataStore.rightPanel.open = false;
+        isTermsPanelOpen.value = false;
+      }
       if (typeof currentIndex.value !== 'number') return;
+
+      if (whichProduct.value === 'lifebusiness' && item.code === 'processcovertypesum') {
+        if (item.id !== additionalTerms.value[currentIndex.value].coverSumId) {
+          additionalTerms.value[currentIndex.value].coverPeriodCode = null;
+          additionalTerms.value[currentIndex.value].coverPeriodId = null;
+          additionalTerms.value[currentIndex.value].coverPeriodName = null;
+        }
+      }
+
       additionalTerms.value[currentIndex.value].coverSumId = item.id as string;
       additionalTerms.value[currentIndex.value].coverSumName = item.nameRu as string;
+
       if (whichProduct.value === 'lifebusiness') {
-        if (item.code === 'fixedinssum') {
-          openFixInsPanel(dataStore.t('clients.selectInsSum'), additionalTerms.value[currentIndex.value].amount);
+        if (termValue.value && item.code === 'fixedinssum') {
+          subPanelList.value = constants.fixInsAmount;
+          subTermValue.value = String(termValue.value.amount);
         } else {
           additionalTerms.value[currentIndex.value].amount = 0;
         }
-        if (termValue.value && termValue.value.coverTypeCode === 6) {
-          const res = await dataStore.getFromApi('DicCoverTypePeriod', 'getArmDicts', 'DicCoverTypePeriod');
-          panelList.value = filterList(res, '');
-          const coverPeriodName = panelList.value.find(i => i.id === String(termValue.value!.coverPeriodId));
-          if (coverPeriodName) coverPeriodValue.value = coverPeriodName.code as string;
-          isPanelOpen.value = false;
-          isTermsPanelOpen.value = false;
-          isFixInsAmountPanelOpen.value = false;
-          isCoverPeriodPanelOpen.value = true;
-          dataStore.panelAction = null;
-          dataStore.rightPanel.open = true;
-          isMultiplePanelOpen.value = false;
-          dataStore.rightPanel.title = dataStore.t('clients.coveragePeriod');
+
+        if (termValue.value && termValue.value.coverTypeCode === 6 && item.code === 'processcovertypesum') {
+          const response = await dataStore.getFromApi('DicCoverTypePeriod', 'getArmDicts', 'DicCoverTypePeriod');
+          subPanelList.value = response;
+          subTermValue.value = termValue.value.coverPeriodCode as string;
+        }
+
+        if (termValue.value && termValue.value.coverTypeCode === 6 && item.code !== 'processcovertypesum') {
+          additionalTerms.value[currentIndex.value].coverPeriodCode = null;
+          additionalTerms.value[currentIndex.value].coverPeriodId = null;
+          additionalTerms.value[currentIndex.value].coverPeriodName = null;
         }
       }
     };
 
     const openPanel = async (title: string, list: Value[], key: string, asyncFunction?: Function, filterKey?: string) => {
-      if (!isDisabled.value || (key === 'riskGroup' && !isRecalculationDisabled.value)) {
+      if (!isDisabled.value || (key === 'riskGroup' && !isRecalculationDisabled.value) || (key === 'processGfot' && !isDisabledProcessGfot.value)) {
         if (key === 'amount') {
           if (calculatorForm.type.nameRu === null || !calculatorForm.countries || (calculatorForm.countries && calculatorForm.countries.length === 0)) {
             return dataStore.showToaster('error', dataStore.t('toaster.noAmountBeforeTypeAndCountries'), 2000);
@@ -951,8 +960,6 @@ export default defineComponent({
         currentPanel.value = key as keyof typeof productConditionsForm;
         isPanelOpen.value = true;
         isTermsPanelOpen.value = false;
-        isFixInsAmountPanelOpen.value = false;
-        isCoverPeriodPanelOpen.value = false;
         dataStore.panelAction = null;
         dataStore.rightPanel.open = true;
         dataStore.rightPanel.title = title;
@@ -979,8 +986,6 @@ export default defineComponent({
     const openMultiplePanel = async (title: string, list: CountryValue[], key: string, asyncFunction?: Function, filterKey?: string) => {
       if (!isDisabled.value || !isRecalculationDisabled.value) {
         isPanelOpen.value = false;
-        isFixInsAmountPanelOpen.value = false;
-        isCoverPeriodPanelOpen.value = false;
         isMultiplePanelOpen.value = true;
         isPanelLoading.value = true;
         let newList = list;
@@ -1024,13 +1029,11 @@ export default defineComponent({
     };
 
     const openTermPanel = async (title: string, asyncFunction: Function, questionId: string, index: number) => {
-      if (!isDisabled.value) {
+      if (!isDisabled.value || (whichProduct.value === 'lifebusiness' && dataStore.isUnderwriter())) {
         searchQuery.value = '';
         currentIndex.value = index;
         isPanelOpen.value = false;
         isMultiplePanelOpen.value = false;
-        isFixInsAmountPanelOpen.value = false;
-        isCoverPeriodPanelOpen.value = false;
         isTermsPanelOpen.value = true;
         dataStore.panelAction = null;
         dataStore.rightPanel.open = true;
@@ -1050,39 +1053,21 @@ export default defineComponent({
       }
     };
 
-    const openFixInsPanel = async (title: string, amount: number) => {
-      if (!isDisabled.value) {
-        searchQuery.value = '';
-        isPanelOpen.value = false;
-        isTermsPanelOpen.value = false;
-        isMultiplePanelOpen.value = false;
-        isCoverPeriodPanelOpen.value = false;
-        isFixInsAmountPanelOpen.value = true;
-        dataStore.panelAction = null;
-        dataStore.rightPanel.open = true;
-        dataStore.rightPanel.title = title;
-        panelList.value = constants.fixInsAmount;
-        fixInsValue.value = String(amount);
-      } else {
-        dataStore.showToaster('error', dataStore.t('toaster.viewErrorText'));
-      }
-    };
-
-    const pickfixInsValue = (item: Value) => {
+    const pickSubTermValue = (item: Value, subItem: Value) => {
       dataStore.rightPanel.open = false;
-      isFixInsAmountPanelOpen.value = false;
+      isTermsPanelOpen.value = false;
+      subTermValue.value = item.code as string;
       if (typeof currentIndex.value !== 'number') return;
-      additionalTerms.value[currentIndex.value].amount = Number(item.code);
-    };
 
-    const pickCoverPeriodValue = (item: Value) => {
-      coverPeriodValue.value = item.code as string;
-      dataStore.rightPanel.open = false;
-      isCoverPeriodPanelOpen.value = false;
-      if (typeof currentIndex.value !== 'number') return;
-      additionalTerms.value[currentIndex.value].coverPeriodCode = item.code as string;
-      additionalTerms.value[currentIndex.value].coverPeriodId = item.id as string;
-      additionalTerms.value[currentIndex.value].coverPeriodName = item.nameRu as string;
+      if (item.code === 'fixedinssum') {
+        additionalTerms.value[currentIndex.value].amount = Number(subItem.code);
+      }
+
+      if (item.code === 'processcovertypesum') {
+        additionalTerms.value[currentIndex.value].coverPeriodCode = subItem.code as string;
+        additionalTerms.value[currentIndex.value].coverPeriodId = subItem.id as string;
+        additionalTerms.value[currentIndex.value].coverPeriodName = subItem.nameRu as string;
+      }
     };
 
     const underwriterCalculate = async (type: 'sum' | 'premium') => {
@@ -1296,7 +1281,12 @@ export default defineComponent({
               recalculationData.premium = Number((productConditionsForm.insurancePremiumPerMonth as string)?.replace(/\s/g, ''));
               recalculationData.riskGroup = productConditionsForm.riskGroup?.id ? productConditionsForm.riskGroup.id : 1;
               isCalculating.value = true;
-              await dataStore.reCalculate(formStore.applicationData.processInstanceId, recalculationData, route.params.taskId as string, whichSum.value);
+              if (whichProduct.value === 'lifebusiness') {
+                await dataStore.calculate(route.params.taskId as string);
+                additionalTerms.value = formStore.additionalInsuranceTerms;
+              } else {
+                await dataStore.reCalculate(formStore.applicationData.processInstanceId, recalculationData, route.params.taskId as string, whichSum.value);
+              }
             }
             isCalculating.value = true;
             if (props.isCalculator) {
@@ -1492,10 +1482,9 @@ export default defineComponent({
       whichSum,
       Value,
       calculatorForm,
-      isFixInsAmountPanelOpen,
-      isCoverPeriodPanelOpen,
-      fixInsValue,
-      coverPeriodValue,
+      subPanelList,
+      subTermValue,
+      panelCodeList,
 
       // Computed
       isTask,
@@ -1536,6 +1525,8 @@ export default defineComponent({
       hasDefault,
       isDisabledProcessGfot,
       isShownAdditionalTerms,
+      hasCalcSum,
+      isDisabledAgentCommission,
 
       // Rules
       coverPeriodRule,
@@ -1562,10 +1553,8 @@ export default defineComponent({
       formatTermValue,
       filterTermConditions,
       selectOption,
-      pickfixInsValue,
-      openFixInsPanel,
-      pickCoverPeriodValue,
       coverTypeName,
+      pickSubTermValue,
     };
   },
 });

package/components/Panel/PanelHandler.vue

@@ -148,27 +148,12 @@
       <base-btn :text="buttonText" :loading="loading" @click="submitForm" />
     </div>
   </section>
-  <section v-if="templateAction">
-    <div :class="[$styles.flexColNav]">
-      <base-content-block>
-        <base-panel-item class="cursor-pointer bg-white mb-4 border-b-0 rounded" @click.prevent="downloadTemplate(constants.documentTypes.insuredsList, 'vnd.ms-excel')">
-          {{ $dataStore.t('downloadTemplate') }}
-          <i class="mdi mdi-download text-2xl text-[#A0B3D8]"></i
-        ></base-panel-item>
-      </base-content-block>
-      <base-content-block>
-        <v-form ref="vForm" class="mb-3">
-          <base-form-input v-model.trim="email" :label="$dataStore.t('form.email')" :rules="$rules.required" />
-        </v-form>
-        <base-btn :text="$dataStore.t('form.sendToEmail')" :loading="loading" @click="sendTemplateToEmail" />
-      </base-content-block>
-    </div>
-  </section>
 </template>
 
 <script lang="ts">
 import { DocumentItem, Value } from '../../composables/classes';
 import { HubConnectionBuilder } from '@microsoft/signalr';
+import { uuid } from 'vue-uuid';
 
 export default defineComponent({
   emits: ['task'],
@@ -182,7 +167,6 @@ export default defineComponent({
     const isScansDocuments = ref<boolean>(false);
     const isQr = ref<boolean>(false);
     const isElectronicContract = ref<boolean>(true);
-    const email = ref<string>('');
     const qrUrl = ref<string>('');
     const connection = ref<any>(null);
     const isQrLoading = ref<boolean>(false);
@@ -367,25 +351,17 @@ export default defineComponent({
         case constants.actions.register:
           return dataStore.t('buttons.register');
         case constants.actions.affiliate:
-        case constants.actions.template:
           return dataStore.t('buttons.send');
         default:
           return dataStore.t('buttons.send');
       }
     });
 
-    const panelTitle = computed(() => {
-      if (dataStore.isLifeBusiness && dataStore.panelAction === constants.actions.template) {
-        return dataStore.t('template');
-      }
-      return buttonText.value;
-    });
-
     watch(
       () => dataStore.panelAction,
       val => {
         if (!!val) {
-          dataStore.panel.title = panelTitle.value;
+          dataStore.panel.title = buttonText.value;
           dataStore.panel.open = true;
         }
       },
@@ -403,7 +379,6 @@ export default defineComponent({
       () => dataStore.panelAction === constants.actions.reject || dataStore.panelAction === constants.actions.return || dataStore.panelAction === constants.actions.rejectclient,
     );
     const acceptAction = computed(() => dataStore.panelAction === constants.actions.accept);
-    const templateAction = computed(() => dataStore.panelAction === constants.actions.template);
     const signingActions = computed(() => dataStore.panelAction === constants.actions.sign);
     const payingActions = computed(() => dataStore.panelAction === constants.actions.pay);
     const affiliateActions = computed(() => dataStore.panelAction === constants.actions.affiliate);
@@ -456,21 +431,12 @@ export default defineComponent({
       await dataStore.downloadTemplate(documentType, fileType);
     };
 
-    const sendTemplateToEmail = async () => {
-      await vForm.value.validate().then(async (v: { valid: Boolean; errors: any }) => {
-        if (v.valid) {
-          dataStore.panel.open = false;
-          dataStore.panelAction = null;
-          await dataStore.sendTemplateToEmail(email.value);
-        }
-      });
-    };
-
     const handleSignAction = async (type: 'paper' | 'electronic' | 'scans' | 'qr') => {
       loading.value = true;
       if (type === 'electronic') {
         await dataStore.signDocument();
         isElectronicContract.value = true;
+        dataStore.panelAction = constants.actions.sign;
       }
       if (type === 'paper') {
         isPaperContract.value = true;
@@ -491,8 +457,8 @@ export default defineComponent({
 
     // TODO Рефактор QR c npm
     const generateQR = async (groupId: string) => {
-      const uuid = crypto.randomUUID();
-      const qrValue = `${getValuePerEnv('qrGenUrl')}/${uuid}/${groupId}`;
+      const uuidV4 = uuid.v4();
+      const qrValue = `${getValuePerEnv('qrGenUrl')}/${uuidV4}/${groupId}`;
       qrUrl.value = `https://api.qrserver.com/v1/create-qr-code/?size=135x135&data=${qrValue}`;
 
       if (dataStore.isLifeBusiness) {
@@ -503,7 +469,7 @@ export default defineComponent({
         urlCopy.value = `https://mgovsign.page.link/?link=${qrValue}?mgovSign&amp;apn=kz.mobile.mgov&amp;isi=1476128386&amp;ibi=kz.egov.mobile`;
       }
 
-      await startConnection(uuid);
+      await startConnection(uuidV4);
     };
 
     const startConnection = async (uuid: string) => {
@@ -560,7 +526,6 @@ export default defineComponent({
       selectedClient,
       isPaperContract,
       isScansDocuments,
-      email,
       isQr,
       qrUrl,
       scansFiles,
@@ -575,7 +540,6 @@ export default defineComponent({
       openEpayPanel,
       onFileChange,
       downloadTemplate,
-      sendTemplateToEmail,
       onFileChangeScans,
       sendFiles,
       onClearFile,
@@ -596,7 +560,6 @@ export default defineComponent({
       hasConditionsInfo,
       price,
       insuredAmount,
-      templateAction,
       isElectronicContract,
       handleSignAction,
       generateDocument,

package/composables/classes.ts

@@ -754,6 +754,7 @@ export class ProductConditions {
   statePremium5: number | string | null;
   statePremium7: number | string | null;
   calculatorForm: CalculatorForm;
+  agentCommission: number | null;
   constructor(
     insuranceCase = null,
     coverPeriod = null,
@@ -796,6 +797,7 @@ export class ProductConditions {
     statePremium5 = null,
     statePremium7 = null,
     calculatorForm = new CalculatorForm(),
+    agentCommission = null,
   ) {
     this.requestedSumInsuredInDollar = null;
     this.insurancePremiumPerMonthInDollar = null;
@@ -843,6 +845,7 @@ export class ProductConditions {
     this.statePremium5 = statePremium5;
     this.statePremium7 = statePremium7;
     this.calculatorForm = calculatorForm;
+    this.agentCommission = agentCommission;
   }
   getSingleTripDays() {
     if (this.calculatorForm.startDate && this.calculatorForm.endDate) {
@@ -1238,13 +1241,7 @@ export class FormStoreClass {
   signedContractFormData: any;
   lfb: {
     clients: ClientV2[];
-    policyholder: {
-      isIpdl: boolean;
-      clientData: {
-        company: MemberV2;
-        authoritedPerson: MemberV2;
-      };
-    };
+    policyholder: PolicyholderClass;
     hasAccidentIncidents: boolean;
     accidentIncidents: AccidentIncidents[];
     policyholderActivities: PolicyholderActivity[];
@@ -1352,13 +1349,7 @@ export class FormStoreClass {
     this.signedContractFormData = null;
     this.lfb = {
       clients: [],
-      policyholder: {
-        isIpdl: false,
-        clientData: {
-          company: new MemberV2(),
-          authoritedPerson: new MemberV2(),
-        },
-      },
+      policyholder: new PolicyholderClass(),
       hasAccidentIncidents: true,
       policyholderActivities: [new PolicyholderActivity()],
       beneficialOwners: [new BeneficialOwner()],
@@ -1453,111 +1444,144 @@ export class FormStoreClass {
   }
 }
 
-export class MemberV2 {
-  iin: string | null;
-  phoneNumber: string | null;
-  firstName?: string | null;
-  middleName?: string | null;
-  lastName?: string | null;
-  name?: string | null;
-  longName?: string | null;
-  nameKz?: string | null;
-  longNameKz?: string | null;
+export class Address {
+  country: Value;
+  region: Value;
+  regionType: Value;
+  city: Value;
+  square: string | null;
+  microdistrict: string | null;
+  street: string | null;
+  houseNumber: string | null;
+  kato: string | null;
+  longName: string | null;
+  longNameKz: string | null;
+  constructor() {
+    this.country = new Value();
+    this.region = new Value();
+    this.regionType = new Value();
+    this.city = new Value();
+    this.square = null;
+    this.microdistrict = null;
+    this.street = null;
+    this.houseNumber = null;
+    this.kato = null;
+    this.longName = null;
+    this.longNameKz = null;
+  }
+}
+
+export class PolicyholderActivity {
+  activityTypeName: string | null;
+  empoloyeeCount: string | null;
+  constructor() {
+    this.activityTypeName = null;
+    this.empoloyeeCount = null;
+  }
+}
+
+export class BaseGroupClass {
+  id: string | number;
+  longName: string;
+  iin: string;
+  phoneNumber: string;
+  age: string;
+  name: string;
+  nameKz: string;
+  longNameKz: string;
   citizenship: Value;
-  email: string | null;
+  email: string;
   resident: Value;
   taxResidentCountry: Value;
+  addTaxResidency: Value;
   economySectorCode: Value;
+  hasAttachedFile: boolean;
+  actualAddress: Address;
   isActualAddressEqualLegalAddres: boolean;
-  identityDocument?: {
+  legalAddress: Address;
+  identityDocument: {
     documentType: Value;
-    documentNumber: string | null;
-    series: string | null;
+    documentNumber: string;
+    series: string;
     issuedBy: Value;
     validUntil: string | null;
   };
-  bankInfo: {
-    bin: string | null;
-    bankName: Value;
-    iik: string | null;
-    bik: string | null;
-    kbe: string | null;
-  };
-  workDetails?: {
-    workplace: string | null;
-    position: string | null;
-    jobDuties: string | null;
-  };
-  authorityDetails: {
-    basis: string | null;
-    documentNumber: string | null;
-    date: string | null;
-  };
-  kbe: string | null;
-  typeOfEconomicActivity: Value;
-  legalAddress: Address;
-  actualAddress: Address;
-  activityTypes: {
-    activityTypeName: string | null;
-    empoloyeeCount: number | null;
-  }[];
-  isLeader?: boolean;
-  beneficalOwnerQuest?: {
-    order: number;
-    text: string | null;
-    answer: boolean | null;
-  }[];
+  bankInfo: BankInfoClass;
+  kbe: string;
   constructor() {
-    this.iin = null;
-    this.phoneNumber = null;
-    this.firstName = null;
-    this.middleName = null;
-    this.lastName = null;
-    this.name = null;
-    this.longName = null;
-    this.nameKz = null;
-    this.longNameKz = null;
+    this.id = 0;
+    this.longName = '';
+    this.iin = '';
+    this.phoneNumber = '';
+    this.age = '';
+    this.name = '';
+    this.nameKz = '';
+    this.longNameKz = '';
     this.citizenship = new Value();
-    this.email = null;
+    this.email = '';
     this.resident = new Value();
     this.taxResidentCountry = new Value();
+    this.addTaxResidency = new Value();
     this.economySectorCode = new Value();
+    this.hasAttachedFile = false;
+    this.actualAddress = new Address();
     this.isActualAddressEqualLegalAddres = true;
+    this.legalAddress = new Address();
     this.identityDocument = {
       documentType: new Value(),
-      documentNumber: null,
-      series: null,
+      documentNumber: '',
+      series: '',
       issuedBy: new Value(),
-      validUntil: null,
-    };
-    this.bankInfo = {
-      bin: null,
-      bankName: new Value(),
-      iik: null,
-      bik: null,
-      kbe: null,
-    };
-    this.workDetails = {
-      workplace: null,
-      position: null,
-      jobDuties: null,
+      validUntil: '',
     };
+    this.bankInfo = new BankInfoClass();
+    this.kbe = '';
+  }
+}
+
+export class PhysGroupClass extends BaseGroupClass {
+  lastName: string;
+  firstName: string;
+  middleName: string;
+  birthDate: string | null;
+  placeOfBirth: Value;
+  workDetails: { workplace: string; position: string; jobDuties: string };
+  hasContactPerson: boolean;
+  constructor() {
+    super();
+    this.lastName = '';
+    this.firstName = '';
+    this.middleName = '';
+    this.birthDate = '';
+    this.placeOfBirth = new Value();
+    this.workDetails = { workplace: '', position: '', jobDuties: '' };
+    this.hasContactPerson = false;
+  }
+}
+
+export class GroupMember extends PhysGroupClass {
+  isLeader: boolean;
+  authorityDetails: {
+    basis: Value;
+    documentNumber: string | null;
+    date: string | null;
+  };
+  typeOfEconomicActivity: Value;
+  activityTypes: { activityTypeName: string; empoloyeeCount: number }[];
+  beneficalOwnerQuest: { order: number; text: string; answer: boolean | null }[];
+  authoritedPerson: PhysGroupClass;
+  insuredPolicyData: InsuredPolicyType;
+  constructor() {
+    super();
+    // Client
+    this.isLeader = false;
     this.authorityDetails = {
-      basis: null,
+      basis: new Value(),
       documentNumber: null,
       date: null,
     };
-    this.kbe = null;
     this.typeOfEconomicActivity = new Value();
-    this.legalAddress = new Address();
-    this.actualAddress = new Address();
-    this.activityTypes = [
-      {
-        activityTypeName: null,
-        empoloyeeCount: null,
-      },
-    ];
-    this.isLeader = false;
+    this.activityTypes = [];
     this.beneficalOwnerQuest = [
       {
         order: 0,
@@ -1575,82 +1599,60 @@ export class MemberV2 {
         answer: null,
       },
     ];
+    this.authoritedPerson = new PhysGroupClass();
+    // Insured
+    this.insuredPolicyData = {
+      insSum: 0,
+      insSumWithLoad: 0,
+      premium: 0,
+      premiumWithLoad: 0,
+      insuredRisk: {
+        lifeMultiply: 0,
+        lifeAdditive: 0,
+        disabilityMultiply: 0,
+        disabilityAdditive: 0,
+        traumaTableMultiple: 0,
+        accidentalLifeMultiply: 0,
+        accidentalLifeAdditive: 0,
+        criticalMultiply: 0,
+        criticalAdditive: 0,
+      },
+      insuredCoverData: [],
+    };
   }
 }
 
-export class Address {
-  country: Value;
-  region: Value;
-  regionType: Value;
-  city: Value;
-  square: string | null;
-  microdistrict: string | null;
-  street: string | null;
-  houseNumber: string | null;
-  kato: string | null;
+export class BankInfoClass {
+  bankName: Value;
+  bin: string;
+  iik: string;
+  bik: string;
+  kbe: string;
   constructor() {
-    this.country = new Value();
-    this.region = new Value();
-    this.regionType = new Value();
-    this.city = new Value();
-    this.square = null;
-    this.microdistrict = null;
-    this.street = null;
-    this.houseNumber = null;
-    this.kato = null;
+    this.bankName = new Value();
+    this.bin = '';
+    this.iik = '';
+    this.bik = '';
+    this.kbe = '';
   }
 }
 
-export class PolicyholderActivity {
-  activityTypeName: string | null;
-  empoloyeeCount: string | null;
+export class PolicyholderClass {
+  isIpdl: boolean;
+  clientData: GroupMember;
   constructor() {
-    this.activityTypeName = null;
-    this.empoloyeeCount = null;
+    this.isIpdl = false;
+    this.clientData = new GroupMember();
   }
 }
 
 export class BeneficialOwner {
-  id: string | null;
-  processInstanceId: string | number;
-  insisId: number;
-  iin: string | null;
-  longName: string | null;
+  id: string;
   isIpdl: boolean;
-  isTerror: boolean;
-  isIpdlCompliance: boolean;
-  isTerrorCompliance: boolean;
-  personType: number;
-  lastName: string | null;
-  firstName: string | null;
-  middleName: string | null;
-  countryId: string | null;
-  countryName: string | null;
-  residentId: string | null;
-  residentName: string | null;
-  taxResidentId: string | null;
-  taxResidentName: string | null;
-  beneficialOwnerData: MemberV2;
+  beneficialOwnerData: GroupMember;
   constructor() {
-    this.id = null;
-    this.processInstanceId = 0;
-    this.insisId = 0;
-    this.iin = null;
-    this.longName = null;
     this.isIpdl = false;
-    this.isTerror = true;
-    this.isIpdlCompliance = true;
-    this.isTerrorCompliance = true;
-    this.personType = 0;
-    this.lastName = null;
-    this.firstName = null;
-    this.middleName = null;
-    this.countryId = null;
-    this.countryName = null;
-    this.residentId = null;
-    this.residentName = null;
-    this.taxResidentId = null;
-    this.taxResidentName = null;
-    this.beneficialOwnerData = new MemberV2();
+    this.beneficialOwnerData = new GroupMember();
+    this.id = '';
   }
 }

package/locales/ru.json

@@ -725,7 +725,11 @@
     "attachApplication": "Вложить приложение №1",
     "attachPowerOfAttorney": "Вложить доверенность",
     "noDocuments": "Нет документов для просмотра",
-    "address": "Адрес"
+    "address": "Адрес",
+    "premiumWithLoad": "Страховая премия за факт период (с нагрузкой)",
+    "premiumWithoutLoad": "Страховая премия за факт период (без нагрузки)",
+    "policyStartDate": "Дата начала действия полиса",
+    "policyEndDate": "Дата окончания действия полиса",
   },
   "placeholders": {
     "login": "Логин",
@@ -761,7 +765,8 @@
     "calculationPreliminary": "Расчет предварительный. Требуется заполнить все необходимые данные",
     "planDate": "Дата должна превышать сегодняшнюю дату",
     "iik": "ИИК должен состоять из 20 символов",
-    "dataInPast": "Указанная дата осталась в прошлом"
+    "dataInPast": "Указанная дата осталась в прошлом",
+    "agentCommission": "Агентская комиссия не должно превышать 50"
   },
   "code": "КСЭ",
   "fontSize": "Размер шрифта",
@@ -915,6 +920,7 @@
     "coveragePeriod": "Период покрытия",
     "attachScansSignDocs": "Вложить сканы подписанных документов",
     "declarationHealthInsured": "Декларация о здоровье Застрахованных",
+    "uploadInsured": "Загрузите застрахованных",
     "form": {
       "calculation": "Расчеты",
       "paymentAmount": "Размер выплаты",

package/package.json

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

package/store/data.store.ts

@@ -3,7 +3,18 @@ import { rules } from './rules';
 import { i18n } from '../configs/i18n';
 import { Toast, Types, Positions, ToastOptions } from './toast';
 import { isValidGUID, yearEnding, jwtDecode, ErrorHandler, getKeyWithPattern, getNumber, getAgeByBirthDate } from '../composables';
-import { DataStoreClass, Contragent, DocumentItem, Member, Value, CountryValue, MemberV2, PolicyholderActivity, BeneficialOwner } from '../composables/classes';
+import {
+  DataStoreClass,
+  Contragent,
+  DocumentItem,
+  Member,
+  Value,
+  CountryValue,
+  PolicyholderActivity,
+  BeneficialOwner,
+  GroupMember,
+  PolicyholderClass,
+} from '../composables/classes';
 import { ApiClass } from '../api';
 import { useFormStore } from './form.store';
 import { AxiosError } from 'axios';
@@ -1038,7 +1049,7 @@ export const useDataStore = defineStore('data', {
       if (this.isLifeBusiness) {
         conditionsData.policyAppDto.insTermInMonth = Number(this.formStore.productConditionsForm.coverPeriod);
         conditionsData.policyAppDto.fixInsSum = getNumber(String(this.formStore.productConditionsForm.requestedSumInsured));
-        conditionsData.policyAppDto.tariffId = String(this.formStore.productConditionsForm.processTariff.id);
+        conditionsData.policyAppDto.agentCommission = Number(this.formStore.productConditionsForm.agentCommission);
         conditionsData.policyAppDto.processDefinitionFgotId = (this.formStore.productConditionsForm.processGfot.id as string) ?? undefined;
       }
       return conditionsData;
@@ -1320,7 +1331,7 @@ export const useDataStore = defineStore('data', {
       }
       return this.cities;
     },
-    async getCitiesEfo(key?: string, member?: MemberV2, parentKey?: string) {
+    async getCitiesEfo(key?: string, member?: any, parentKey?: string) {
       if (this.isLifeBusiness) {
         await this.getFromApi('cities', 'getCities');
         //@ts-ignore
@@ -1784,7 +1795,7 @@ export const useDataStore = defineStore('data', {
           calculationData.insrCount = this.formStore.lfb.clients.length;
           calculationData.insTermInMonth = Number(this.formStore.productConditionsForm.coverPeriod);
           calculationData.fixInsSum = getNumber(String(this.formStore.productConditionsForm.requestedSumInsured));
-          calculationData.agentCommission = this.formStore.productConditionsForm.processTariff.id;
+          calculationData.agentCommission = Number(this.formStore.productConditionsForm.agentCommission);
           calculationData.processDefinitionFgotId = this.formStore.productConditionsForm.processGfot.id;
         }
         const calculationResponse = await this.api.calculateWithoutApplication(calculationData, this.isCalculator ? product : undefined);
@@ -1811,6 +1822,9 @@ export const useDataStore = defineStore('data', {
           this.formStore.productConditionsForm.insurancePremiumPerMonth = this.getNumberWithSpaces(calculationResponse.mainPremium);
           this.formStore.productConditionsForm.requestedSumInsured = this.getNumberWithSpaces(calculationResponse.fixInsSum === 0 ? null : calculationResponse.fixInsSum);
           this.formStore.additionalInsuranceTermsWithout = calculationResponse.addCovers;
+          if (calculationResponse.agentCommission) {
+            this.formStore.productConditionsForm.agentCommission = calculationResponse.agentCommission;
+          }
           if (calculationResponse.clients) {
             this.formStore.lfb.clients = calculationResponse.clients;
           }
@@ -3104,9 +3118,9 @@ export const useDataStore = defineStore('data', {
       const economySectorCode = this.economySectorCode.find((i: Value) => i.ids === '500003.9');
       if (economySectorCode) member.economySectorCode = economySectorCode;
     },
-    async startApplicationV2(data: any) {
+    async startApplicationV2(data: PolicyholderClass) {
       const policyholder = data.clientData;
-      if (!policyholder.authoritedPerson.iin) return false;
+      if (!policyholder.iin) return false;
       try {
         const response = await this.api.startApplication(data);
         this.sendToParent(constants.postActions.applicationCreated, response.processInstanceId);
@@ -3115,7 +3129,7 @@ export const useDataStore = defineStore('data', {
         return ErrorHandler(err);
       }
     },
-    async saveClient(policyholder: any) {
+    async saveClient(policyholder: PolicyholderClass) {
       try {
         await this.api.saveClient(this.formStore.applicationData.processInstanceId, this.formStore.lfb.clientId, policyholder);
       } catch (err) {
@@ -3156,12 +3170,12 @@ export const useDataStore = defineStore('data', {
 
         this.formStore.applicationData.processInstanceId = applicationData.processInstanceId;
         this.formStore.lfb.policyholder.isIpdl = applicationData.clientApp.isIpdl;
-        this.formStore.lfb.policyholder.clientData.company = clientData;
+        this.formStore.lfb.policyholder.clientData = clientData;
         this.formStore.lfb.policyholder.clientData.authoritedPerson = clientData.authoritedPerson;
-        this.formStore.lfb.policyholder.clientData.company.iin = reformatIin(clientData.iin);
+        this.formStore.lfb.policyholder.clientData.iin = reformatIin(clientData.iin);
         this.formStore.lfb.policyholder.clientData.authoritedPerson.iin = reformatIin(clientData.authoritedPerson.iin);
         this.formStore.lfb.clientId = clientId;
-        this.formStore.lfb.policyholder.clientData.company.authorityDetails.date = reformatDate(clientData.authorityDetails.date);
+        this.formStore.lfb.policyholder.clientData.authorityDetails.date = reformatDate(clientData.authorityDetails.date);
 
         if (clientData && clientData.activityTypes !== null) {
           this.formStore.lfb.policyholderActivities = clientData.activityTypes;
@@ -3171,6 +3185,7 @@ export const useDataStore = defineStore('data', {
           this.formStore.lfb.beneficialOwners = beneficialOwnerApp;
           this.formStore.lfb.isPolicyholderBeneficialOwner = clientData.authoritedPerson.iin.replace(/-/g, '') === beneficialOwnerApp[0].beneficialOwnerData.iin ? true : false;
           this.formStore.lfb.beneficialOwners.forEach(beneficial => {
+            beneficial.beneficialOwnerData.birthDate = reformatDate(beneficial.beneficialOwnerData.birthDate as string);
             beneficial.beneficialOwnerData.identityDocument!.validUntil = reformatDate(beneficial.beneficialOwnerData.identityDocument!.validUntil as string);
             beneficial.beneficialOwnerData.iin = reformatIin(beneficial.beneficialOwnerData.iin as string);
           });
@@ -3189,6 +3204,7 @@ export const useDataStore = defineStore('data', {
           });
         }
 
+        this.formStore.productConditionsForm.agentCommission = applicationData.policyAppDto.agentCommission === 0 ? null : applicationData.policyAppDto.agentCommission;
         this.formStore.productConditionsForm.coverPeriod = 12;
         this.formStore.productConditionsForm.requestedSumInsured = this.getNumberWithSpaces(applicationData.policyAppDto.amount === 0 ? null : applicationData.policyAppDto.amount);
         this.formStore.productConditionsForm.insurancePremiumPerMonth = this.getNumberWithSpaces(
@@ -3196,8 +3212,8 @@ export const useDataStore = defineStore('data', {
         );
         const paymentPeriod = this.processPaymentPeriod.find(item => item.id == applicationData.policyAppDto.paymentPeriodId);
         this.formStore.productConditionsForm.paymentPeriod = paymentPeriod ? paymentPeriod : new Value();
-        const processTariff = this.processTariff.find(item => item.id == applicationData.policyAppDto.tariffId);
-        this.formStore.productConditionsForm.processTariff = processTariff ? processTariff : new Value();
+        // const processTariff = this.processTariff.find(item => item.id == applicationData.policyAppDto.tariffId);
+        // this.formStore.productConditionsForm.processTariff = processTariff ? processTariff : new Value();
         const processGfot = this.processGfot.find(item => item.id == applicationData.policyAppDto.processDefinitionFgotId);
         this.formStore.productConditionsForm.processGfot = processGfot ? processGfot : new Value();
       } catch (err) {
@@ -3218,9 +3234,9 @@ export const useDataStore = defineStore('data', {
         return ErrorHandler(err);
       }
     },
-    async saveClientAcivityTypes(data: PolicyholderActivity[]) {
+    async saveClientActivityTypes(data: PolicyholderActivity[]) {
       try {
-        const response = await this.api.saveClientAcivityTypes(this.formStore.applicationData.clientApp.id, data);
+        const response = await this.api.saveClientActivityTypes(this.formStore.applicationData.clientApp.id, data);
         return response;
       } catch (err) {
         return ErrorHandler(err);
@@ -3236,7 +3252,7 @@ export const useDataStore = defineStore('data', {
     },
     async saveBeneficialOwner(beneficialOwner: BeneficialOwner) {
       try {
-        const response = await this.api.saveBeneficialOwner(this.formStore.applicationData.processInstanceId, beneficialOwner.id, beneficialOwner);
+        const response = await this.api.saveBeneficialOwner(this.formStore.applicationData.processInstanceId, String(beneficialOwner.id), beneficialOwner);
         return response;
       } catch (err) {
         return ErrorHandler(err);
@@ -3265,7 +3281,7 @@ export const useDataStore = defineStore('data', {
           id: index,
           fullName: client.longName,
           gender: client.gender,
-          position: item.workDetails?.position,
+          position: client.workDetails.position,
           birthDate: client.birthDate,
           iin: reformatIin(client.iin),
           insSum: client.insuredPolicyData.insSum,
@@ -3323,7 +3339,7 @@ export const useDataStore = defineStore('data', {
         if (this.validateMultipleMembersV2('beneficialOwners', 'beneficialOwnerApp', 'бенефициарных собственников') === false) {
           return false;
         }
-        const inStatement = this.formStore.lfb.beneficialOwners.every(i => i.id !== null);
+        const inStatement = this.formStore.lfb.beneficialOwners.every(i => i.beneficialOwnerData.id !== null);
         if (inStatement === false) {
           this.showToaster('error', this.t('toaster.requiredMember', { text: this.t('toaster.beneficialOwner') }));
           return false;

package/store/rules.ts

@@ -9,6 +9,7 @@ export const rules = {
   recalculationAdditive: [(v: any) => (v !== null && v !== '' && v <= 100 && v >= 0) || t('toaster.valueShouldBeBetween', { floor: '0', ceil: '100' })],
   required: [(v: any) => !!v || t('rules.required')],
   iik: [(v: any) => v.length === 20 || t('rules.iik')],
+  agentCommission: [(v: any) => v <= 50 || t('rules.agentCommission')],
   objectRequired: [
     (v: any) => {
       if (!!v && 'nameRu' in v && v.nameRu != null) {

package/types/enum.ts

@@ -40,9 +40,6 @@ export enum Actions {
   affiliate = 'affiliate',
   affiliateCustom = 'affiliateCustom',
 
-  template = 'template',
-  templateCustom = 'templateCustom',
-
   chooseSign = 'chooseSign',
   chooseSignCustom = 'chooseSignCustom',
 }

package/types/index.ts

@@ -81,6 +81,7 @@ declare global {
     status: string;
     userId: string;
     userName: string;
+    level?: string;
   }
   type TaskHistory = {
     appointmentDate: string | null;
@@ -267,7 +268,7 @@ declare global {
     fixInsSum?: number | null;
     tariffId?: string | number | null;
     clients?: ClientV2[];
-    agentCommission?: any;
+    agentCommission?: number | null;
     processDefinitionFgotId?: any;
   };
 
@@ -306,6 +307,7 @@ declare global {
     mainPremium?: number;
     clients?: ClientV2[];
     fixInsSum?: number | null;
+    agentCommission?: number | null;
   };
 
   interface AddCover {
@@ -320,9 +322,9 @@ declare global {
     amount: number;
     premium: number;
     isMigrate: boolean;
-    coverPeriodId?: string;
-    coverPeriodName?: string;
-    coverPeriodCode?: string;
+    coverPeriodId?: string | null;
+    coverPeriodName?: string | null;
+    coverPeriodCode?: string | null;
     calculatorValue?: number;
     coverTypeNameRu?: string;
     coverTypeNameKz?: string;
@@ -572,6 +574,7 @@ declare global {
     mainPremium?: number | string | null;
     processDefinitionFgotId?: string | number;
     mainInsSum?: number;
+    agentCommission?: number | null;
   };
 
   type InsisWorkDataApp = {
@@ -714,4 +717,26 @@ declare global {
   type LabelSize = 1 | 2 | 3 | 4 | 5 | 6 | 7 | 8 | 9 | 10 | 11;
 
   type VuetifyAnimations = 'expand' | 'fab' | 'fade' | 'scale' | 'scroll-x' | 'scroll-y' | 'slide-x' | 'slide-x-r' | 'slide-y' | 'slide-y-r';
+
+  type InsuredPolicyType = {
+    insSum: number;
+    insSumWithLoad: number;
+    premium: number;
+    premiumWithLoad: number;
+    insuredRisk: {
+      lifeMultiply: number;
+      lifeAdditive: number;
+      disabilityMultiply: number;
+      disabilityAdditive: number;
+      traumaTableMultiple: number;
+      accidentalLifeMultiply: number;
+      accidentalLifeAdditive: number;
+      criticalMultiply: number;
+      criticalAdditive: number;
+    };
+    insuredCoverData: {
+      coverTypeEnum: number;
+      prmeium: number;
+    }[];
+  };
 }