diff --git a/frontend/src/ts/ervu/component/fileupload/ErvuFileUploadWithAdditionalFiles.ts b/frontend/src/ts/ervu/component/fileupload/ErvuFileUploadWithAdditionalFiles.ts
index 89877279..b69b6043 100644
--- a/frontend/src/ts/ervu/component/fileupload/ErvuFileUploadWithAdditionalFiles.ts
+++ b/frontend/src/ts/ervu/component/fileupload/ErvuFileUploadWithAdditionalFiles.ts
@@ -59,11 +59,21 @@ export class ErvuFileUploadWithAdditionalFiles extends ErvuFileUpload {
response: string) => {
this.fileUploadFailedEvent.trigger();
this.uploader.cancelAll();
- this.messagesService.error(`Не удалось отправить следующие файлы: ${item.file.name},`
- + ` ${this.uploader.getNotUploadedItems()
- .map(notUploadeditem => notUploadeditem.file.name)
- .join(', ')}.`);
+ try {
+ var error = JSON.parse(response);
+ error.messages.forEach((errorMessage) => {
+ this.messagesService.error(errorMessage, error);
+ })
+ }
+ catch (error) {
+ this.messagesService.error(`Не удалось отправить следующие файлы: ${item.file.name}`
+ + ` ${this.uploader.getNotUploadedItems()
+ .map(notUploadeditem => notUploadeditem.file.name)
+ .join(', ')}.`);
+ }
this.uploader.clearQueue();
+ this.mchdFileUploadRef.uploader.clearQueue();
+ this.signFileUploadRef.uploader.clearQueue();
this.isDropZoneVisible = true;
this.isFilesListVisible = true;
this.isProgressBarVisible = false;
@@ -74,6 +84,8 @@ export class ErvuFileUploadWithAdditionalFiles extends ErvuFileUpload {
this.uploader.onCompleteAll = () => {
if (!this.isUploadErrorOccurred) {
this.uploader.clearQueue();
+ this.mchdFileUploadRef.uploader.clearQueue();
+ this.signFileUploadRef.uploader.clearQueue();
this.fileUploadEndEvent.trigger();
this.isProgressBarVisible = false;
this.cd.markForCheck();
diff --git a/resources/src/main/resources/business-model/Личный кабинет юр лица.page b/resources/src/main/resources/business-model/Личный кабинет юр лица.page
index 901c4492..20deeacb 100644
--- a/resources/src/main/resources/business-model/Личный кабинет юр лица.page
+++ b/resources/src/main/resources/business-model/Личный кабинет юр лица.page
@@ -3710,54 +3710,8 @@
- -
-
-
-
- behavior
-
- {"objectId":"409c0323-011e-4416-a631-f8f852299e1f","packageName":"ervu.component.fileupload","className":"ErvuFileUpload","type":"TS"}
-
-
-
- method
-
- "clearValue"
-
-
-
- value
-
- null
-
-
-
-
-
- -
-
-
-
- behavior
-
- {"objectId":"1dc25461-a60e-456b-93cb-cc0f28dc347b","packageName":"ervu.component.fileupload","className":"ErvuFileUpload","type":"TS"}
-
-
-
- method
-
- "clearValue"
-
-
-
- value
-
- null
-
-
-
-
-
+ -
-
-
-
- behavior
-
- {"objectId":"1dc25461-a60e-456b-93cb-cc0f28dc347b","packageName":"ervu.component.fileupload","className":"ErvuFileUpload","type":"TS"}
-
-
-
- method
-
- "clearValue"
-
-
-
- value
-
- null
-
-
-
-
-
- -
-
-
-
- behavior
-
- {"objectId":"409c0323-011e-4416-a631-f8f852299e1f","packageName":"ervu.component.fileupload","className":"ErvuFileUpload","type":"TS"}
-
-
-
- method
-
- "clearValue"
-
-
-
- value
-
- null
-
-
-
-
-
+