hl-core 0.0.9-beta.7 → 0.0.9-beta.8

package/components/Dialog/Dialog.vue

@@ -1,25 +1,18 @@
 <template>
   <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/5 xl:w-[600px] rounded-lg !px-10 !py-9">
-      <div class="flex gap-6">
-        <div v-if="Object.keys(icon).length" class="h-14 w-14 flex items-center justify-center text-[20px]" :class="[$styles.rounded, icon.color, icon.bg]">
-          <v-icon :icon="icon.mdi"></v-icon>
-        </div>
-        <div class="h-full">
-          <v-card-title class="!p-0">
-            <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 class="!px-0 !pt-2">
-            <slot v-if="!subtitle" name="subtitle"></slot>
-            {{ subtitle }}
-          </v-card-subtitle>
-        </div>
-      </div>
-      <v-card-actions class="gap-[16px] !p-0 !mt-6">
-        <base-btn v-if="actions === 'default'" class="h-[44px]" :text="$dataStore.t('confirm.yes')" :btn="$styles.whiteBtnBlueBr" @click="$emit('yes')" />
-        <base-btn v-if="actions === 'default'" class="h-[44px]" :text="$dataStore.t('confirm.no')" :btn="$styles.blueBtn" @click="$emit('no')" />
+    <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] m-2">
+        <base-btn v-if="actions === 'default'" class="!w-fit px-6" size="sm" :text="$dataStore.t('confirm.yes')" :btn="$styles.blueBtn" @click="$emit('yes')" />
+        <base-btn v-if="actions === 'default'" class="!w-fit px-6" size="sm" :text="$dataStore.t('confirm.no')" :btn="$styles.blueBtn" @click="$emit('no')" />
         <slot v-if="actions !== 'default'" name="actions"></slot>
       </v-card-actions>
     </v-card>
@@ -47,10 +40,6 @@ export default defineComponent({
       type: String,
       default: 'default',
     },
-    icon: {
-      type: Object as PropType<{ mdi: string; color: string; bg: string }>,
-      default: { mdi: 'mdi-circle-outline', color: 'text-[#FFF]', bg: 'bg-[#EEEEEE]' },
-    },
   },
   emits: ['update:modelValue', 'yes', 'no'],
 });

package/components/Form/ManagerAttachment.vue

@@ -7,7 +7,7 @@
       <base-panel-input
         class="pl-1"
         v-model="formStore.SaleChanellPolicy"
-        :value="formStore.SaleChanellPolicy.nameRu"
+        :value="formStore.SaleChanellPolicy?.nameRu"
         :readonly="isReadonly"
         :clearable="!isReadonly"
         :label="$dataStore.t('form.salesChanell')"
@@ -18,7 +18,7 @@
       <base-panel-input
         class="pl-1"
         v-model="formStore.RegionPolicy"
-        :value="formStore.RegionPolicy.nameRu"
+        :value="formStore.RegionPolicy?.nameRu"
         :readonly="isReadonly"
         :clearable="!isReadonly"
         :label="$dataStore.t('form.Region')"
@@ -29,7 +29,7 @@
       <base-panel-input
         class="pl-1"
         v-model="formStore.ManagerPolicy"
-        :value="formStore.ManagerPolicy.nameRu"
+        :value="formStore.ManagerPolicy?.nameRu"
         :readonly="isReadonly"
         :clearable="!isReadonly"
         :label="$dataStore.t('form.manager')"
@@ -40,7 +40,7 @@
       <base-panel-input
         class="pl-1"
         v-model="formStore.AgentData"
-        :value="formStore.AgentData.fullName"
+        :value="formStore.AgentData?.fullName"
         :readonly="isReadonly"
         :clearable="!isReadonly"
         :label="$dataStore.t('form.agent')"

package/components/Pages/ContragentForm.vue

@@ -51,7 +51,7 @@
         <base-form-input v-model="member.age" :label="$dataStore.t('form.age')" :readonly="disabled" :clearable="!disabled" :rules="$rules.numbers.concat($rules.age18)" />
         <base-panel-input
           v-model="member.gender"
-          :value="member.gender.nameRu"
+          :value="member.gender?.nameRu"
           :readonly="disabled"
           :clearable="!disabled"
           :label="$dataStore.t('form.gender')"
