hl-core 0.0.10-beta.27 → 0.0.10-beta.28

package/api/interceptors.ts

@@ -65,11 +65,6 @@ export default function (axios: AxiosInstance) {
               dataStore.sendToParent(constants.postActions.Error401, 401);
             }
           }
-          if (error.response.status >= 500) {
-            if (router.currentRoute.value.name !== 'Auth') {
-              dataStore.showToaster('error', error.stack ?? dataStore.t('toaster.error'), 5000);
-            }
-          }
           if (error.response.status === 403 && error.response.config.url) {
             dataStore.showToaster('error', `Нет доступа на запрос: ${error.response.config.url.substring(error.response.config.url.lastIndexOf('/') + 1)}`, 5000);
           }

package/components/Pages/MemberForm.vue

@@ -52,8 +52,8 @@
           v-model="member.signOfResidency"
           :value="member.signOfResidency?.nameRu"
           :label="$dataStore.t('form.signOfResidency')"
-          :readonly="isDisabled"
-          :clearable="!isDisabled"
+          :readonly="isDisabled || isDataFromGov"
+          :clearable="!isDisabled && !isDataFromGov"
           :rules="residencyRule"
           append-inner-icon="mdi mdi-chevron-right"
           @append="openPanel($dataStore.t('form.signOfResidency'), [], 'signOfResidency', $dataStore.getResidents)"
@@ -68,8 +68,8 @@
           v-model="member.phoneNumber"
           :label="$dataStore.t('form.phoneNumber')"
           :maska="$maska.phone"
-          :readonly="!!isDisabled || !!isIinPhoneDisabled"
-          :clearable="!isDisabled"
+          :readonly="!!isDisabled || !!isIinPhoneDisabled || !!isDataFromGov"
+          :clearable="!isDisabled && !isIinPhoneDisabled && !isDataFromGov"
           :append-inner-icon="otpCondition ? `${$dataStore.isPension ? 'mdi-message-text' : 'mdi mdi-phone-message'}` : ''"
           @append="openCustomPanel('otp')"
           @keyup.enter.prevent="otpCondition ? openCustomPanel('otp') : null"
@@ -79,8 +79,8 @@
           v-model="member.iin"
           :label="$dataStore.t('form.iin')"
           :maska="$maska.iin"
-          :readonly="!!isDisabled || !!isIinPhoneDisabled || !!member.parsedDocument?.iin"
-          :clearable="!isDisabled"
+          :readonly="!!isDisabled || !!isIinPhoneDisabled || !!member.parsedDocument?.iin || !!isDataFromGov"
+          :clearable="!isDisabled && !isIinPhoneDisabled && !member.parsedDocument?.iin && !isDataFromGov"
           :append-inner-icon="hasMemberSearch || !isNonResident ? (hasDocumentReader ? 'mdi mdi-credit-card-scan-outline' : 'mdi mdi-magnify') : ''"
           @append="searchMember"
           @input="onIinInput"
@@ -88,33 +88,33 @@
         />
         <base-form-input
           v-model.trim="member.lastName"
-          :readonly="isDisabled || isFromGBD || !!member.parsedDocument?.lastName"
-          :clearable="!isDisabled"
+          :readonly="isDisabled || isDataFromGov || !!member.parsedDocument?.lastName"
+          :clearable="!isDisabled && !isDataFromGov && !member.parsedDocument?.lastName"
           :label="$dataStore.t('form.lastName')"
           :rules="$rules.required.concat($rules.cyrillic)"
         />
         <base-form-input
           v-model.trim="member.firstName"
-          :readonly="isDisabled || isFromGBD || !!member.parsedDocument?.firstName"
-          :clearable="!isDisabled"
+          :readonly="isDisabled || isDataFromGov || !!member.parsedDocument?.firstName"
+          :clearable="!isDisabled && !isDataFromGov && !member.parsedDocument?.firstName"
           :label="$dataStore.t('form.firstName')"
           :rules="$rules.required.concat($rules.cyrillic)"
