diff --git a/src/components/ui/VnPaginate.vue b/src/components/ui/VnPaginate.vue index f3f6d64f1..3649ba8f5 100644 --- a/src/components/ui/VnPaginate.vue +++ b/src/components/ui/VnPaginate.vue @@ -133,7 +133,7 @@ const addFilter = async (filter, params) => { async function fetch(params) { useArrayData(props.dataKey, params); arrayData.reset(['filter.skip', 'skip', 'page']); - await arrayData.fetch({ append: false }); + await arrayData.fetch({ append: false, updateRouter: mounted.value }); return emitStoreData(); } diff --git a/src/pages/Entry/EntryBuysTableDialog.vue b/src/pages/Entry/EntryBuysTableDialog.vue index c885c2485..3975bff19 100644 --- a/src/pages/Entry/EntryBuysTableDialog.vue +++ b/src/pages/Entry/EntryBuysTableDialog.vue @@ -82,11 +82,11 @@ const entriesTableColumns = computed(() => [ @@ -126,7 +126,9 @@ const entriesTableColumns = computed(() => [ " unelevated > - {{ t('viewLabel') }} + {{ + t('myEntries.viewLabel') + }} diff --git a/src/pages/Entry/MyEntries.vue b/src/pages/Entry/MyEntries.vue index 2c37c2c42..91a29b190 100644 --- a/src/pages/Entry/MyEntries.vue +++ b/src/pages/Entry/MyEntries.vue @@ -101,7 +101,7 @@ const columns = computed(() => [ name: 'tableActions', actions: [ { - title: t('printLabels'), + title: t('myEntries.printLabels'), icon: 'print', isPrimary: true, action: (row) => printBuys(row.id), diff --git a/src/pages/InvoiceOut/InvoiceOutList.vue b/src/pages/InvoiceOut/InvoiceOutList.vue index 092844386..f5a4f7d80 100644 --- a/src/pages/InvoiceOut/InvoiceOutList.vue +++ b/src/pages/InvoiceOut/InvoiceOutList.vue @@ -43,16 +43,17 @@ const columns = computed(() => [ { align: 'left', name: 'ref', - label: t('invoiceOutList.tableVisibleColumns.ref'), + label: t('globals.reference'), isTitle: true, component: 'select', attrs: { url: MODEL, optionLabel: 'ref', - optionValue: 'id', + optionValue: 'ref', }, - columnField: { - component: null, + columnField: { component: null }, + columnFilter: { + inWhere: true, }, }, { @@ -147,25 +148,22 @@ function openPdf(id) { } function downloadPdf() { - if (selectedRows.value.size === 0) return; - const selectedCardsArray = Array.from(selectedRows.value.values()); + if (selectedRows.value.size === 0) return; + const selectedCardsArray = Array.from(selectedRows.value.values()); - if (selectedRows.value.size === 1) { - const [invoiceOut] = selectedCardsArray; - openPdf(invoiceOut.id); - } else { - const invoiceOutIdsArray = selectedCardsArray.map( - (invoiceOut) => invoiceOut.id - ); - const invoiceOutIds = invoiceOutIdsArray.join(','); + if (selectedRows.value.size === 1) { + const [invoiceOut] = selectedCardsArray; + openPdf(invoiceOut.id); + } else { + const invoiceOutIdsArray = selectedCardsArray.map((invoiceOut) => invoiceOut.id); + const invoiceOutIds = invoiceOutIdsArray.join(','); - const params = { - ids: invoiceOutIds, - }; - - openReport(`${MODEL}/downloadZip`, params); - } + const params = { + ids: invoiceOutIds, + }; + openReport(`${MODEL}/downloadZip`, params); + } } watchEffect(selectedRows);