diff --git a/src/api/ADempiere/user-interface.js b/src/api/ADempiere/user-interface.js index 8e70b41c..d81a0f1b 100644 --- a/src/api/ADempiere/user-interface.js +++ b/src/api/ADempiere/user-interface.js @@ -19,19 +19,19 @@ import { request } from '@/utils/ADempiere/request' /** * Get Attachment - * @param {number} recordId - * @param {string} recordUuid // TODO: Add suppport to record uuid on backend + * @param {number} resourceId + * @param {string} resourceUuid // TODO: Add suppport to resource uuid on backend */ export function requestResourceReference({ - recordId, - recordUuid + resourceId, + resourceUuid }) { return request({ - url: '/ui/resource-reference', + url: '/user-interface/common/resource-reference', method: 'get', params: { - image_id: recordId, - image_uuid: recordUuid + resource_id: resourceId, + resource_uuid: resourceUuid } }) .then(response => { @@ -51,7 +51,7 @@ export function requestAttachment({ recordUuid }) { return request({ - url: '/ui/attachment', + url: '/user-interface/common/attachment', method: 'get', params: { table_name: tableName, diff --git a/src/components/ADempiere/Attachment/index.vue b/src/components/ADempiere/Attachment/index.vue new file mode 100644 index 00000000..61c2fa20 --- /dev/null +++ b/src/components/ADempiere/Attachment/index.vue @@ -0,0 +1,239 @@ + + + + + + diff --git a/src/image/ADempiere/excel.png b/src/image/ADempiere/excel.png new file mode 100644 index 00000000..b9a55ef7 Binary files /dev/null and b/src/image/ADempiere/excel.png differ diff --git a/src/image/ADempiere/html.png b/src/image/ADempiere/html.png new file mode 100644 index 00000000..325e2c18 Binary files /dev/null and b/src/image/ADempiere/html.png differ diff --git a/src/image/ADempiere/pdf.png b/src/image/ADempiere/pdf.png new file mode 100644 index 00000000..fa8bf9c1 Binary files /dev/null and b/src/image/ADempiere/pdf.png differ diff --git a/src/lang/ADempiere/en.js b/src/lang/ADempiere/en.js index b66e642c..9ce2c4c9 100644 --- a/src/lang/ADempiere/en.js +++ b/src/lang/ADempiere/en.js @@ -311,6 +311,7 @@ export default { deleteRecord: 'Delete Record', undoNew: 'Undo New Record', containerInfo: { + attachment: 'Attachment', notes: 'Notes List', changeLog: 'ACtivity', workflowLog: 'Workflow Log', diff --git a/src/lang/ADempiere/es.js b/src/lang/ADempiere/es.js index dc513325..2d3a3579 100644 --- a/src/lang/ADempiere/es.js +++ b/src/lang/ADempiere/es.js @@ -287,6 +287,7 @@ export default { deleteRecord: 'Eliminar Registro', undoNew: 'Descartar Nuevo Registro', containerInfo: { + attachment: 'Anexo', notes: 'Listado de Notas', changeLog: 'Actividad', workflowLog: 'Histórico de Flujo de Trabajo', diff --git a/src/store/modules/ADempiere/attachment.js b/src/store/modules/ADempiere/attachment.js new file mode 100644 index 00000000..2a42da29 --- /dev/null +++ b/src/store/modules/ADempiere/attachment.js @@ -0,0 +1,47 @@ +import { requestAttachment } from '@/api/ADempiere/user-interface.js' + +const initStateAttachment = { + listAttachment: [] +} + +const attachment = { + state: initStateAttachment, + mutations: { + setListAttachment(state, payload) { + state.listAttachment = payload + } + }, + actions: { + attachments({ commit }, { + tableName, + recordId, + recordUuid + }) { + requestAttachment({ + tableName, + recordId, + recordUuid + }) + .then(response => { + const list = response.resource_references_list.map(file => { + return { + name: file.file_name, + type: file.content_type, + description: file.description, + size: file.file_size, + uuid: file.resource_uuid, + text: file.text_msg + } + }) + commit('setListAttachment', list) + }) + } + }, + getters: { + getListAttachment: (state) => { + return state.listAttachment + } + } +} + +export default attachment diff --git a/src/store/modules/ADempiere/processLog.js b/src/store/modules/ADempiere/processLog.js index 0c0cf121..b6bdb2c2 100644 --- a/src/store/modules/ADempiere/processLog.js +++ b/src/store/modules/ADempiere/processLog.js @@ -59,7 +59,7 @@ const processLog = { pageSize }) { // process Activity - return requestListProcessesLogs({ userUuid: getters['user/getUserUuid'], pageToken, pageSize }) + return requestListProcessesLogs({ pageToken, pageSize }) .then(processActivityResponse => { const responseList = processActivityResponse.processLogsList.map(processLogItem => { const { uuid: containerUuid } = processLogItem diff --git a/src/views/ADempiere/Window/index.vue b/src/views/ADempiere/Window/index.vue index bc86e685..af96942f 100644 --- a/src/views/ADempiere/Window/index.vue +++ b/src/views/ADempiere/Window/index.vue @@ -150,6 +150,19 @@ + + + + {{ $t('window.containerInfo.attachment') }} + +
+ +
+
@@ -315,6 +328,19 @@ + + + + {{ $t('window.containerInfo.attachment') }} + +
+ +
+

diff --git a/src/views/ADempiere/Window/windowLogicComponent.js b/src/views/ADempiere/Window/windowLogicComponent.js index 1b2c4a6e..0b17918c 100644 --- a/src/views/ADempiere/Window/windowLogicComponent.js +++ b/src/views/ADempiere/Window/windowLogicComponent.js @@ -25,6 +25,7 @@ import DataTable from '@/components/ADempiere/DataTable' import splitPane from 'vue-splitpane' // Container Info import ChatEntries from '@/components/ADempiere/ChatEntries' +import Attachment from '@/components/ADempiere/Attachment/index.vue' import ListChatEntry from '@/components/ADempiere/ChatEntries/listChatEntry' import RecordLogs from '@/components/ADempiere/ContainerInfo/recordLogs' import WorkflowLogs from '@/components/ADempiere/ContainerInfo/workflowLogs' @@ -52,6 +53,7 @@ export default { RightPanel, ChatEntries, ListChatEntry, + Attachment, RecordLogs, WorkflowLogs, WorkflowStatusBar,