hl-core 0.0.10-beta.36 → 0.0.10-beta.37

package/components/Pages/ProductConditions.vue

@@ -1,5 +1,5 @@
 <template>
-  <section class="flex flex-col gap-4 px-[10px]" :class="[$styles.scrollPage]">
+  <section v-if="!isLoading" class="flex flex-col gap-4 px-[10px]" :class="[$styles.scrollPage]">
     <v-form ref="vForm" @submit="submitForm">
       <base-message-block
         v-if="isCalculator"
@@ -526,7 +526,7 @@
             :readonly="isDisabled || formStore.applicationData.processCode !== 25"
             :label="$dataStore.t('pension.pensionAmount')"
           />
-          <base-form-input :value="pensionPayment" :active="true" readonly :label="$dataStore.t('pension.pensionPayment')" />
+          <base-form-input :value="$dataStore.getNumberWithSpaces(pensionForm.payment)" :active="true" readonly :label="$dataStore.t('pension.pensionPayment')" />
         </base-form-section>
       </section>
       <base-form-section v-if="hasAnnuityPayments" :title="$dataStore.t('calculationAnnuityPayments')">
@@ -843,6 +843,7 @@
       </div>
     </Teleport>
   </section>
+  <div v-if="isLoading" class="w-full h-[80dvh] flex items-center justify-center"><base-loader :size="50" /></div>
 </template>
 
 <script lang="ts">
