diff --git a/src/components/ui/CardDescriptor.vue b/src/components/ui/CardDescriptor.vue index 2669b53a9..5c911a08e 100644 --- a/src/components/ui/CardDescriptor.vue +++ b/src/components/ui/CardDescriptor.vue @@ -62,7 +62,7 @@ async function getData() { filter: $props.filter, skip: 0, }); - const { data } = await arrayData.fetch({ append: false }); + const { data } = await arrayData.fetch({ append: false, updateRouter: false }); entity.value = data; emit('onFetch', data); } diff --git a/src/components/ui/VnAvatar.vue b/src/components/ui/VnAvatar.vue index b385b684f..85bece243 100644 --- a/src/components/ui/VnAvatar.vue +++ b/src/components/ui/VnAvatar.vue @@ -1,8 +1,10 @@ + + + + + + + + + + + + + + {{ + formatNumber(row.sms.destination) + }} + {{ row.sms.message }} + + + {{ + date.formatDate( + row.sms.created, + 'YYYY-MM-DD HH:mm:ss' + ) + }} + + + {{ row.sms.status }} + + + + + + + + + + + diff --git a/src/composables/useArrayData.js b/src/composables/useArrayData.js index 523340cc9..39c879f98 100644 --- a/src/composables/useArrayData.js +++ b/src/composables/useArrayData.js @@ -58,7 +58,7 @@ export function useArrayData(key, userOptions) { } } - async function fetch({ append = false }) { + async function fetch({ append = false, updateRouter = true }) { if (!store.url) return; cancelRequest(); @@ -100,15 +100,12 @@ export function useArrayData(key, userOptions) { hasMoreData.value = response.data.length === limit; - if (append === true) { + if (append) { if (!store.data) store.data = []; for (const row of response.data) store.data.push(row); - } - - if (append === false) { + } else { store.data = response.data; - - updateStateParams(); + updateRouter && updateStateParams(); } store.isLoading = false; @@ -155,7 +152,9 @@ export function useArrayData(key, userOptions) { delete store.userParams[param]; delete params[param]; if (store.filter?.where) { - delete store.filter.where[Object.keys(exprBuilder ? exprBuilder(param) : param)[0]]; + delete store.filter.where[ + Object.keys(exprBuilder ? exprBuilder(param) : param)[0] + ]; if (Object.keys(store.filter.where).length === 0) { delete store.filter.where; } diff --git a/src/i18n/en/index.js b/src/i18n/en/index.js index 4e69f05b7..679387aa6 100644 --- a/src/i18n/en/index.js +++ b/src/i18n/en/index.js @@ -114,6 +114,7 @@ export default { createCustomer: 'Create customer', summary: 'Summary', basicData: 'Basic Data', + sms: 'Sms', }, list: { phone: 'Phone', diff --git a/src/i18n/es/index.js b/src/i18n/es/index.js index ae3b8f553..c2d3c2dd9 100644 --- a/src/i18n/es/index.js +++ b/src/i18n/es/index.js @@ -113,6 +113,7 @@ export default { createCustomer: 'Crear cliente', basicData: 'Datos básicos', summary: 'Resumen', + sms: 'Sms', }, list: { phone: 'Teléfono', diff --git a/src/pages/Claim/Card/ClaimAction.vue b/src/pages/Claim/Card/ClaimAction.vue index fb47eeee2..e92e65fc7 100644 --- a/src/pages/Claim/Card/ClaimAction.vue +++ b/src/pages/Claim/Card/ClaimAction.vue @@ -282,6 +282,8 @@ async function importToNewRefundTicket() { selection="multiple" v-model:selected="selectedRows" :grid="$q.screen.lt.md" + :pagination="{ rowsPerPage: 0 }" + :hide-bottom="true" > @@ -335,7 +337,23 @@ async function importToNewRefundTicket() { - {{ column.value.description }} + + updateDestination( + value, + props.row + ) + " + /> {{ column.value }} @@ -417,25 +435,6 @@ async function importToNewRefundTicket() { -