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

package/components/Form/FormBlock.vue

@@ -1,5 +1,5 @@
 <template>
-  <div class="pt-3 rounded-lg border-[1px]" :class="[$libStyles.whiteBg]">
+  <div class="pt-3 rounded-lg border-[1px]" :class="[$libStyles.whiteBg, disabled && $libStyles.disabled]">
     <div class="ml-5">
       <p :class="[$libStyles.textTitle, $libStyles.greenText]">{{ title }}</p>
       <p v-if="!!subtitle" :class="[$libStyles.greyText, $libStyles.textSimple]">{{ subtitle }}</p>
@@ -21,9 +21,9 @@
         <span :class="[getMemberInfo(each).birthPlace === null && $libStyles.emptyBlockCol]" class="hidden lg:block"> {{ getMemberInfo(each).birthPlace }} </span>
         <span :class="[getMemberInfo(each).sectorCode === null && $libStyles.emptyBlockCol]" class="hidden lg:block"> {{ getMemberInfo(each).sectorCode }} </span>
         <div
-          class="rounded-br-lg transition-all h-[70px] w-[60px] place-self-end cursor-pointer"
-          :class="[$libStyles.blueBgLight, $libStyles.blueBgLightHover]"
-          @click="$emit('onMore', { whichForm, index })"
+          class="rounded-br-lg transition-all h-[70px] w-[60px] place-self-end"
+          :class="[$libStyles.blueBgLight, $libStyles.blueBgLightHover, disabled ? $libStyles.disabled : 'cursor-pointer']"
+          @click="!disabled && $emit('onMore', { whichForm, index })"
         >
           <i class="mdi mdi-dots-vertical text-xl absolute top-[20px] right-[20px]"> </i>
         </div>
@@ -37,18 +37,18 @@
       <span :class="[getMemberInfo(member).birthPlace === null && $libStyles.emptyBlockCol]" class="hidden lg:block"> {{ getMemberInfo(member).birthPlace }} </span>
       <span :class="[getMemberInfo(member).sectorCode === null && $libStyles.emptyBlockCol]" class="hidden lg:block"> {{ getMemberInfo(member).sectorCode }} </span>
       <div
-        class="rounded-br-lg transition-all h-[70px] w-[60px] place-self-end cursor-pointer"
-        :class="[$libStyles.blueBgLight, $libStyles.blueBgLightHover]"
-        @click="$emit('onMore', { whichForm })"
+        class="rounded-br-lg transition-all h-[70px] w-[60px] place-self-end"
+        :class="[$libStyles.blueBgLight, $libStyles.blueBgLightHover, disabled ? $libStyles.disabled : 'cursor-pointer']"
+        @click="!disabled && $emit('onMore', { whichForm })"
       >
         <i class="mdi mdi-dots-vertical text-xl absolute top-[20px] right-[20px]"> </i>
       </div>
     </div>
     <div
       v-if="isMultiple && more"
-      :class="[$libStyles.blueBg, $libStyles.whiteText, $libStyles.textSimple]"
-      class="cursor-pointer rounded-b-lg h-[36px] flex items-center font-medium justify-center"
-      @click="memberStore.addMember(whichForm)"
+      :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"
+      @click="!disabled && memberStore.addMember(whichForm)"
     >
       {{ $t('buttons.add') }}
     </div>
