hl-core 0.0.8-beta.16 → 0.0.8-beta.17

package/components/Form/FormBlock.vue

@@ -61,7 +61,7 @@
     <div
       v-if="isMultiple && more && !isShort"
       :class="[$libStyles.blueBg, $libStyles.whiteText, $libStyles.textSimple, disabled ? $libStyles.disabled : 'cursor-pointer']"
-      class="rounded-b-lg h-[36px] flex items-center font-medium justify-center"
+      class="transition-all rounded-b-lg h-[36px] flex items-center font-medium justify-center opacity-50 hover:opacity-90"
       @click="!disabled && memberStore.addMember(whichForm)"
     >
       {{ $t('buttons.add') }}

package/components/Input/PanelInput.vue

@@ -21,6 +21,7 @@
     :prepend-inner-icon="prependInnerIcon ? prependInnerIcon : ''"
     :append-inner-icon="appendInnerIcon ? appendInnerIcon : ''"
     :bg-color="bgColor ? bgColor : ''"
+    :suffix="suffix"
     @keyup.enter.prevent="submitted"
     @click:control="!props.readonly && $emit('append')"
     @click:clear="(props.readonly ? false : clearable) && $emit('update:modelValue', new Value())"
@@ -115,6 +116,10 @@ export default defineComponent({
     bgColor: {
       type: String,
     },
+    suffix: {
+      type: String,
+      default: '',
+    },
   },
   emits: ['update:modelValue', 'submitted', 'prepend', 'append', 'prepend-out', 'append-out', 'clear'],
 

package/components/Layout/Header.vue

@@ -1,8 +1,14 @@
 <template>
   <header class="relative w-full h-[70px] text-center font-medium align-middle flex items-center border-b-[1px]" :class="[$libStyles.blueBgLight, $libStyles.textSimple]">
-    <i v-if="hasBack" @click="$emit('onBack')" class="absolute left-5 mdi text-xl cursor-pointer" :class="[backIcon]"></i>
+    <i v-if="hasBack" @click="$emit('onBack')" class="absolute left-5 mdi text-xl cursor-pointer transition-all" :class="[backIcon, backIconAnim]"></i>
     <span class="mx-10">{{ title }}</span>
-    <i v-if="hasMore" @click="$emit('onMore')" class="mdi absolute right-5 text-xl cursor-pointer" :class="[moreIcon, hideMoreOnLg ? 'lg:!hidden' : '']"> </i>
+    <i
+      v-if="hasMore"
+      @click="$emit('onMore')"
+      class="mdi absolute right-5 text-xl cursor-pointer transition-all"
+      :class="[moreIcon, hideMoreOnLg ? 'lg:!hidden' : '', moreIconAnim]"
+    >
+    </i>
   </header>
 </template>
 
@@ -35,14 +41,44 @@ export default defineComponent({
     },
   },
   emits: ['onBack', 'onMore'],
-  setup() {
+  setup(props) {
     const dataStore = useDataStore();
 
     const onClickOutside = () => {
       dataStore.settings.open = false;
     };
 
-    return { onClickOutside };
+    const backIconAnim = computed(() => {
+      const icon = props.backIcon;
+      switch (icon) {
+        case 'mdi-arrow-left':
+        case 'mdi-account-arrow-left':
+          return 'hover:-translate-x-[2px]';
+        case 'mdi-close':
+          return 'hover:scale-110';
+        default:
+          return '';
+      }
+    });
+
+    const moreIconAnim = computed(() => {
+      const icon = props.moreIcon;
+      switch (icon) {
+        case 'mdi-cog-outline':
+          return 'hover:rotate-[30deg]';
+        default:
+          return '';
+      }
+    });
+
+    return {
+      // Computed
+      backIconAnim,
+      moreIconAnim,
+
+      // Functions
+      onClickOutside,
+    };
   },
 });
 </script>

package/components/Pages/Anketa.vue

@@ -45,7 +45,11 @@
             <span :class="[$libStyles.textTitle]" class="border-b-[1px] border-b-[#F3F6FC] p-6 flex items-center justify-between">
               {{ question.first.name }}
               <base-fade-transition>
-                <i v-if="question.first.answerName === 'Да' && secondQuestionList" class="mdi mdi-chevron-right text-2xl cursor-pointer" @click="openFirstPanel(question)"></i>
+                <i
+                  v-if="question.first.answerName === 'Да' && secondQuestionList && secondQuestionList.length"
+                  class="mdi mdi-chevron-right text-2xl cursor-pointer"
+                  @click="openFirstPanel(question)"
+                ></i>
               </base-fade-transition>
             </span>
             <div class="flex items-center justify-start gap-5 px-4 pt-4" :class="[$libStyles.textSimple]">

package/components/Pages/Auth.vue