-          :append-inner-icon="hasMemberSearch || isNonResident ? 'mdi mdi-magnify' : ''"
+          :append-inner-icon="isNonResident ? 'mdi mdi-magnify' : ''"
           @append="isNonResident && searchMember"
         />
         <base-form-input
           v-if="hasMiddleName"
           v-model.trim="member.middleName"
-          :readonly="isDisabled || isFromGBD || !!member.parsedDocument?.middleName"
-          :clearable="!isDisabled"
+          :readonly="isDisabled || isDataFromGov || !!member.parsedDocument?.middleName"
+          :clearable="!isDisabled && !isDataFromGov && !member.parsedDocument?.middleName"
           :label="$dataStore.t('form.middleName')"
           :rules="$rules.cyrillicNonRequired"
         />
         <base-form-input
           v-if="$dataStore.isLifetrip"
           v-model.trim="member.lastNameLat"
-          :readonly="isDisabled || isFromGBD"
-          :clearable="!isDisabled"
+          :readonly="isDisabled || isDataFromGov"
+          :clearable="!isDisabled && !isDataFromGov"
           :label="$dataStore.t('form.lastNameLat')"
           :rules="$rules.required.concat($rules.latin)"
           :hint="$dataStore.t('labels.checkWithDoc')"
@@ -122,16 +122,16 @@
         <base-form-input
           v-if="$dataStore.isLifetrip"
           v-model.trim="member.firstNameLat"
-          :readonly="isDisabled || isFromGBD"
-          :clearable="!isDisabled"
+          :readonly="isDisabled || isDataFromGov"
+          :clearable="!isDisabled && !isDataFromGov"
           :label="$dataStore.t('form.firstNameLat')"
           :rules="$rules.required.concat($rules.latin)"
           :hint="$dataStore.t('labels.checkWithDoc')"
         />
         <base-form-input
           v-model="member.birthDate"
-          :readonly="isDisabled || isFromGBD || !!member.parsedDocument?.birthDate"
-          :clearable="!isDisabled"
+          :readonly="isDisabled || isDataFromGov || !!member.parsedDocument?.birthDate"
+          :clearable="!isDisabled && !isDataFromGov && !member.parsedDocument?.birthDate"
           :label="$dataStore.t('form.birthDate')"
           :rules="birthDateRule"
           :maska="$maska.date"
@@ -163,8 +163,8 @@
         <base-panel-input
           v-model="member.gender"
           :value="member.gender?.nameRu"
-          :readonly="isDisabled || isFromGBD"
-          :clearable="!isDisabled && !isFromGBD"
+          :readonly="isDisabled || isDataFromGov"
+          :clearable="!isDisabled && !isDataFromGov"
           :label="$dataStore.t('form.gender')"
           :rules="$rules.objectRequired"
           append-inner-icon="mdi mdi-chevron-right"
@@ -463,8 +463,8 @@
           v-model="member.documentType"
           :value="member.documentType?.nameRu"
           :label="$dataStore.t('form.documentType')"
-          :readonly="isDisabled"
-          :clearable="!isDisabled"
+          :readonly="isDisabled || isDataFromGov"
+          :clearable="!isDisabled && !isDataFromGov"
           :rules="$rules.objectRequired"
           append-inner-icon="mdi mdi-chevron-right"
           @append="openPanel($dataStore.t('form.documentType'), [], 'documentType', $dataStore.getDocumentTypes)"
@@ -472,8 +472,8 @@
         <base-form-input
           v-model.trim="member.documentNumber"
           :label="$dataStore.t('form.documentNumber')"
-          :readonly="isDisabled || !!member.parsedDocument?.documentNumber"
-          :clearable="!isDisabled"
+          :readonly="isDisabled || !!member.parsedDocument?.documentNumber || isDataFromGov"
+          :clearable="!isDisabled && !member.parsedDocument?.documentNumber && !isDataFromGov"
           :rules="$rules.required"
         />
         <!-- <base-file-input v-if="!memberDocument" :disabled="isDisabled" :clearable="!isDisabled" @input="attachFile($event)" />
@@ -485,8 +485,8 @@
           v-model="member.documentIssuers"
           :value="member.documentIssuers?.nameRu"
           :label="$dataStore.t('form.documentIssuers')"
