diff --git a/src/api/ADempiere/reportManagement/index.ts b/src/api/ADempiere/reportManagement/index.ts index 49b6f58cef..09a5aada4a 100644 --- a/src/api/ADempiere/reportManagement/index.ts +++ b/src/api/ADempiere/reportManagement/index.ts @@ -176,7 +176,7 @@ export function runExport({ reportId }) { return request({ - baseURL: `/report-engine/export/${reportId}/${format}`, + url: `/report-engine/export/${reportId}/${format}`, method: 'post' }) } diff --git a/src/lang/ADempiere/en/report.js b/src/lang/ADempiere/en/report.js index 2279db1fd7..5e74806992 100644 --- a/src/lang/ADempiere/en/report.js +++ b/src/lang/ADempiere/en/report.js @@ -104,7 +104,8 @@ const report = { printFormat: 'Print Format', viewReport: 'Report View', Detail: 'View Detailed', - summary: 'View Summary' + summary: 'View Summary', + exportFormat: 'Export Format' } } diff --git a/src/lang/ADempiere/es/report.js b/src/lang/ADempiere/es/report.js index 78043be6ea..d37d68f5f2 100644 --- a/src/lang/ADempiere/es/report.js +++ b/src/lang/ADempiere/es/report.js @@ -104,7 +104,8 @@ const report = { printFormat: 'Formato de Impresión', viewReport: 'Vista del Informe', Detail: 'Ver Detallado', - summary: 'Ver Resumido' + summary: 'Ver Resumido', + exportFormat: 'Formato de Exportación' } } diff --git a/src/utils/ADempiere/notification.js b/src/utils/ADempiere/notification.js index 0a9c6cc66a..9489aa58b5 100644 --- a/src/utils/ADempiere/notification.js +++ b/src/utils/ADempiere/notification.js @@ -80,7 +80,25 @@ export function showNotification({ type = 'success', title, message = '', summar } }) } - +export function showNotificationReport({ type = 'success', title, message, link }) { + return Notification({ + title, + message: ` +
+ ${message} +
+ `, + type, + position: 'bottom-right', + dangerouslyUseHTMLString: true, + onClick() { + router.push({ + name: title, + path: link + }, () => {}) + } + }) +} /** * * @param {string} type diff --git a/src/views/ADempiere/ReportViewerEngine/dialog/index.vue b/src/views/ADempiere/ReportViewerEngine/dialog/index.vue index 513a4e48d6..1f29ccace9 100644 --- a/src/views/ADempiere/ReportViewerEngine/dialog/index.vue +++ b/src/views/ADempiere/ReportViewerEngine/dialog/index.vue @@ -4,7 +4,7 @@ @@ -92,23 +92,15 @@ - + - - - + /> @@ -116,17 +108,9 @@ - - - + /> @@ -179,22 +163,22 @@ - - - - + + + + diff --git a/src/views/ADempiere/ReportViewerEngine/searchCriteria/index.vue b/src/views/ADempiere/ReportViewerEngine/searchCriteria/index.vue index fa02549ff2..c3691f4f1e 100644 --- a/src/views/ADempiere/ReportViewerEngine/searchCriteria/index.vue +++ b/src/views/ADempiere/ReportViewerEngine/searchCriteria/index.vue @@ -45,9 +45,13 @@ export default defineComponent({ required: true } }, - setup() { + setup(props, { root }) { function viewShowDialog() { store.commit('setShowDialog', true) + store.dispatch('exportReport', { + reportId: root.$route.params.reportId, + reportName: props.reportOutput.name + }) } return { viewShowDialog