@@ -68,7 +68,7 @@
       <base-form-section :title="$dataStore.t('form.placeRegistration')">
         <base-panel-input
           v-model="member.registrationCountry"
-          :value="member.registrationCountry.nameRu"
+          :value="member.registrationCountry?.nameRu"
           :label="$dataStore.t('form.Country')"
           :readonly="disabled"
           :clearable="!disabled"
@@ -80,7 +80,7 @@
           <div class="flex flex-col gap-[1px]" v-if="member.registrationCountry.nameRu === 'Казахстан' || member.registrationCountry.nameRu === null">
             <base-panel-input
               v-model="member.registrationProvince"
-              :value="member.registrationProvince.nameRu"
+              :value="member.registrationProvince?.nameRu"
               :label="$dataStore.t('form.Province')"
               :readonly="disabled"
               :clearable="!disabled"
@@ -90,7 +90,7 @@
             />
             <base-panel-input
               v-model="member.registrationRegionType"
-              :value="member.registrationRegionType.nameRu"
+              :value="member.registrationRegionType?.nameRu"
               :label="$dataStore.t('form.RegionType')"
               :readonly="disabled"
               :clearable="!disabled"
@@ -101,7 +101,7 @@
             <base-panel-input
               v-if="member.registrationRegionType.nameRu !== 'город'"
               v-model="member.registrationRegion"
-              :value="member.registrationRegion.nameRu"
+              :value="member.registrationRegion?.nameRu"
               :label="$dataStore.t('form.Region')"
               :readonly="disabled"
               :clearable="!disabled"
@@ -111,7 +111,7 @@
             />
             <base-panel-input
               v-model="member.registrationCity"
-              :value="member.registrationCity.nameRu"
+              :value="member.registrationCity?.nameRu"
               :label="$dataStore.t('form.City')"
               :readonly="disabled"
               :clearable="!disabled"
@@ -136,7 +136,7 @@
       <base-form-section :title="$dataStore.t('form.birthData')">
         <base-panel-input
           v-model="member.birthPlace"
-          :value="member.birthPlace.nameRu"
+          :value="member.birthPlace?.nameRu"
           :label="$dataStore.t('form.Country')"
           :readonly="disabled"
           :clearable="!disabled"
@@ -148,7 +148,7 @@
       <base-form-section :title="$dataStore.t('form.documentData')">
         <base-panel-input
           v-model="member.documentType"
-          :value="member.documentType.nameRu"
+          :value="member.documentType?.nameRu"
           :label="$dataStore.t('form.documentType')"
           :readonly="disabled"
           :clearable="!disabled"
@@ -164,7 +164,7 @@
         </base-empty-form-field> -->
         <base-panel-input
           v-model="member.documentIssuers"
-          :value="member.documentIssuers.nameRu"
+          :value="member.documentIssuers?.nameRu"
           :label="$dataStore.t('form.documentIssuers')"
           :readonly="disabled"
           :clearable="!disabled"
@@ -195,7 +195,7 @@
         </base-fade-transition>
         <base-panel-input
           v-model="member.signOfResidency"
-          :value="member.signOfResidency.nameRu"
+          :value="member.signOfResidency?.nameRu"
           :label="$dataStore.t('form.signOfResidency')"
           :readonly="disabled"
           :clearable="!disabled"
@@ -205,7 +205,7 @@
         />
         <base-panel-input
           v-model="member.countryOfTaxResidency"
-          :value="member.countryOfTaxResidency.nameRu"
+          :value="member.countryOfTaxResidency?.nameRu"
           :label="$dataStore.t('form.countryOfTaxResidency')"
           :readonly="disabled"
           :clearable="!disabled"
@@ -217,7 +217,7 @@
           <base-panel-input
             v-if="member.countryOfTaxResidency.ids === '500014.3'"
             v-model="member.addTaxResidency"
-            :value="member.addTaxResidency.nameRu"
+            :value="member.addTaxResidency?.nameRu"
             :label="$dataStore.t('form.addTaxResidency')"
             :readonly="disabled"
             :clearable="!disabled"