@@ -17,7 +17,7 @@
     </aside>
     <section v-if="isLogin" class="w-full lg:w-3/4 flex flex-col justify-center">
       <img :class="{ '!block': !$display().lgAndUp.value }" draggable="false" class="hidden w-2/4 sm:w-1/3 mb-10 self-center" src="~/assets/auth-logo.svg" />
-      <div class="flex flex-col items-center mb-8">
+      <div class="flex flex-col items-center mb-8 text-center">
         <h1 class="text-[28px] font-medium mb-1">{{ $t('labels.welcomeHL') }}</h1>
         <span :class="[$libStyles.greyTextDark]" class="text-[16px]">{{ $t('labels.needAuth') }}</span>
       </div>
@@ -53,8 +53,8 @@
         <h1 class="text-[28px] font-medium mb-1">{{ $t('labels.resetPassword') }}</h1>
         <span :class="[$libStyles.greyTextDark]" class="text-[16px]">{{ $t('labels.resetType') }}</span>
       </div>
-      <div class="p-[2px] mb-8 rounded-[12px] border-[1px]" :class="[$libStyles.whiteBg]">
-        <v-tabs v-model="resetPasswordType" density="compact" slider-color="#009c73" class="base-reset-password rounded-[12px] w-2/3 lg:w-[25vw]" :class="[$libStyles.whiteBg]">
+      <div class="p-[2px] mb-8 rounded-[12px] border-[1px] w-2/3 lg:w-[25vw]" :class="[$libStyles.whiteBg]">
+        <v-tabs v-model="resetPasswordType" density="compact" slider-color="#009c73" class="w-full base-reset-password rounded-[12px]" :class="[$libStyles.whiteBg]">
           <v-tab :ripple="false" value="phone"> {{ $t('form.phoneNumber') }} </v-tab>
           <v-tab :ripple="false" value="email"> {{ $t('form.email') }} </v-tab>
         </v-tabs>

package/components/Pages/MemberForm.vue

@@ -968,6 +968,9 @@ export default {
         }
       }
       const memberFromApplicaiton = memberStore.getMemberFromApplication(whichForm.value as MemberKeys, whichIndex.value ? Number(whichIndex.value) : undefined);
+      if (typeof member.value.id !== 'number' || (typeof member.value.id === 'number' && member.value.id > 0 === false)) {
+        return false;
+      }
       const isSaved = await dataStore.saveMember(member.value, memberStore.getMemberCode(whichForm.value as MemberKeys), memberFromApplicaiton);
       if (!isSaved) return false;
       if (whichForm.value === formStore.policyholderFormKey) {
@@ -1086,6 +1089,21 @@ export default {
       }
     };
 
