hl-core 0.0.10-beta.76 → 0.0.10-beta.78

package/api/base.api.ts

@@ -994,6 +994,15 @@ export class ApiClass {
     });
   }
 
+  async generateDocDocument(data: any) {
+    return await this.axiosCall<any>({
+      method: Methods.POST,
+      url: `/Arm/api/Bpm/generateDocDocument`,
+      data: data,
+      responseType: 'arraybuffer',
+    });
+  }
+
   async getVariableData(type: number, processCode: number) {
     return await this.axiosCall<any>({
       method: Methods.GET,

package/components/Menu/MenuNavItem.vue

@@ -1,8 +1,8 @@
 <template>
   <div
     :class="[
-      selected ? $styles.blueBg : $styles.blueBgLight,
-      selected ? $styles.whiteText : $styles.blackText,
+      selected ? $styles.blueBg : menuItem.color ?? $styles.blueBgLight,
+      selected || menuItem.color ? $styles.whiteText : $styles.blackText,
       $styles.rounded,
       $styles.textSimple,
       disabled ? 'cursor-not-allowed opacity-50' : '',
@@ -15,7 +15,7 @@
     </div>
     <div class="flex items-center">
       <base-chip :chip="menuItem.chip" />
-       <i v-if="typeof menuItem.link == 'object' || menuItem.chip" class="mdi mdi-folder-outline text-xl pl-4 pr-4"></i>
+      <i v-if="typeof menuItem.link == 'object' || menuItem.chip" class="mdi mdi-folder-outline text-xl pl-4 pr-4"></i>
     </div>
     <v-tooltip v-if="menuItem.description" activator="parent" location="bottom">{{ menuItem.description }}</v-tooltip>
   </div>

package/components/Pages/Documents.vue

@@ -1,5 +1,8 @@
 <template>
   <section :class="[$styles.scrollPage]">
+    <section v-if="isSupportAttachmentSection" class="w-full px-[10px] pt-[14px]">
+      <base-btn :disabled="documentLoading" :loading="documentLoading" text="Открыть панель вложения для Техподдержки" size="sm" @click="openSupportAttachPanel" />
+    </section>
     <base-form-section v-if="isUnderwriterDocuments" title="Загрузить документы для Андеррайтинга" class="mx-[10px] mt-[14px]">
       <base-file-input :readonly="isDisabled || documentLoading" @input.prevent="onUnderFiles($event)" @onClear="onClearUnderFiles()" />
       <base-animation>
@@ -29,7 +32,13 @@
           <i
             class="transition-all cursor-pointer mdi mdi-tray-arrow-down pl-2 mr-3 border-l-[1px] text-xl absolute right-0"
             :class="[$styles.greenTextHover]"
-            @click="$dataStore.generatePDFDocument(processCode === 19 ? 'PA_Statement' : processCode === 25 ? 'PAJ_Statement' : 'PA_RefundStatement', '37')"
+            @click="
+              openDownloadFormatPanel(
+                processCode === 19 ? 'PA_Statement' : processCode === 25 ? 'PAJ_Statement' : 'PA_RefundStatement',
+                '37',
+                `Заявления на ${processCode === 19 || processCode === 25 ? 'страхование' : 'возврат'}`,
+              )
+            "
           ></i>
         </div>
       </base-content-block>
@@ -40,7 +49,13 @@
           <i
             class="transition-all cursor-pointer mdi mdi-tray-arrow-down pl-2 mr-3 border-l-[1px] text-xl absolute right-0"
             :class="[$styles.greenTextHover]"
-            @click="$dataStore.generatePDFDocument(processCode === 19 ? 'PA_Contract' : processCode === 25 ? 'PAJ_Contract' : 'PA_RefundAgreement', '38')"
+            @click="
+              openDownloadFormatPanel(
+                processCode === 19 ? 'PA_Contract' : processCode === 25 ? 'PAJ_Contract' : 'PA_RefundAgreement',
+                '38',
+                `Договор ${processCode === 19 || processCode === 25 ? 'страхования' : 'возврата'}`,
+              )
+            "
           ></i>
         </div>
       </base-content-block>
@@ -51,7 +66,7 @@
           <i
             class="transition-all cursor-pointer mdi mdi-tray-arrow-down pl-2 mr-3 border-l-[1px] text-xl absolute right-0"
             :class="[$styles.greenTextHover]"
-            @click="$dataStore.generatePDFDocument('Compliance_FinMonitoring', '39')"
+            @click="openDownloadFormatPanel('Compliance_FinMonitoring', '39', $appContextStore.t('pension.complianceFinMonitoring'))"
           ></i>
         </div>
       </base-content-block>
@@ -62,7 +77,7 @@
           <i
             class="transition-all cursor-pointer mdi mdi-tray-arrow-down pl-2 mr-3 border-l-[1px] text-xl absolute right-0"
             :class="[$styles.greenTextHover]"
-            @click="$dataStore.generatePDFDocument('PA_Dossier', '40', 'doc')"
+            @click="openDownloadFormatPanel('PA_Dossier', '40', $appContextStore.t('pension.dossierPA'))"
           ></i>
         </div>
       </base-content-block>
@@ -241,13 +256,55 @@
               @click="getDoc('view')"
             />
           </base-animation>
-          <base-btn :disabled="documentLoading" :loading="documentLoading" text="Скачать" @click="getDoc('download')" />
+          <base-btn :disabled="documentLoading" :loading="documentLoading" text="Скачать" @click="getDoc('download', $dataStore.isSupport() ? downloadType : undefined)" />
           <base-animation>
             <base-btn v-if="canDeleteFiles" :disabled="documentLoading" :loading="documentLoading" text="Удалить" @click="deletionDialog = true" />
           </base-animation>
         </div>
       </base-fade-transition>
     </Teleport>
+    <Teleport v-if="isSupportAttachOpen" to="#right-panel-actions">
+      <base-fade-transition>
+        <div :class="[$styles.flexColNav]">
+          <base-form-section class="!mt-0">
+            <div class="flex flex-col gap-2">
+              <base-rounded-input v-model="supportTypeSearch" :label="$appContextStore.t('labels.search')" class="w-full" :hide-details="true" />
+              <div class="px-1 text-xs" :class="[$styles.mutedText]">Найдено: {{ filteredSupportFileTypeItems.length }}</div>
+              <div class="w-full flex flex-col gap-2 p-2 max-h-[220px] overflow-y-auto" :class="[$styles.blueBgLight, $styles.rounded]">
+                <base-panel-select-item :text="$appContextStore.t('form.notChosen')" :selected="supportSelectedFileTypeCode === null" @click="pickSupportFileType(null)" />
+                <base-panel-select-item
+                  v-for="item in filteredSupportFileTypeItems"
+                  :key="item.value"
+                  :text="String(item.title)"
+                  :selected="item.value === supportSelectedFileTypeCode"
+                  @click="pickSupportFileType(item.value)"
+                />
+                <div v-if="supportTypeSearch && filteredSupportFileTypeItems.length === 0" class="px-2 py-1 text-sm" :class="[$styles.mutedText]">Ничего не найдено</div>
+              </div>
+              <base-file-input :readonly="documentLoading" @input.prevent="onSupportFiles($event)" @onClear="onClearSupportFiles()" />
+              <base-animation>
+                <base-btn
+                  :disabled="!supportSelectedFileTypeCode || !supportDocumentsList.length || documentLoading"
+                  :loading="documentLoading"
+                  text="Вложить"
+                  size="sm"
+                  @click="uploadSupportFiles"
+                />
+              </base-animation>
+            </div>
+          </base-form-section>
+        </div>
+      </base-fade-transition>
+    </Teleport>
+    <Teleport v-if="isDownloadFormatOpen" to="#right-panel-actions">
+      <base-fade-transition>
+        <div :class="[$styles.flexColNav]">
+          <div class="px-2 py-2 text-sm" :class="[$styles.mutedText]">{{ downloadingDocData.docName }}</div>
+          <base-btn text="PDF" @click="downloadFile('pdf')" />
+          <base-btn text="DOCX" @click="downloadFile('docx')" />
+        </div>
+      </base-fade-transition>
+    </Teleport>
     <Teleport v-if="isDigitalDocOpen" to="#right-panel-actions">
       <div :class="[$styles.flexColNav]">
         <base-form-section class="!mt-0">
@@ -323,6 +380,7 @@ export default defineComponent({
     const deletionDialog = ref<boolean>(false);
     const isPanelOpen = ref<boolean>(false);
     const isDigitalDocOpen = ref<boolean>(false);
+    const isSupportAttachOpen = ref<boolean>(false);
     const isDisabled = computed(() => !dataStore.isTask());
     const contractDict = computed(() => dictionariesStore.dicFileTypeList.find(i => i.nameRu === 'Договор страхования' || i.nameRu === 'Договор'));
     const processCode = formStore.applicationData.processCode;
@@ -339,9 +397,29 @@ export default defineComponent({
     const isDigitalDocDisabled = computed(
       () => !dataStore.isTask() || route.params.taskId === '0' || !dataStore.isInitiator() || !dataStore.isProcessEditable(formStore.applicationData.statusCode),
     );
+    const isSupportAttachmentSection = computed(() => dataStore.isSupport() && route.params.taskId !== '0' && !!formStore.applicationData.processInstanceId);
     const documentType = ref<DigitalDocNames | null>(null);
     const otpCode = ref<string>('');
     const currentIin = ref<string>('');
+    const downloadType = ref<'pdf' | 'docx'>('pdf');
+    const downloadTypes: Array<{ title: string; value: 'pdf' | 'docx' }> = [
+      { title: 'PDF', value: 'pdf' },
+      { title: 'DOCX', value: 'docx' },
+    ];
+    const supportSelectedFileTypeCode = ref<string | null>(null);
+    const supportTypeSearch = ref<string>('');
+    const supportDocumentsList = ref<File[]>([]);
+    const supportFileTypeItems = computed(() =>
+      dictionariesStore.dicFileTypeList.map(i => ({
+        title: i.nameRu || i.nameKz || String(i.code),
+        value: String(i.code),
+      })),
+    );
+    const filteredSupportFileTypeItems = computed(() => {
+      const query = supportTypeSearch.value.trim().toLowerCase();
+      if (!query) return supportFileTypeItems.value;
+      return supportFileTypeItems.value.filter(i => i.title.toLowerCase().includes(query) || i.value.toLowerCase().includes(query));
+    });
     const deleteFilesId = ['1', '2', '3', '4', '46'];
     const documentItems: Array<{ title: DigitalDocNames; value: DigitalDocTypes }> = [
       { title: 'Удостоверение личности', value: 'IdentityCard' },
@@ -374,6 +452,8 @@ export default defineComponent({
         processInstanceId: string;
       }[]
     >([]);
+    const isDownloadFormatOpen = ref<boolean>(false);
+    const downloadingDocData = ref<{ docType: string; fileCode: string; docName: string }>({ docType: '', fileCode: '', docName: '' });
 
     const object_list = computed(() => Object.values(formStore.signedDocumentList));
     const unSignedList = computed(() => document_list.value.filter((doc: DocumentItem) => doc.signed === false || doc.signed === null));
@@ -405,6 +485,7 @@ export default defineComponent({
         (formStore.applicationData.statusCode === 'StartForm' || formStore.applicationData.statusCode === 'EditForm'),
     );
     const canDeleteFiles = computed(() => {
+      if (dataStore.isSupport()) return true;
       const baseCondition = dataStore.isTask() && dataStore.isInitiator() && dataStore.isProcessEditable(formStore.applicationData.statusCode);
       if (
         appContextStore.isBaiterek ||
@@ -439,12 +520,120 @@ export default defineComponent({
     const openPanel = async (document: DocumentItem) => {
       dataStore.rightPanel.title = document.fileTypeName!;
       currentDocument.value = document;
+      const extension = String(document.fileName ?? '')
+        .split('.')
+        .pop()
+        ?.toLowerCase();
+      downloadType.value = extension === 'docx' ? 'docx' : 'pdf';
       dataStore.rightPanel.open = true;
+      isDownloadFormatOpen.value = false;
+      isSupportAttachOpen.value = false;
       isDigitalDocOpen.value = false;
       isPanelOpen.value = true;
       dataStore.panelAction = null;
     };
 
+    const openSupportAttachPanel = () => {
+      dataStore.panelAction = null;
+      dataStore.rightPanel.title = 'Вложение документов';
+      dataStore.rightPanel.open = true;
+      isPanelOpen.value = false;
+      isDigitalDocOpen.value = false;
+      isDownloadFormatOpen.value = false;
+      isSupportAttachOpen.value = true;
+      supportTypeSearch.value = '';
+      supportSelectedFileTypeCode.value = null;
+      supportDocumentsList.value = [];
+    };
+
+    const openDownloadFormatPanel = (docType: string, fileCode: string, docName: string) => {
+      downloadingDocData.value = { docType, fileCode, docName };
+      dataStore.panelAction = null;
+      dataStore.rightPanel.title = 'Выберите формат';
+      dataStore.rightPanel.open = true;
+      isPanelOpen.value = false;
+      isDigitalDocOpen.value = false;
+      isSupportAttachOpen.value = false;
+      isDownloadFormatOpen.value = true;
+    };
+
+    const downloadFile = (format: 'pdf' | 'docx') => {
+      const { docType, fileCode } = downloadingDocData.value;
+      dataStore.generatePDFDocument(docType, fileCode, format);
+      isDownloadFormatOpen.value = false;
+      dataStore.rightPanel.open = false;
+    };
+
+    const onSupportFiles = (event: InputEvent) => {
+      if (!(event.target || event.dataTransfer)) return;
+      const files = event.target ? (event.target as HTMLInputElement).files : (event.dataTransfer as DataTransfer).files;
+      if (files !== null) {
+        supportDocumentsList.value = Object.values(files);
+      }
+    };
+
+    const onClearSupportFiles = () => {
+      supportDocumentsList.value = [];
+    };
+
+    const pickSupportFileType = (code: string | null) => {
+      supportSelectedFileTypeCode.value = code;
+    };
+
+    const uploadSupportFiles = async () => {
+      if (!supportSelectedFileTypeCode.value) {
+        showToaster('error', appContextStore.t('toaster.chooseDocumentType') || 'Выберите тип документа', 3000);
+        return;
+      }
+      if (!supportDocumentsList.value.length) {
+        showToaster('error', appContextStore.t('toaster.noFileSelected') || 'Выберите файл', 3000);
+        return;
+      }
+      const selectedDocument = dictionariesStore.dicFileTypeList.find((i: Value) => String(i.code) === supportSelectedFileTypeCode.value);
+      if (!selectedDocument) {
+        showToaster('error', appContextStore.t('toaster.chooseDocumentType') || 'Выберите тип документа', 3000);
+        return;
+      }
+
+      documentLoading.value = true;
+      try {
+        await Promise.allSettled(
+          supportDocumentsList.value.map(async file => {
+            if (file.type !== constants.fileTypes.pdf && file.type !== constants.fileTypes.docx && file.type !== constants.fileTypes.doc) {
+              showToaster('error', appContextStore.t('toaster.onlyWithFormat', { format: 'PDF, Word' }), 6000);
+              return;
+            }
+            if (file.size >= 20_000_000) {
+              showToaster('error', appContextStore.t('toaster.fileOnlyBelow20mb'), 6000);
+              return;
+            }
+
+            const formData = new FormData();
+            const ext = file.name.substring(file.name.lastIndexOf('.'));
+            const uuidV4 = uuid.v4();
+            formData.append('file', file);
+            formData.append(
+              'fileData',
+              JSON.stringify([
+                {
+                  identifier: `${uuidV4}${ext}`,
+                  processInstanceId: formStore.applicationData.processInstanceId,
+                  fileTypeCode: selectedDocument.code,
+                  fileTypeId: selectedDocument.id,
+                  fileName: file.name,
+                },
+              ]),
+            );
+            await formStore.uploadFiles(formData, false);
+          }),
+        );
+        onClearSupportFiles();
+        await dataStore.getSignedDocList(formStore.applicationData.processInstanceId);
+      } finally {
+        documentLoading.value = false;
+      }
+    };
+
     const onFileChange = async (event: InputEvent) => {
       if (event.target) {
         const files = (event.target as HTMLInputElement).files;
@@ -509,6 +698,7 @@ export default defineComponent({
 
     const openDigitalDocPanel = async (iin: string, title: string) => {
       isPanelOpen.value = false;
+      isSupportAttachOpen.value = false;
       isDigitalDocOpen.value = true;
       dataStore.panelAction = null;
       dataStore.rightPanel.open = true;
@@ -534,10 +724,10 @@ export default defineComponent({
       },
     );
 
-    const getDoc = async (type: FileActions) => {
+    const getDoc = async (type: FileActions, selectedType?: 'pdf' | 'docx') => {
       if (currentDocument.value) {
         documentLoading.value = true;
-        const fileExtension = currentDocument.value.fileName!.match(/\.([0-9a-z]+)(?:[\?#]|$)/i)![1];
+        const fileExtension = selectedType || currentDocument.value.fileName?.match(/\.([0-9a-z]+)(?:[\?#]|$)/i)?.[1]?.toLowerCase() || 'pdf';
         await formStore.getDoc(currentDocument.value, type, fileExtension);
         documentLoading.value = false;
       }
@@ -712,8 +902,13 @@ export default defineComponent({
       memberStore,
       processCode,
       isPanelOpen,
+      isSupportAttachOpen,
+      isDownloadFormatOpen,
+      downloadingDocData,
       jointMembers,
       DocumentItem,
+      downloadType,
+      downloadTypes,
       documentType,
       documentItems,
       signedContract,
@@ -722,6 +917,11 @@ export default defineComponent({
       documentLoading,
       isDigitalDocOpen,
       underDocumentsList,
+      supportDocumentsList,
+      supportTypeSearch,
+      supportFileTypeItems,
+      filteredSupportFileTypeItems,
+      supportSelectedFileTypeCode,
 
       // Computed
       isDisabled,
@@ -729,6 +929,7 @@ export default defineComponent({
       showContract,
       noDocuments,
       canDeleteFiles,
+      isSupportAttachmentSection,
       insuredFiltered,
       policyholderForm,
       slaveInsuredForm,
@@ -742,26 +943,28 @@ export default defineComponent({
       getCode,
       getDoc,
       openPanel,
+      openSupportAttachPanel,
+      openDownloadFormatPanel,
+      downloadFile,
       deleteFile,
       getDigitalDocument,
       onFileChange,
       onUnderFiles,
+      onSupportFiles,
       openDigitalDocPanel,
       uploadUnderFiles,
       onClearUnderFiles,
+      onClearSupportFiles,
+      uploadSupportFiles,
       uploadAdditionalFile,
       memberHasDocumentsToSign,
+      pickSupportFileType,
     };
   },
 });
 </script>
 
 <style>
-.document-type-select .v-field {
-  border: none !important;
-  border-radius: 4px;
-  height: 56px;
-}
 .digital-document-otp .base-otp-input .v-otp-input__content {
   gap: 8px;
   padding-right: 0px !important;

package/composables/index.ts

@@ -318,23 +318,95 @@ export const ESBDMessage = (ESBDObject: any, initialPoint: any) => {
 };
 
 export const ErrorHandler = (err: unknown, errorText?: string) => {
-  console.log(err);
-  if (useDataStore) {
-    const dataStore = useDataStore();
-    if (typeof err === 'string') showToaster('error', err);
+  console.error('[ErrorHandler]', err);
+
+  try {
+    if (typeof err === 'string') {
+      showToaster('error', err, 6000);
+      return false;
+    }
+
     if (err instanceof AxiosError) {
-      if ('response' in err && err.response && err.response.data) {
-        if (err.response.data === Object(err.response.data) && 'errors' in err.response.data && 'title' in err.response.data && 'traceId' in err.response.data) {
-          Object.entries(err.response.data.errors).forEach(([field, errors]) => {
-            showToaster('error', `Поле: ${field}. Ошибка: ${Array.isArray(errors) ? errors.join(', ') : errors}`, 10000);
-          });
-        } else {
-          showToaster('error', errorText ? errorText : err.response.data, 10000);
+      const response = err.response;
+      if (!response) {
+        const message =
+          err.code === 'ECONNABORTED'
+            ? 'Время ожидания истекло'
+            : err.code === 'ENOTFOUND'
+              ? 'Сервер недоступен'
+              : err.code === 'ERR_NETWORK'
+                ? 'Ошибка сети'
+                : errorText || err.message || 'Произошла ошибка при выполнении запроса';
+        showToaster('error', message, 6000);
+        return false;
+      }
+
+      const responseData = response.data as unknown;
+
+      if (responseData instanceof ArrayBuffer) {
+        const decoded = new TextDecoder('utf-8').decode(new Uint8Array(responseData)).trim();
+        showToaster('error', decoded || errorText || `Ошибка: ${response.status} ${response.statusText}`, 10000);
+        return false;
+      }
+
+      if (typeof responseData === 'string') {
+        showToaster('error', responseData || errorText || `Ошибка: ${response.status} ${response.statusText}`, 10000);
+        return false;
+      }
+
+      if (
+        typeof responseData === 'object' &&
+        responseData !== null &&
+        'errors' in responseData &&
+        'title' in responseData &&
+        'traceId' in responseData &&
+        typeof (responseData as { errors?: unknown }).errors === 'object'
+      ) {
+        Object.entries((responseData as { errors: Record<string, unknown> }).errors).forEach(([field, errors]) => {
+          const errorMessage = Array.isArray(errors) ? errors.join(', ') : String(errors);
+          showToaster('error', `Поле: ${field}. Ошибка: ${errorMessage}`, 10000);
+        });
+        return false;
+      }
+
+      if (typeof responseData === 'object' && responseData !== null && 'message' in responseData) {
+        const message = String((responseData as { message?: unknown }).message || '').trim();
+        if (message) {
+          showToaster('error', message, 6000);
+          return false;
         }
       }
+
+      if (
+        typeof responseData === 'object' &&
+        responseData !== null &&
+        'error' in responseData &&
+        typeof (responseData as { error?: unknown }).error === 'object' &&
+        (responseData as { error?: unknown }).error !== null
+      ) {
+        const error = (responseData as { error: { message?: unknown } }).error;
+        if ('message' in error && typeof error.message === 'string') {
+          showToaster('error', error.message, 6000);
+          return false;
+        }
+      }
+
+      showToaster('error', errorText || `Ошибка: ${response.status} ${response.statusText}`, 6000);
+      return false;
+    }
+
+    if (err instanceof Error) {
+      showToaster('error', errorText || err.message, 6000);
+      return false;
     }
+
+    showToaster('error', errorText || 'Произошла неизвестная ошибка', 6000);
+    return false;
+  } catch (handlerErr) {
+    console.error('[ErrorHandler] Ошибка при обработке ошибки:', handlerErr);
+    showToaster('error', 'Ошибка при обработке запроса', 6000);
+    return false;
   }
-  return false;
 };
 
 export const policyholderToBeneficialOwner = (isPolicyholderBeneficialOwner: boolean, policyholder?: PolicyholderClass) => {

package/package.json

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

package/store/data.store.ts

@@ -1078,7 +1078,7 @@ export const useDataStore = defineStore('data', {
       }
       this.isButtonsLoading = false;
     },
-    async generatePDFDocument(name: string, code: string, format: 'pdf' | 'doc' = 'pdf', open: boolean = false) {
+    async generatePDFDocument(name: string, code: string, format: 'pdf' | 'docx' = 'pdf', open: boolean = false) {
       const dictionariesStore = useDictionariesStore();
       try {
         this.isButtonsLoading = true;
@@ -1088,7 +1088,13 @@ export const useDataStore = defineStore('data', {
           name: name,
           format: format,
         };
-        const response: any = await this.api.generatePdfDocument(data);
+        let response: any;
+        if (format === 'pdf') {
+          response = await this.api.generatePdfDocument(data);
+        } else {
+          response = await this.api.generateDocDocument(data);
+        }
+
         const blob = new Blob([response], {
           type: format === 'pdf' ? `application/pdf` : `application/vnd.openxmlformats-officedocument.wordprocessingml.document`,
         });

package/store/form.store.ts

@@ -72,7 +72,7 @@ export const useFormStore = defineStore('forms', {
             }
           });
         } else {
-          await this.api.file.getDoc(file.id).then((response: any) => {
+          await this.api.file.getDoc(file.id).then((response: any) => {            
             if (!['pdf', 'docx'].includes(fileType)) {
               const blob = new Blob([response], { type: `image/${fileType}` });
               const url = window.URL.createObjectURL(blob);