@@ -228,7 +228,7 @@
         </base-fade-transition>
         <base-panel-input
           v-model="member.countryOfCitizenship"
-          :value="member.countryOfCitizenship.nameRu"
+          :value="member.countryOfCitizenship?.nameRu"
           :label="$dataStore.t('form.countryOfCitizenship')"
           :readonly="disabled"
           :clearable="!disabled"
@@ -238,7 +238,7 @@
         />
         <base-panel-input
           v-model="member.economySectorCode"
-          :value="member.economySectorCode.nameRu"
+          :value="member.economySectorCode?.nameRu"
           :label="$dataStore.t('form.economySectorCode')"
           :readonly="disabled"
           :clearable="!disabled"

package/components/Pages/MemberForm.vue

@@ -82,7 +82,7 @@
         <base-form-input v-model="member.age" :label="$dataStore.t('form.age')" :readonly="true" :clearable="!isDisabled" :rules="ageRule" />
         <base-panel-input
           v-model="member.gender"
-          :value="member.gender.nameRu"
+          :value="member.gender?.nameRu"
           :readonly="isDisabled || isFromGBD"
           :clearable="!isDisabled"
           :label="$dataStore.t('form.gender')"
@@ -93,7 +93,7 @@
         <base-panel-input
           v-if="hasFamilyStatus"
           v-model="member.familyStatus"
-          :value="member.familyStatus.nameRu"
+          :value="member.familyStatus?.nameRu"
           :readonly="isDisabled"
           :clearable="!isDisabled"
           :label="$dataStore.t('form.familyStatus')"
@@ -104,7 +104,7 @@
         <base-panel-input
           v-if="(whichForm === formStore.beneficiaryFormKey || whichForm === formStore.insuredFormKey) && member.iin !== formStore.policyholderForm.iin"
           v-model="member.relationDegree"
-          :value="member.relationDegree.nameRu"
+          :value="member.relationDegree?.nameRu"
           :readonly="isDisabled"
           :clearable="!isDisabled"
           :label="$dataStore.t('form.relations')"
@@ -240,7 +240,7 @@
         <base-form-toggle v-if="hasSameAddressToggle" v-model="sameAddress" :disabled="isDisabled" :has-border="false" :title="$dataStore.t('form.sameAddress')" />
         <base-panel-input
           v-model="member.registrationCountry"
-          :value="member.registrationCountry.nameRu"
+          :value="member.registrationCountry?.nameRu"
           :readonly="isDisabled"
           :clearable="!isDisabled"
           :label="$dataStore.t('form.Country')"
@@ -252,7 +252,7 @@
           <div class="flex flex-col gap-[1px]" v-if="member.registrationCountry.nameRu === 'Казахстан' || member.registrationCountry.nameRu === null">
             <base-panel-input
               v-model="member.registrationProvince"
-              :value="member.registrationProvince.nameRu"
+              :value="member.registrationProvince?.nameRu"
               :label="$dataStore.t('form.Province')"
               :readonly="isDisabled"
               :clearable="!isDisabled"
@@ -262,7 +262,7 @@
             />
             <base-panel-input
               v-model="member.registrationRegionType"
-              :value="member.registrationRegionType.nameRu"
+              :value="member.registrationRegionType?.nameRu"
               :label="$dataStore.t('form.RegionType')"
               :readonly="isDisabled"
               :clearable="!isDisabled"
@@ -273,7 +273,7 @@
             <base-panel-input
               v-if="member.registrationRegionType.nameRu !== 'город'"
               v-model="member.registrationRegion"
-              :value="member.registrationRegion.nameRu"
+              :value="member.registrationRegion?.nameRu"
               :label="$dataStore.t('form.Region')"
               :readonly="isDisabled"
               :clearable="!isDisabled"
@@ -283,7 +283,7 @@
             />
             <base-panel-input
               v-model="member.registrationCity"
-              :value="member.registrationCity.nameRu"
+              :value="member.registrationCity?.nameRu"
               :label="$dataStore.t('form.City')"
               :readonly="isDisabled"
               :clearable="!isDisabled"
@@ -316,7 +316,7 @@
       <base-form-section :title="$dataStore.t('form.birthData')" v-if="$dataStore.hasBirthSection(whichForm)">
         <base-panel-input
           v-model="member.birthPlace"
