hl-core 0.0.10-beta.43 → 0.0.10-beta.44

package/components/Pages/ProductConditions.vue

@@ -55,7 +55,10 @@
           <base-form-input v-model="insured.gender.nameRu" class="mb-4" :label="$dataStore.t('form.gender')" :readonly="true" />
         </div>
       </base-form-section>
-      <base-form-section v-if="isUnderwriterRole && whichProduct !== 'pensionannuitynew' && whichProduct !== 'balam' && whichProduct !== 'tumar'" :title="$dataStore.t('recalculationInfo')">
+      <base-form-section
+        v-if="isUnderwriterRole && whichProduct !== 'pensionannuitynew' && whichProduct !== 'balam' && whichProduct !== 'tumar'"
+        :title="$dataStore.t('recalculationInfo')"
+      >
         <base-form-input
           v-model="productConditionsForm.lifeMultiply"
           :maska="$maska.numbers"
@@ -323,7 +326,7 @@
           :label="$dataStore.t('productConditionsForm.agencyPart')"
           :readonly="isDisabledAgentCommission"
           :clearable="!isDisabledAgentCommission"
-          :rules="formStore.lfb.add ? $rules.required : $rules.required.concat($rules.numbers, $rules.agentCommission)"
+          :rules="!formStore.lfb.add ? $rules.required.concat($rules.numbers, $rules.agentCommission) : productConditionsForm.agentCommission === 0 ? [] : $rules.required"
         />
       </base-form-section>
       <section v-if="whichProduct === 'pensionannuitynew'">
@@ -504,7 +507,7 @@
           <base-form-input
             v-model="contractDate"
             :maska="$maska.date"
-            :rules="!isDisabled ? $rules.required.concat($rules.date) : []"
+            :rules="!isDisabled ? $rules.required.concat($rules.date, [validateContractDate]) : []"
             :readonly="isDisabled || formStore.applicationData.processCode === 24 || isSlavePensionForm"
             :clearable="!isDisabled"
             :min-date="new Date()"