@@ -76,6 +76,10 @@ export default defineComponent({
       type: Boolean,
       default: false,
     },
+    disabled: {
+      type: Boolean,
+      default: false,
+    },
   },
   emits: ['onMore', 'addMember'],
   setup(props) {

package/components/Form/ProductConditionsBlock.vue

@@ -1,5 +1,5 @@
 <template>
-  <div class="pt-3 pl-5 rounded-lg border-[1px]" :class="[$libStyles.whiteBg]">
+  <div class="pt-3 pl-5 rounded-lg border-[1px]" :class="[$libStyles.whiteBg, disabled && $libStyles.disabled]">
     <div>
       <p :class="[$libStyles.textTitle, $libStyles.greenText]">
         {{ $t('productConditions') }}
@@ -20,9 +20,9 @@
         {{ paymentPeriod }}
       </span>
       <div
-        class="rounded-br-lg transition-all h-[70px] w-[60px] relative place-self-end cursor-pointer"
-        :class="[$libStyles.blueBgLight, $libStyles.blueBgLightHover]"
-        @click="$emit('onMore', { whichForm: 'productConditions' })"
+        class="rounded-br-lg transition-all h-[70px] w-[60px] relative place-self-end"
+        :class="[$libStyles.blueBgLight, $libStyles.blueBgLightHover, disabled ? $libStyles.disabled : 'cursor-pointer']"
+        @click="!disabled && $emit('onMore', { whichForm: 'productConditions' })"
       >
         <i class="mdi mdi-dots-vertical text-xl absolute top-[20px] right-[20px]"> </i>
       </div>
@@ -37,6 +37,10 @@ export default defineComponent({
       type: String,
       default: '',
     },
+    disabled: {
+      type: Boolean,
+      default: false,
+    },
   },
   setup() {
     const formStore = useFormStore();

package/components/Input/FormInput.vue

@@ -23,12 +23,11 @@
     @keyup.enter.prevent="submitted"
     @click:append="!props.readonly && $emit('append-out')"
     @click:prepend="!props.readonly && $emit('prepend-out')"
-    @click:append-inner="!props.readonly && $emit('append')"
     @click:prepend-inner="!props.readonly && $emit('prepend')"
     @update:modelValue="$emit('update:modelValue', $event)"
   >
     <template v-if="appendInnerIcon && appendInnerIcon.length" v-slot:append-inner>
-      <v-icon v-if="appendInnerIcon !== 'mdi mdi-calendar-blank-outline'" icon="appendInnerIcon"></v-icon>
+      <v-icon v-if="appendInnerIcon !== 'mdi mdi-calendar-blank-outline'" :icon="appendInnerIcon" @click="!props.readonly && $emit('append')"></v-icon>
       <base-datepicker v-else :model-value="modelValue" @update:modelValue="$emit('update:modelValue', $event)"></base-datepicker>
     </template>
     <template v-if="loading" #loader>

package/components/Menu/MenuNav.vue

@@ -35,7 +35,7 @@
         <div v-if="$dataStore.buttons && $dataStore.buttons.length" class="flex flex-col gap-[10px] justify-self-end absolute bottom-5 lg:bottom-[30%] w-full pr-4">
           <div v-for="(item, index) of $dataStore.buttons" :key="index">
             <transition enter-active-class="animate__animated animate__fadeIn animate__faster" leave-active-class="animate__animated animate__fadeOut animate__faster">
-              <base-btn v-if="typeof item.show === 'boolean' ? item.show : true" :text="item.title!" :btn="item.color" :disabled="item.disabled" @click="item.action"> </base-btn>
+              <base-btn v-if="typeof item.show === 'boolean' ? item.show : true" :text="item.title!" :btn="item.color" :disabled="item.disabled" :loading="$dataStore.isButtonsLoading" @click="item.action"> </base-btn>
             </transition>
           </div></div
       ></base-fade-transition>

package/components/Pages/ProductConditions.vue

@@ -108,8 +108,8 @@
           :maska="$maska.numbers"
           :readonly="isDisabled"
           :clearable="!isDisabled"
-          :rules="$rules.required.concat($rules.numbers, $rules.coverPeriodFrom3to20)"
-          :label="$t('productConditionsForm.coverPeriodFrom3to20')"
+          :rules="coverPeriodRule"
+          :label="$t($dataStore.isGons ? 'productConditionsForm.coverPeriodFrom3to20' : 'productConditionsForm.coverPeriod')"
         ></base-form-input>
         <base-panel-input
           v-model="productConditionsForm.paymentPeriod"
@@ -121,6 +121,17 @@
           append-inner-icon="mdi mdi-chevron-right"
           @append="openPanel($t('productConditionsForm.processPaymentPeriod'), $dataStore.processPaymentPeriod, 'paymentPeriod', $dataStore.getProcessPaymentPeriod)"
         ></base-panel-input>
+        <base-panel-input
+          v-if="hasBaseProductConditions"
+          v-model="productConditionsForm.processIndexRate"
+          :value="productConditionsForm.processIndexRate.nameRu"
+          :readonly="isDisabled"
+          :clearable="!isDisabled"
+          :rules="$rules.objectRequired"
+          :label="$t('productConditionsForm.processIndexRate')"
+          append-inner-icon="mdi mdi-chevron-right"
+          @append="openPanel($t('productConditionsForm.processIndexRate'), $dataStore.processIndexRate, 'processIndexRate', $dataStore.getProcessIndexRate)"
+        ></base-panel-input>
         <base-form-input
           v-model="productConditionsForm.requestedSumInsured"
           :readonly="isDisabled"
@@ -136,6 +147,19 @@
           :label="$t('productConditionsForm.insurancePremiumAmount')"
         ></base-form-input>
       </base-form-section>
+      <base-form-section v-if="additionalTerms && additionalTerms.length" :title="$t('productConditionsForm.additional')">
+        <div v-for="(term, index) of additionalTerms" :key="index">
+          <base-panel-input
+            v-model="additionalTerms[index]"
+            :value="term.coverSumName"
+            :readonly="isDisabled"
+            :clearable="!isDisabled"
+            :label="term.coverTypeName"
+            append-inner-icon="mdi mdi-chevron-right"
+            @append="openTermPanel(term.coverTypeName, $dataStore.getAdditionalInsuranceTermsAnswers, term.coverTypeId, index)"
+          ></base-panel-input>
+        </div>
+      </base-form-section>
     </v-form>
     <base-btn
       v-if="!isDisabled && isTask && ($dataStore.isInitiator() || $dataStore.isUnderwriter())"
@@ -163,6 +187,21 @@
         <base-loader v-if="isPanelLoading" class="absolute mt-10" :size="50"></base-loader>
       </div>
     </Teleport>
+    <Teleport v-if="isTermsPanelOpen" to="#panel-actions">
+      <div :class="[$libStyles.scrollPage]" class="flex flex-col items-center">
+        <base-rounded-input v-model="searchQuery" :label="$t('labels.search')" class="w-full p-2" :hide-details="true"></base-rounded-input>
+        <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)"
+          ></base-panel-select-item>
+        </div>
+        <base-loader v-if="isPanelLoading" class="absolute mt-10" :size="50"></base-loader>
+      </div>
+    </Teleport>
   </section>
 </template>
 
@@ -187,13 +226,17 @@ export default defineComponent({
     const isCalculating = ref<boolean>(false);
     const isPanelLoading = ref<boolean>(false);
     const isPanelOpen = ref<boolean>(false);
+    const isTermsPanelOpen = ref<boolean>(false);
     const panelValue = ref<Value>(new Value());
+    const termValue = ref<AddCover>();
     const panelList = 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 additionalTerms = ref<AddCover[]>([]);
     const isUnderwriterForm = computed(() => {
       if (route.params.taskId === '0 ' || props.isRecalculation === true) {
         return false;
@@ -207,19 +250,42 @@ export default defineComponent({
     const isUnderwriterRole = computed(() => dataStore.isUnderwriter() || dataStore.isAdmin() || dataStore.isSupport());
     const insurancePremiumPerMonth = computed(() => (!!productConditionsForm.insurancePremiumPerMonth ? dataStore.rules.required.concat(dataStore.rules.sums) : []));
     const requestedSumInsured = computed(() => (!!productConditionsForm.requestedSumInsured ? dataStore.rules.required.concat(dataStore.rules.sums) : []));
+    const hasBaseProductConditions = computed(() => {
+      if (dataStore.isGons) {
+        return false;
+      }
+      return true;
+    });
+    const coverPeriodRule = computed(() => {
+      const baseCondition = dataStore.rules.required.concat(dataStore.rules.numbers);
+      if (dataStore.isGons) {
+        return baseCondition.concat(dataStore.rules.coverPeriodFrom3to20);
+      }
+      return baseCondition;
+    });
 
     const pickPanelValue = (item: Value) => {
       dataStore.panel.open = false;
       isPanelOpen.value = false;
+      if (!currentPanel.value) return;
       // @ts-ignore
       productConditionsForm[currentPanel.value] = item.nameRu === null ? new Value() : item;
     };
 
+    const pickTermValue = (item: Value) => {
+      dataStore.panel.open = false;
+      isTermsPanelOpen.value = false;
+      if (typeof currentIndex.value !== 'number') return;
+      additionalTerms.value[currentIndex.value].coverSumId = item.id as string;
+      additionalTerms.value[currentIndex.value].coverSumName = item.nameRu as string;
+    };
+
     const openPanel = async (title: string, list: Value[], key: string, asyncFunction?: Function, filterKey?: string) => {
       if (!isDisabled.value || (key === 'riskGroup' && !isRecalculationDisabled.value)) {
         searchQuery.value = '';
         currentPanel.value = key as keyof typeof productConditionsForm;
         isPanelOpen.value = true;
+        isTermsPanelOpen.value = false;
         dataStore.panelAction = null;
         dataStore.panel.open = true;
         dataStore.panel.title = title;
@@ -238,6 +304,30 @@ export default defineComponent({
       }
     };
 
+    const openTermPanel = async (title: string, asyncFunction: Function, questionId: string, index: number) => {
+      if (!isDisabled.value) {
+        searchQuery.value = '';
+        currentIndex.value = index;
+        isPanelOpen.value = false;
+        isTermsPanelOpen.value = true;
+        dataStore.panelAction = null;
+        dataStore.panel.open = true;
+        dataStore.panel.title = title;
+
+        let newList;
+        if (asyncFunction) {
+          isPanelLoading.value = true;
+          newList = await asyncFunction(questionId);
+        }
+        panelList.value = newList;
+        // @ts-ignore
+        termValue.value = additionalTerms.value[index];
+        isPanelLoading.value = false;
+      } else {
+        dataStore.showToaster('error', dataStore.t('toaster.viewErrorText'));
+      }
+    };
+
     const underwriterCalculate = async (type: 'sum' | 'premium') => {
       if (!type) return;
       if (type === 'sum') {
@@ -355,6 +445,7 @@ export default defineComponent({
           productConditionsForm.signDate = reformatDate(defaultData.signDate);
         }
       }
+      additionalTerms.value = props.isRecalculation ? formStore.additionalInsuranceTermsWithout : formStore.additionalInsuranceTerms;
       if (!!productConditionsForm.insurancePremiumPerMonth) {
         whichSum.value = 'insurancePremiumPerMonth';
       }
@@ -395,6 +486,7 @@ export default defineComponent({
       () => {
         if (dataStore.panel.open === false) {
           isPanelOpen.value = false;
+          isTermsPanelOpen.value = false;
           dataStore.panelAction = null;
         }
       },
@@ -406,10 +498,13 @@ export default defineComponent({
       formStore,
       vForm,
       productConditionsForm,
+      additionalTerms,
       isCalculating,
       isPanelLoading,
       isPanelOpen,
+      isTermsPanelOpen,
       panelValue,
+      termValue,
       panelList,
       searchQuery,
       whichSum,
@@ -423,11 +518,17 @@ export default defineComponent({
       requestedSumInsured,
       isRecalculationDisabled,
       isUnderwriterRole,
+      hasBaseProductConditions,
+
+      // Rules
+      coverPeriodRule,
 
       // Functions
       submitForm,
       pickPanelValue,
+      pickTermValue,
       openPanel,
+      openTermPanel,
       pickCalculation,
       underwriterCalculate,
     };

package/composables/classes.ts

@@ -801,6 +801,7 @@ export class DataStoreClass {
     items: MenuItem[];
   };
   buttons: MenuItem[];
+  isButtonsLoading: boolean;
   panelAction: string | null;
   panel: {
     open: boolean;
@@ -891,6 +892,7 @@ export class DataStoreClass {
       items: [],
     };
     this.buttons = [];
+    this.isButtonsLoading = false;
     this.panel = {
       open: false,
       overlay: false,

package/composables/styles.ts

@@ -69,6 +69,7 @@ export class Styles {
 
   // Muted or disabled
   mutedText: string = 'text-[#99A3B3]';
+  disabled: string = 'cursor-not-allowed opacity-50';
 
   constructor() {
     // Button

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "hl-core",
-  "version": "0.0.8-beta.2",
+  "version": "0.0.8-beta.4",
   "license": "MIT",
   "private": false,
   "main": "nuxt.config.ts",
@@ -45,6 +45,6 @@
     "v-idle-3": "^0.3.14",
     "vue-toastification": "^2.0.0-rc.5",
     "vue-uuid": "^3.0.0",
-    "vuetify": "^3.2.1"
+    "vuetify": "^3.2.2"
   }
 }

package/store/data.store.js

@@ -1716,6 +1716,7 @@ export const useDataStore = defineStore('data', {
     },
     async handleTask(action, taskId, comment) {
       if (action && Object.keys(constants.actions).includes(action)) {
+        this.isButtonsLoading = true;
         switch (action) {
           case constants.actions.claim: {
             try {
@@ -1745,6 +1746,7 @@ export const useDataStore = defineStore('data', {
             }
           }
         }
+        this.isButtonsLoading = false;
       } else {
         console.error('No handleTask action');
       }