@@ -882,6 +883,7 @@ export default defineComponent({
     const isPanelLoading = ref<boolean>(false);
     const isPanelOpen = ref<boolean>(false);
     const isTermsPanelOpen = ref<boolean>(false);
+    const isLoading = ref<boolean>(false);
     const panelValue = ref<Value>(new Value());
     const termValue = ref<AddCover>();
     const subTermValue = ref<string>('');
@@ -1320,7 +1322,6 @@ export default defineComponent({
     const totalInsPremium = computed(() =>
       dataStore.getNumberWithSpaces(formatSpacedNumber(formStore.pensionApp?.amount) + formatSpacedNumber(formStore.pensionApp.slave?.amount)),
     );
-    const pensionPayment = computed(() => dataStore.getNumberWithSpaces(pensionForm.value.payment));
 
     const getContragent = async () => {
       const data = await dataStore.api.getContragentById(
@@ -1920,7 +1921,6 @@ export default defineComponent({
               await dataStore.setApplication(data, true);
             }
             await dataStore.getApplicationData(String(route.params.taskId), false, false, false, true);
-            pensionForm.value.payment = formStore.applicationData.pensionApp?.payment ?? 0;
             dateOfBegin.value = reformatDate(formStore.applicationData.pensionApp.dateOfBegin);
           } else {
             if (whichSum.value === 'requestedSumInsured') {
@@ -1997,7 +1997,9 @@ export default defineComponent({
               recalculationData.riskGroup = productConditionsForm.riskGroup?.id ? productConditionsForm.riskGroup.id : 1;
               isCalculating.value = true;
               if (whichProduct.value === 'lifebusiness' || whichProduct.value === 'gns') {
-                await dataStore.calculate(route.params.taskId as string);
+                const setApplicationData = dataStore.getConditionsData();
+                const hasSetApplication = await dataStore.setApplication(setApplicationData);
+                if (hasSetApplication) 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);
@@ -2058,92 +2060,99 @@ export default defineComponent({
     };
 
     onMounted(async () => {
-      if (hasContragentData.value) await getContragent();
-      if (props.isCalculator === true) {
+      try {
+        if (hasContragentData.value) await getContragent();
+        if (props.isCalculator === true) {
+          isLoading.value = true;
+          if (dataStore.isCalculator) {
+            clearFields();
+          }
+          if (whichProduct.value === 'gons') {
+            formStore.isDisabled.productConditionsForm = false;
+            dataStore.setFormsDisabled(false);
+          }
+          if (whichProduct.value !== 'lifetrip' && whichProduct.value !== 'pensionannuitynew') {
+            if (
+              (dataStore.isCalculator || route.params.taskId === '0' || fromIndexPage.value) &&
+              productConditionsForm.requestedSumInsured === null &&
+              productConditionsForm.insurancePremiumPerMonth === null
+            ) {
+              // @ts-ignore
+              const defaultData = await dataStore.getDefaultCalculationData(true, whichProduct.value);
+              if (!defaultData) {
+                dataStore.showToaster('error', 'Отсутствуют базовые данные');
+                return;
+              }
+              formStore.additionalInsuranceTermsWithout = defaultData.addCovers;
+              productConditionsForm.requestedSumInsured = defaultData.amount;
+              productConditionsForm.insurancePremiumPerMonth = defaultData.premium;
+              const indexRate = dataStore.processIndexRate.find(i => i.id === defaultData.indexRateId);
+              if (indexRate) productConditionsForm.processIndexRate = indexRate;
+              const paymendPeriod = dataStore.processPaymentPeriod.find(i => i.id === defaultData.paymentPeriodId);
+              if (paymendPeriod) productConditionsForm.paymentPeriod = paymendPeriod;
+              if (defaultData.signDate) {
+                productConditionsForm.signDate = reformatDate(defaultData.signDate);
+              }
+              if (whichProduct.value === 'lifebusiness' || whichProduct.value === 'gns') {
+                productConditionsForm.coverPeriod = defaultData.insTermInMonth ?? null;
+                productConditionsForm.insurancePremiumPerMonth = null;
+              }
+            }
+          }
+        }
+        additionalTerms.value = props.isCalculator ? formStore.additionalInsuranceTermsWithout : formStore.additionalInsuranceTerms;
+        if (!!productConditionsForm.insurancePremiumPerMonth) {
+          whichSum.value = 'insurancePremiumPerMonth';
+        }
+        if (!!productConditionsForm.requestedSumInsured) {
+          whichSum.value = 'requestedSumInsured';
+        }
+        if ((whichProduct.value === 'lifebusiness' || whichProduct.value === 'gns') && !productConditionsForm.requestedSumInsured) {
+          whichSum.value = 'requestedSumInsured';
+        }
         if (dataStore.isCalculator) {
-          clearFields();
+          dataStore.processCode = constants.products[whichProduct.value as keyof typeof constants.products];
+          await dataStore.getProcessPaymentPeriod();
         }
-        if (whichProduct.value === 'gons') {
-          formStore.isDisabled.productConditionsForm = false;
-          dataStore.setFormsDisabled(false);
+        if (whichProduct.value === 'halykkazyna' || whichProduct.value === 'gons') {
+          await dataStore.getCurrencies();
         }
-        if (whichProduct.value !== 'lifetrip' && whichProduct.value !== 'pensionannuitynew') {
-          if (
-            (dataStore.isCalculator || route.params.taskId === '0' || fromIndexPage.value) &&
-            productConditionsForm.requestedSumInsured === null &&
-            productConditionsForm.insurancePremiumPerMonth === null
-          ) {
-            // @ts-ignore
-            const defaultData = await dataStore.getDefaultCalculationData(true, whichProduct.value);
-            if (!defaultData) {
-              dataStore.showToaster('error', 'Отсутствуют базовые данные');
-              return;
-            }
-            formStore.additionalInsuranceTermsWithout = defaultData.addCovers;
-            productConditionsForm.requestedSumInsured = defaultData.amount;
-            productConditionsForm.insurancePremiumPerMonth = defaultData.premium;
-            const indexRate = dataStore.processIndexRate.find(i => i.id === defaultData.indexRateId);
-            if (indexRate) productConditionsForm.processIndexRate = indexRate;
-            const paymendPeriod = dataStore.processPaymentPeriod.find(i => i.id === defaultData.paymentPeriodId);
-            if (paymendPeriod) productConditionsForm.paymentPeriod = paymendPeriod;
-            if (defaultData.signDate) {
-              productConditionsForm.signDate = reformatDate(defaultData.signDate);
-            }
-            if (whichProduct.value === 'lifebusiness' || whichProduct.value === 'gns') {
-              productConditionsForm.coverPeriod = defaultData.insTermInMonth ?? null;
-              productConditionsForm.insurancePremiumPerMonth = null;
-            }
-          }
+        if (whichProduct.value === 'halykkazyna') {
+          const kazynaPaymentPeriod = dataStore.processPaymentPeriod.find(i => i.code === 'single');
+          if (kazynaPaymentPeriod) productConditionsForm.paymentPeriod = kazynaPaymentPeriod;
         }
-      }
-      additionalTerms.value = props.isCalculator ? formStore.additionalInsuranceTermsWithout : formStore.additionalInsuranceTerms;
-      if (!!productConditionsForm.insurancePremiumPerMonth) {
-        whichSum.value = 'insurancePremiumPerMonth';
-      }
-      if (!!productConditionsForm.requestedSumInsured) {
-        whichSum.value = 'requestedSumInsured';
-      }
-      if ((whichProduct.value === 'lifebusiness' || whichProduct.value === 'gns') && !productConditionsForm.requestedSumInsured) {
-        whichSum.value = 'requestedSumInsured';
-      }
-      if (dataStore.isCalculator) {
-        dataStore.processCode = constants.products[whichProduct.value as keyof typeof constants.products];
-        await dataStore.getProcessPaymentPeriod();
-      }
-      if (whichProduct.value === 'halykkazyna' || whichProduct.value === 'gons') {
-        await dataStore.getCurrencies();
-      }
-      if (whichProduct.value === 'halykkazyna') {
-        const kazynaPaymentPeriod = dataStore.processPaymentPeriod.find(i => i.code === 'single');
-        if (kazynaPaymentPeriod) productConditionsForm.paymentPeriod = kazynaPaymentPeriod;
-      }
-      if (!formStore.lfb.add && (whichProduct.value === 'lifebusiness' || whichProduct.value === 'gns')) {
-        productConditionsForm.requestedSumInsured = dataStore.getNumberWithSpaces(
-          formStore.lfb.clients.reduce((sum: number, i: any) => {
-            return sum + Number(i.insSum);
-          }, 0),
-        );
-      }
-      if (whichProduct.value === 'pensionannuitynew') {
-        contractDate.value = reformatDate(pensionForm.value.contractDate ?? '');
-        dateOfBegin.value = reformatDate(pensionForm.value.dateOfBegin);
-        transferContractDate.value = reformatDate(pensionForm.value.transferContractDate);
-        transferContractFirstPaymentDate.value = reformatDate(pensionForm.value.transferContractFirstPaymentDate ?? '');
-        maxDate.value = await dataStore.getVariableData(formStore.applicationData.processCode ?? 19);
-        if (!transferContracts.value.length && pensionForm.value.transferContracts && pensionForm.value.transferContracts.length) {
-          pensionForm.value.transferContracts.forEach((contract: TransferContract) => {
-            transferContracts.value.push({
-              ...contract,
-              transferContractDate: constants.regex.isoDate.test(contract.transferContractDate) ? reformatDate(contract.transferContractDate)! : contract.transferContractDate,
-              transferContractFirstPaymentDate: constants.regex.isoDate.test(contract.transferContractFirstPaymentDate)
-                ? reformatDate(contract.transferContractFirstPaymentDate)!
-                : contract.transferContractFirstPaymentDate,
-              transferContractCompany:
-                typeof contract.transferContractCompany === 'string' ? ({ nameRu: contract.transferContractCompany } as any) : contract.transferContractCompany,
-              transferContractAmount: dataStore.getNumberWithSpaces(contract.transferContractAmount) ?? '',
+        if (!formStore.lfb.add && (whichProduct.value === 'lifebusiness' || whichProduct.value === 'gns')) {
+          productConditionsForm.requestedSumInsured = dataStore.getNumberWithSpaces(
+            formStore.lfb.clients.reduce((sum: number, i: any) => {
+              return sum + Number(i.insSum);
+            }, 0),
+          );
+        }
+        if (whichProduct.value === 'pensionannuitynew') {
+          contractDate.value = reformatDate(pensionForm.value.contractDate ?? '');
+          dateOfBegin.value = reformatDate(pensionForm.value.dateOfBegin);
+          transferContractDate.value = reformatDate(pensionForm.value.transferContractDate);
+          transferContractFirstPaymentDate.value = reformatDate(pensionForm.value.transferContractFirstPaymentDate ?? '');
+          maxDate.value = await dataStore.getVariableData(formStore.applicationData.processCode ?? 19);
+          if (!transferContracts.value.length && pensionForm.value.transferContracts && pensionForm.value.transferContracts.length) {
+            pensionForm.value.transferContracts.forEach((contract: TransferContract) => {
+              transferContracts.value.push({
+                ...contract,
+                transferContractDate: constants.regex.isoDate.test(contract.transferContractDate) ? reformatDate(contract.transferContractDate)! : contract.transferContractDate,
+                transferContractFirstPaymentDate: constants.regex.isoDate.test(contract.transferContractFirstPaymentDate)
+                  ? reformatDate(contract.transferContractFirstPaymentDate)!
+                  : contract.transferContractFirstPaymentDate,
+                transferContractCompany:
+                  typeof contract.transferContractCompany === 'string' ? ({ nameRu: contract.transferContractCompany } as any) : contract.transferContractCompany,
+                transferContractAmount: dataStore.getNumberWithSpaces(contract.transferContractAmount) ?? '',
+              });
             });
-          });
+          }
         }
+      } catch (err) {
+        console.log(err);
+      } finally {
+        isLoading.value = false;
       }
     });
 
@@ -2310,6 +2319,7 @@ export default defineComponent({
       // State
       formStore,
       vForm,
+      isLoading,
       whichProduct,
       productConditionsForm,
       additionalTerms,
@@ -2350,7 +2360,6 @@ export default defineComponent({
       // Computed
       isTask,
       isDisabled,
-      pensionPayment,
       disabilityGroup,
       totalInsPremium,
       isTermsDisabled,

package/components/Panel/PanelHandler.vue

@@ -895,7 +895,7 @@ export default defineComponent({
               for (let sign of signOptions.value.signIds) {
                 const response = await dataStore.nclayerSign(sign.id, signType, file[0].fileType === 43);
                 if (response === null) {
-                  dataStore.showToaster('error', 'Ошибка при подписании документов через NCLayer', 10000);
+                  dataStore.showToaster('error', 'Ошибка при подключении к приложению «NCALayer». Убедитесь, что запустили приложение «NCALayer»', 10000);
                   break;
                 }
                 if (!response) break;

package/package.json

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