+    const setDefaultValues = async () => {
+      const setDefaults = dataStore.controls.setDefaults;
+      if (setDefaults.sectorCode) {
+        await setSectorCode();
+      }
+    };
+
+    const setSectorCode = async () => {
+      if (member.value.id === 0 && route.query.id === '0') {
+        const sectorList = await dataStore.getSectorCodeList();
+        const defaultValue = sectorList.find(item => item.ids === '500003.9') as Value;
+        member.value.economySectorCode = defaultValue ? defaultValue : new Value();
+      }
+    };
+
     const onInit = async () => {
       if (route.params.taskId === '0' || (route.params.taskId !== '0' && dataStore.isProcessEditable(formStore.applicationData.statusCode))) {
         await dataStore.getSignedDocList(formStore.applicationData.processInstanceId);
@@ -1108,6 +1126,7 @@ export default {
         const filteredDocuments: DocumentItem[] = dataStore.getFilesByIIN(member.value.iin!.replace(/-/g, '')) as DocumentItem[];
         if (filteredDocuments && filteredDocuments.length) memberDocument.value = filteredDocuments[0];
       }
+      await setDefaultValues();
     };
 
     onMounted(async () => {

package/components/Pages/ProductConditions.vue

@@ -198,6 +198,7 @@
             :clearable="!isDisabled"
             :label="term.coverTypeName"
             append-inner-icon="mdi mdi-chevron-right"
+            :suffix="!!term.amount ? `${$dataStore.getNumberWithSpaces(term.amount)} ${$constants.currencySymbols.kzt}` : ''"
             @append="openTermPanel(term.coverTypeName, $dataStore.getAdditionalInsuranceTermsAnswers, term.coverTypeId, index)"
           ></base-panel-input>
         </div>

package/composables/classes.ts

@@ -780,10 +780,16 @@ export class ProductConditions {
 export class MemberSettings {
   has?: boolean;
   isMultiple?: boolean;
-  constructor(options?: { has?: boolean; isMultiple?: boolean }) {
+  required?: boolean;
+  constructor(options?: { has?: boolean; isMultiple?: boolean; required?: boolean }) {
     if (options) {
       this.has = options.has;
       this.isMultiple = options.isMultiple;
+      if (this.has === true) {
+        this.required = options.required;
+      } else {
+        this.required = false;
+      }
     }
   }
 }
@@ -791,6 +797,10 @@ export class MemberSettings {
 export class DataStoreClass {
   // IMP Контроллер фич
   controls: {
+    // Cтавит значения по дефолту полям
+    setDefaults: {
+      sectorCode: boolean;
+    };
     // Проверка на роль при авторизации
     onAuth: boolean;
     // Согласие на главной странице
@@ -926,6 +936,9 @@ export class DataStoreClass {
       spokesmanApp: new MemberSettings(),
     };
     this.controls = {
+      setDefaults: {
+        sectorCode: true,
+      },
       onAuth: false,
       hasAnketa: true,
       hasAgreement: true,

package/locales/en.json

@@ -89,7 +89,13 @@
     "needToRecalculate": "You need to recalculate the product conditions",
     "noUrl": "No link available",
     "pickFamilyMember": "Pick a family member",
-    "numberRegistered": "Регистрационный номер успешно записан в реестр"
+    "numberRegistered": "Регистрационный номер успешно записан в реестр",
+    "requiredMember": "В заявке должен присутствовать {text}",
+    "client": "страхователь",
+    "insured": "застрахованный",
+    "beneficiary": "выгодоприобретатель",
+    "beneficialOwner": "бенефициарный собственник",
+    "spokesman": "представитель страхователя"
   },
   "buttons": {
     "createStatement": "Create Statement",

package/locales/kz.json

@@ -89,7 +89,13 @@
     "needToRecalculate": "Необходимо пересчитать условия продукта",
     "noUrl": "Отсутствует ссылка",
     "pickFamilyMember": "Выберите члена семьи",
-    "numberRegistered": "Регистрационный номер успешно записан в реестр"
+    "numberRegistered": "Регистрационный номер успешно записан в реестр",
+    "requiredMember": "В заявке должен присутствовать {text}",
+    "client": "страхователь",
+    "insured": "застрахованный",
+    "beneficiary": "выгодоприобретатель",
+    "beneficialOwner": "бенефициарный собственник",
+    "spokesman": "представитель страхователя"
   },
   "buttons": {
     "createStatement": "Создать заявку",

package/locales/ru.json

@@ -89,7 +89,13 @@
     "needToRecalculate": "Необходимо пересчитать условия продукта",
     "noUrl": "Отсутствует ссылка",
     "pickFamilyMember": "Выберите члена семьи",
-    "numberRegistered": "Регистрационный номер успешно записан в реестр"
+    "numberRegistered": "Регистрационный номер успешно записан в реестр",
+    "requiredMember": "В заявке должен присутствовать {text}",
+    "client": "страхователь",
+    "insured": "застрахованный",
+    "beneficiary": "выгодоприобретатель",
+    "beneficialOwner": "бенефициарный собственник",
+    "spokesman": "представитель страхователя"
   },
   "buttons": {
     "createStatement": "Создать заявку",

package/package.json

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

package/store/data.store.js

@@ -712,8 +712,8 @@ export const useDataStore = defineStore('data', {
         addressData.push({
           id: 'response' in user && user.response && 'addresses' in user.response ? user.response.addresses[0].id : 0,
           contragentId: user.id,
-          countryCode: user.birthPlace.ids,
-          countryName: user.birthPlace.nameRu,
+          countryCode: user.registrationCountry.ids,
+          countryName: user.registrationCountry.nameRu,
           stateCode: user.registrationProvince.ids,
           stateName: user.registrationProvince.nameRu,
           cityCode: user.registrationCity.code,
@@ -727,7 +727,7 @@ export const useDataStore = defineStore('data', {
           cityTypeName: user.registrationRegionType.nameRu,
           blockNumber: user.registrationNumberHouse,
           apartmentNumber: user.registrationNumberApartment,
-          address: `${checkForNull(user.birthPlace.nameRu)}, ${checkForNull(user.registrationRegionType.nameRu)} ${checkForNull(user.registrationCity.nameRu)}, ул. ${checkForNull(
+          address: `${checkForNull(user.registrationCountry.nameRu)}, ${checkForNull(user.registrationRegionType.nameRu)} ${checkForNull(user.registrationCity.nameRu)}, ул. ${checkForNull(
             user.registrationStreet,
           )}, д. ${checkForNull(user.registrationNumberHouse)} кв. ${checkForNull(user.registrationNumberApartment)}`,
           type: 'H',
@@ -742,9 +742,11 @@ export const useDataStore = defineStore('data', {
         };
 
         const personId = await this.api.saveContragent(data);
-        if (personId) {
+        if (personId > 0) {
           await this.getContragentById(personId, whichForm, false, whichIndex);
           user.otpTokenId = null;
+        } else {
+          return false;
         }
       } catch (err) {
         this.isLoading = false;
@@ -1972,22 +1974,45 @@ export const useDataStore = defineStore('data', {
         this.showToaster('error', this.t('toaster.notSavedMember', { text: 'страхователя' }), 3000);
         return false;
       }
-      if (!this.isGons) {
+      if (this.members.insuredApp.has) {
         if (this.validateMultipleMembers(this.formStore.insuredFormKey, 'insuredApp', 'застрахованных') === false) {
           return false;
         }
+        if (this.members.insuredApp.required) {
+          const inStatement = this.formStore.insuredForm.every(i => i.id > 0);
+          if (inStatement === false) {
+            this.showToaster('error', this.t('toaster.requiredMember', { text: this.t('toaster.insured') }));
+            return false;
+          }
+        }
       }
-      if (this.validateMultipleMembers(this.formStore.beneficiaryFormKey, 'beneficiaryApp', 'выгодоприобретателей') === false) {
-        return false;
+      if (this.members.beneficiaryApp.has) {
+        if (this.validateMultipleMembers(this.formStore.beneficiaryFormKey, 'beneficiaryApp', 'выгодоприобретателей') === false) {
+          return false;
+        }
+        if (this.members.beneficiaryApp.required) {
+          const inStatement = this.formStore.beneficiaryForm.every(i => i.id > 0);
+          if (inStatement === false) {
+            this.showToaster('error', this.t('toaster.requiredMember', { text: this.t('toaster.beneficiary') }));
+            return false;
+          }
+        }
       }
-      if (!this.isGons) {
+      if (this.members.beneficialOwnerApp.has) {
         if (this.formStore.isActOwnBehalf === false) {
           if (this.validateMultipleMembers(this.formStore.beneficialOwnerFormKey, 'beneficialOwnerApp', 'бенефициарных собственников') === false) {
             return false;
           }
         }
+        if (this.members.beneficialOwnerApp.required) {
+          const inStatement = this.formStore.beneficialOwnerForm.every(i => i.id > 0);
+          if (inStatement === false) {
+            this.showToaster('error', this.t('toaster.requiredMember', { text: this.t('toaster.beneficialOwner') }));
+            return false;
+          }
+        }
       }
-      if (!this.isGons) {
+      if (this.members.spokesmanApp.has) {
         if (this.formStore.hasRepresentative) {
           if (this.formStore.applicationData.spokesmanApp && this.formStore.policyholdersRepresentativeForm.id !== this.formStore.applicationData.spokesmanApp.insisId) {
             this.showToaster(
@@ -2000,6 +2025,13 @@ export const useDataStore = defineStore('data', {
             return false;
           }
         }
+        if (this.members.spokesmanApp.required) {
+          const inStatement = this.formStore.policyholdersRepresentativeForm.id > 0;
+          if (inStatement === false) {
+            this.showToaster('error', this.t('toaster.requiredMember', { text: this.t('toaster.spokesman') }));
+            return false;
+          }
+        }
       }
       if (this.controls.hasAttachment) {
         const areValid = this.formStore.SaleChanellPolicy.nameRu && this.formStore.RegionPolicy.nameRu && this.formStore.ManagerPolicy.nameRu && this.formStore.AgentData.fullName;

package/store/member.store.ts

@@ -159,8 +159,9 @@ export const useMemberStore = defineStore('members', {
         } else {
           if (memberData) await this.dataStore.api.deleteMember(memberCode, memberData.id as number);
         }
+        const cleared = this.clearMember(whichForm, whichIndex);
         if (memberData && refetch) await this.dataStore.getApplicationData(taskId, true, true, true, false);
-        return this.clearMember(whichForm, whichIndex);
+        return cleared;
       } catch (err) {
         console.log(err);
         return ErrorHandler(err);
@@ -202,6 +203,12 @@ export const useMemberStore = defineStore('members', {
 
       if (successTranser.value === true) {
         if (toIndex.value !== null && taskId !== '0' && this.formStore.applicationData.processInstanceId !== 0) {
+          if (
+            typeof this.formStore[to][toIndex.value].id !== 'number' ||
+            (typeof this.formStore[to][toIndex.value].id === 'number' && this.formStore[to][toIndex.value].id > 0 === false)
+          ) {
+            return false;
+          }
           const hasSaved = await this.dataStore.saveMember(this.formStore[to][toIndex.value], this.getMemberCode(to), this.getMemberFromApplication(to, toIndex.value));
           if (hasSaved) {
             await this.dataStore.getApplicationData(taskId, false, true, true, false);