-          :readonly="isDisabled || !!member.parsedDocument?.documentIssuer"
-          :clearable="!isDisabled"
+          :readonly="isDisabled || !!member.parsedDocument?.documentIssuer || isDataFromGov"
+          :clearable="!isDisabled && !member.parsedDocument?.documentIssuer && !isDataFromGov"
           :rules="$rules.objectRequired"
           append-inner-icon="mdi mdi-chevron-right"
           @append="openPanel($dataStore.t('form.documentIssuers'), [], 'documentIssuers', $dataStore.getDocumentIssuers)"
@@ -494,8 +494,8 @@
         <base-form-input
           v-model="member.documentDate"
           :label="$dataStore.t('form.documentDate')"
-          :readonly="isDisabled || !!member.parsedDocument?.documentIssueDate"
-          :clearable="!isDisabled"
+          :readonly="isDisabled || !!member.parsedDocument?.documentIssueDate || isDataFromGov"
+          :clearable="!isDisabled && !member.parsedDocument?.documentIssueDate && !isDataFromGov"
           :rules="$rules.required.concat($rules.date)"
           :maska="$maska.date"
           append-inner-icon="mdi mdi-calendar-blank-outline"
@@ -505,8 +505,8 @@
             v-if="member.documentType.ids !== 'SBI'"
             v-model="member.documentExpire"
             :label="$dataStore.t('form.documentExpire')"
-            :readonly="isDisabled || !!member.parsedDocument?.documentExpireDate"
-            :clearable="!isDisabled"
+            :readonly="isDisabled || !!member.parsedDocument?.documentExpireDate || isDataFromGov"
+            :clearable="!isDisabled && !member.parsedDocument?.documentExpireDate && !isDataFromGov"
             :rules="$rules.required.concat($rules.date)"
             :maska="$maska.date"
             append-inner-icon="mdi mdi-calendar-blank-outline"
@@ -517,8 +517,8 @@
           v-model="member.signOfResidency"
           :value="member.signOfResidency?.nameRu"
           :label="$dataStore.t('form.signOfResidency')"
-          :readonly="isDisabled"
-          :clearable="!isDisabled"
+          :readonly="isDisabled || isDataFromGov"
+          :clearable="!isDisabled && !isDataFromGov"
           :rules="residencyRule"
           append-inner-icon="mdi mdi-chevron-right"
           @append="openPanel($dataStore.t('form.signOfResidency'), [], 'signOfResidency', $dataStore.getResidents)"
@@ -844,6 +844,7 @@ export default {
     const isPanelLoading = ref<boolean>(false);
     const isChangingMember = ref<boolean>(false);
     const isNonResident = computed(() => !useEnv().isProduction && dataStore.isPension && member.value.signOfResidency.ids === '500011.2');
+    const isDataFromGov = computed(() => member.value.verifyType === 'GBDFL' || member.value.verifyType === 'ESBD' || !!member.value.gosPersonData);
     const familyDialog = ref<boolean>(false);
     const deletionDialog = ref<boolean>(false);
     const documentChooseDialog = ref<boolean>(false);
@@ -870,7 +871,6 @@ export default {
     const isDisabled = computed(() => !memberStore.isStatementEditible(whichForm.value));
     const isTask = computed(() => route.params.taskId === '0' || dataStore.isTask());
     const isIinPhoneDisabled = computed(() => member.value.hasAgreement);
-    const isFromGBD = computed(() => !!member.value.gosPersonData);
     const gbdDocuments = computed(() => {
       if (hasGBDFLDocSelection && !!member.value.gosPersonData && !!member.value.gosPersonData.documents) {
         const documents = Array.isArray(member.value.gosPersonData.documents.document)
@@ -2157,7 +2157,6 @@ export default {
       isDisabled,
       isTask,
       isIinPhoneDisabled,
-      isFromGBD,
       showSaveButton,
       hasGBDFL,
       hasInsis,
@@ -2174,6 +2173,7 @@ export default {
       gbdDocuments,
       hasGBDFLDocSelection,
       isNonResident,
+      isDataFromGov,
 
       // Rules
       ageRule,

package/package.json

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