-          :value="member.birthPlace.nameRu"
+          :value="member.birthPlace?.nameRu"
           :label="$dataStore.t('form.Country')"
           :readonly="isDisabled"
           :clearable="!isDisabled"
@@ -327,7 +327,7 @@
         <!-- TODO -->
         <!-- <base-panel-input
           v-model="member.birthRegion"
-          :value="member.birthRegion.nameRu"
+          :value="member.birthRegion?.nameRu"
           :label="$dataStore.t('form.Region')"
           :readonly="isDisabled"
           :clearable="!isDisabled"
@@ -339,7 +339,7 @@
       <base-form-section :title="$dataStore.t('form.documentData')" v-if="$dataStore.hasDocumentSection(whichForm)">
         <base-panel-input
           v-model="member.documentType"
-          :value="member.documentType.nameRu"
+          :value="member.documentType?.nameRu"
           :label="$dataStore.t('form.documentType')"
           :readonly="isDisabled"
           :clearable="!isDisabled"
@@ -361,7 +361,7 @@
         </base-empty-form-field> -->
         <base-panel-input
           v-model="member.documentIssuers"
-          :value="member.documentIssuers.nameRu"
+          :value="member.documentIssuers?.nameRu"
           :label="$dataStore.t('form.documentIssuers')"
           :readonly="isDisabled"
           :clearable="!isDisabled"
@@ -392,7 +392,7 @@
         </base-fade-transition>
         <base-panel-input
           v-model="member.signOfResidency"
-          :value="member.signOfResidency.nameRu"
+          :value="member.signOfResidency?.nameRu"
           :label="$dataStore.t('form.signOfResidency')"
           :readonly="isDisabled"
           :clearable="!isDisabled"
@@ -402,7 +402,7 @@
         />
         <base-panel-input
           v-model="member.countryOfTaxResidency"
-          :value="member.countryOfTaxResidency.nameRu"
+          :value="member.countryOfTaxResidency?.nameRu"
           :label="$dataStore.t('form.countryOfTaxResidency')"
           :readonly="isDisabled"
           :clearable="!isDisabled"
@@ -414,7 +414,7 @@
           <base-panel-input
             v-if="member.countryOfTaxResidency.ids === '500014.3'"
             v-model="member.addTaxResidency"
-            :value="member.addTaxResidency.nameRu"
+            :value="member.addTaxResidency?.nameRu"
             :label="$dataStore.t('form.addTaxResidency')"
             :readonly="isDisabled"
             :clearable="!isDisabled"
@@ -426,7 +426,7 @@
         <base-panel-input
           v-if="hasSignOfIPDL"
           v-model="member.signOfIPDL"
-          :value="member.signOfIPDL.nameRu"
+          :value="member.signOfIPDL?.nameRu"
           :label="$dataStore.t('form.signOfIPDL')"
           :readonly="isDisabled"
           :clearable="!isDisabled"
@@ -436,7 +436,7 @@
         />
         <base-panel-input
           v-model="member.countryOfCitizenship"
-          :value="member.countryOfCitizenship.nameRu"
+          :value="member.countryOfCitizenship?.nameRu"
           :label="$dataStore.t('form.countryOfCitizenship')"
           :readonly="isDisabled"
           :clearable="!isDisabled"
@@ -446,7 +446,7 @@
         />
         <base-panel-input
           v-model="member.economySectorCode"
-          :value="member.economySectorCode.nameRu"
+          :value="member.economySectorCode?.nameRu"
           :label="$dataStore.t('form.economySectorCode')"
           :readonly="isDisabled"
           :clearable="!isDisabled"
@@ -457,7 +457,7 @@
         <base-panel-input
           v-if="hasInsurancePay"
           v-model="member.insurancePay"
-          :value="member.insurancePay.nameRu"
+          :value="member.insurancePay?.nameRu"
           :readonly="isDisabled"
           :clearable="!isDisabled"
           :rules="$rules.objectRequired"

package/components/Pages/ProductConditions.vue

@@ -101,7 +101,7 @@
         <base-panel-input
           v-if="hasRiskGroup"
           v-model="productConditionsForm.riskGroup"
