diff --git a/src/components/VnTable/VnTable.vue b/src/components/VnTable/VnTable.vue index a3b64d264b..621e2acfc8 100644 --- a/src/components/VnTable/VnTable.vue +++ b/src/components/VnTable/VnTable.vue @@ -639,18 +639,10 @@ function handleOnDataSaved(_) { :key="col?.id" class="text-center" > -
- {{ - rows.reduce( - (sum, currentRow) => sum + currentRow[col.name], - 0 - ) - }} -
+ diff --git a/src/components/ui/VnPaginate.vue b/src/components/ui/VnPaginate.vue index 79a79c383a..37101dafea 100644 --- a/src/components/ui/VnPaginate.vue +++ b/src/components/ui/VnPaginate.vue @@ -131,9 +131,8 @@ async function fetch(params) { useArrayData(props.dataKey, params); arrayData.reset(['filter.skip', 'skip']); await arrayData.fetch({ append: false }); - if (!store.hasMoreData) { - isLoading.value = false; - } + if (!store.hasMoreData) isLoading.value = false; + emit('onFetch', store.data); return store.data; } diff --git a/src/css/quasar.variables.scss b/src/css/quasar.variables.scss index aeac483be4..9f7c628488 100644 --- a/src/css/quasar.variables.scss +++ b/src/css/quasar.variables.scss @@ -36,7 +36,6 @@ $color-font-secondary: #777; .bg-success { background-color: $positive; } - .bg-notice { background-color: $info; } diff --git a/src/pages/Entry/Card/EntrySummary.vue b/src/pages/Entry/Card/EntrySummary.vue index 379be1d2f6..58a5c2e1bc 100644 --- a/src/pages/Entry/Card/EntrySummary.vue +++ b/src/pages/Entry/Card/EntrySummary.vue @@ -10,6 +10,7 @@ import TravelDescriptorProxy from 'src/pages/Travel/Card/TravelDescriptorProxy.v import { toDate, toCurrency } from 'src/filters'; import { getUrl } from 'src/composables/getUrl'; import axios from 'axios'; +import FetchedTags from 'src/components/ui/FetchedTags.vue'; const route = useRoute(); const { t } = useI18n(); @@ -163,7 +164,7 @@ const fetchEntryBuys = async () => { >