@@ -1838,6 +1841,14 @@ export default defineComponent({
       return formatedContracts;
     };
 
+    const validateContractDate = (v: any) => {
+      if (v && maxDate.value && formatDate(v) && formatDate(maxDate.value)) {
+        const invalidDate = (formatDate(v) ?? new Date()) > (formatDate(maxDate.value) ?? new Date());
+        if (invalidDate) return 'Дата заключения договора некорректна';
+      }
+      return true;
+    };
+
     const submitForm = async () => {
       vForm.value.validate().then(async (v: { valid: Boolean; errors: any }) => {
         if (v.valid) {
@@ -2474,6 +2485,7 @@ export default defineComponent({
       underwriterCalculate,
       onInputInsurancePremiumPerMonth,
       onInputInsurancePremiumPerMonthInDollar,
+      validateContractDate,
       onInputSum,
       onInputPension,
       onInputSumDollar,

package/composables/classes.ts

@@ -1715,7 +1715,7 @@ export class PhysGroupClass extends BaseGroupClass {
 
 export class GroupMember extends PhysGroupClass {
   isLeader: boolean;
-
+  organizationStartDate: string;
   typeOfEconomicActivity: Value;
   activityTypes: { activityTypeName: string; empoloyeeCount: number }[];
   beneficalOwnerQuest: { order: number; text: string; answer: boolean | null }[];
@@ -1726,6 +1726,7 @@ export class GroupMember extends PhysGroupClass {
     super();
     // Client
     this.isLeader = false;
+    this.organizationStartDate = '';
     this.typeOfEconomicActivity = new Value();
     this.activityTypes = [];
     this.beneficalOwnerQuest = [

package/composables/index.ts

@@ -892,14 +892,10 @@ export class RoleController {
         this.isUSNSsanctioner() ||
         this.isUnderwriter() ||
         this.isActuary() ||
-        this.isAdmin() ||
         this.isCompliance() ||
-        this.isAnalyst() ||
         this.isUpk() ||
         this.isFinCenter() ||
         this.isSupervisor() ||
-        this.isSupport() ||
-        this.isDrn() ||
         this.isUrp() ||
         this.isUsns() ||
         this.isJurist() ||
@@ -916,7 +912,9 @@ export class RoleController {
         this.isExecutor() ||
         this.isArchivist() ||
         this.isUKP() ||
-        this.isDpDirector(),
+        this.isDpDirector() ||
+        this.isSecurity() ||
+        baseAccessRoles,
     };
   };
 }

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "hl-core",
-  "version": "0.0.10-beta.43",
+  "version": "0.0.10-beta.44",
   "license": "MIT",
   "private": false,
   "main": "nuxt.config.ts",

package/store/data.store.ts

@@ -3680,6 +3680,24 @@ export const useDataStore = defineStore('data', {
         });
       }
     },
+    uniqPreparePersonData(local: GroupMember) {
+      const checkForNull = (value: any) => (value ? value : '');
+      try {
+        (Object.keys(local) as Array<keyof GroupMember>).forEach(key => {
+          if (key === 'actualAddress' || key === 'legalAddress') {
+            const address = `${checkForNull(local[key].country.nameRu)}, ${checkForNull(local[key].state.nameRu)},${
+              local[key].region.nameRu ? ` ${local[key].region.nameRu},` : ''
+            } ${checkForNull(local[key].regionType.nameRu)} ${checkForNull(local[key].city.nameRu)},${local[key].square ? ` квартал ${local[key].square},` : ''}${
+              local[key].microdistrict ? ` мкр ${local[key].microdistrict},` : ''
+            } ул. ${checkForNull(local[key].street)}, д. ${checkForNull(local[key].houseNumber)}`;
+            local[key].longName = address;
+            local[key].longNameKz = address;
+          }
+        });
+      } catch (e) {
+        ErrorHandler(e);
+      }
+    },
     async startApplicationV2(data: PolicyholderClass) {
       const policyholder = JSON.parse(JSON.stringify(data)) as any;
       this.preparePersonData(policyholder);
@@ -3699,6 +3717,7 @@ export const useDataStore = defineStore('data', {
         'clientData.authoritedPerson.addTaxResidency',
       ]);
       policyholder.clientData.authoritedPerson.gender = policyholder.clientData.authoritedPerson.gender.nameRu === 'Мужской' ? 1 : 2;
+      this.uniqPreparePersonData(policyholder.clientData);
       if (this.formStore.lfb.add) {
         policyholder.parentContractNumber = localStorage.getItem('policyNo');
         policyholder.parentContractId = localStorage.getItem('policyId');
@@ -3715,6 +3734,7 @@ export const useDataStore = defineStore('data', {
       const policyholder = JSON.parse(JSON.stringify(data)) as any;
       policyholder.clientData.authoritedPerson.gender = policyholder.clientData.authoritedPerson.gender.nameRu === 'Мужской' ? 1 : 2;
       this.preparePersonData(policyholder);
+      this.uniqPreparePersonData(policyholder.clientData);
       try {
         await this.api.saveClient(this.formStore.applicationData.processInstanceId, this.formStore.lfb.clientId, policyholder);
       } catch (err) {
@@ -3799,7 +3819,7 @@ export const useDataStore = defineStore('data', {
 
         this.formStore.productConditionsForm.calcDate = reformatDate(applicationData.policyAppDto.calcDate);
         this.formStore.productConditionsForm.contractEndDate = reformatDate(applicationData.policyAppDto.contractEndDate);
-        this.formStore.productConditionsForm.agentCommission = applicationData.policyAppDto.agentCommission === 0 ? null : applicationData.policyAppDto.agentCommission;
+        this.formStore.productConditionsForm.agentCommission = applicationData.policyAppDto.agentCommission;
         this.formStore.productConditionsForm.fixInsSum = this.getNumberWithSpaces(applicationData.policyAppDto.fixInsSum === 0 ? null : applicationData.policyAppDto.fixInsSum);
         this.formStore.productConditionsForm.coverPeriod = 12;
         this.formStore.productConditionsForm.requestedSumInsured = this.getNumberWithSpaces(applicationData.policyAppDto.amount === 0 ? null : applicationData.policyAppDto.amount);