-          :value="productConditionsForm.riskGroup.nameRu"
+          :value="productConditionsForm.riskGroup?.nameRu"
           :label="$dataStore.t('productConditionsForm.riskGroup')"
           :clearable="isRecalculationDisabled === false"
           :readonly="isRecalculationDisabled"
@@ -130,7 +130,7 @@
           />
           <base-panel-input
             v-model="productConditionsForm.gender"
-            :value="productConditionsForm.gender.nameRu"
+            :value="productConditionsForm.gender?.nameRu"
             :readonly="isDisabled"
             :clearable="!isDisabled"
             :label="$dataStore.t('form.gender')"
@@ -150,7 +150,7 @@
         <base-panel-input
           v-if="hasPaymentPeriod"
           v-model="productConditionsForm.paymentPeriod"
-          :value="productConditionsForm.paymentPeriod.nameRu"
+          :value="productConditionsForm.paymentPeriod?.nameRu"
           :readonly="isDisabled"
           :clearable="!isDisabled"
           :rules="$rules.objectRequired"
@@ -161,7 +161,7 @@
         <base-panel-input
           v-if="hasProcessIndexRate"
           v-model="productConditionsForm.processIndexRate"
-          :value="productConditionsForm.processIndexRate.nameRu"
+          :value="productConditionsForm.processIndexRate?.nameRu"
           :readonly="isDisabled"
           :clearable="!isDisabled"
           :rules="$rules.objectRequired"
@@ -240,7 +240,7 @@
         />
         <base-panel-input
           v-model="productConditionsForm.typeAnnuityInsurance"
-          :value="productConditionsForm.typeAnnuityInsurance.nameRu"
+          :value="productConditionsForm.typeAnnuityInsurance?.nameRu"
           :readonly="isDisabled"
           :clearable="!isDisabled"
           :rules="$rules.objectRequired"
@@ -258,7 +258,7 @@
         />
         <base-panel-input
           v-model="productConditionsForm.periodAnnuityPayment"
-          :value="productConditionsForm.periodAnnuityPayment.nameRu"
+          :value="productConditionsForm.periodAnnuityPayment?.nameRu"
           :readonly="isDisabled"
           :clearable="!isDisabled"
           :rules="$rules.objectRequired"

package/composables/styles.ts

@@ -78,6 +78,7 @@ export class Styles {
   flexColNav: string;
   emptyBlockCol: string;
   scrollPage: string;
+  flexCenter: string = 'flex items-center justify-center';
 
   // Muted or disabled
   mutedText: string = '!text-[#99A3B3]';

package/locales/ru.json

@@ -299,6 +299,8 @@
     "userFullName": "Исполнитель"
   },
   "agent": {
+    "currency": "Валюта",
+    "programName": "Программа",
     "menu": "Меню",
     "main": "Главное",
     "reports": "Отчеты",
@@ -352,6 +354,7 @@
     "unallocation": {
       "paymentId": "ID платежа",
       "voucherNumber": "Номер ваучера",
+      "voucherSum": "Сумма",
       "voucherDate": "Дата ваучера",
       "voucherStatus": "Статус ваучера"
     },
@@ -389,6 +392,7 @@
     "new": "Подать заявление"
   },
   "labels": {
+    "inAll": "Всего",
     "sorting": "Сортировка",
     "premiumSum": "Сумма премии",
     "department": "Департамент",

package/package.json

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

package/store/data.store.ts

@@ -1330,6 +1330,11 @@ export const useDataStore = defineStore('data', {
     getNumberWithSpaces(n: any) {
       return n === null ? null : Number((typeof n === 'string' ? n : n.toFixed().toString()).replace(/[^0-9]+/g, '')).toLocaleString('ru');
     },
+    getNumberWithSpacesAfterComma(n: number) {
+      let parts = n.toFixed(2).split('.');
+      parts[0] = parts[0].replace(/\B(?=(\d{3})+(?!\d))/g, ' ');
+      return parts.join(',');
+    },
     getNumberWithDot(n: any) {
       return n === null ? null : n.toLocaleString('ru', { maximumFractionDigits: 2, minimumFractionDigits: 2 }).replace(/,/g, '.');
     },