diff --git a/src/components/common/VnLog.vue b/src/components/common/VnLog.vue index 8a91d3c95..340a9e550 100644 --- a/src/components/common/VnLog.vue +++ b/src/components/common/VnLog.vue @@ -421,12 +421,13 @@ setLogTree(); >
- + diff --git a/src/components/ui/VnPaginate.vue b/src/components/ui/VnPaginate.vue index 4dae312ce..c00849512 100644 --- a/src/components/ui/VnPaginate.vue +++ b/src/components/ui/VnPaginate.vue @@ -95,6 +95,8 @@ const addFilter = async (filter, params) => { }; async function fetch() { + store.filter.skip = 0; + store.skip = 0; await arrayData.fetch({ append: false }); if (!store.hasMoreData) { isLoading.value = false; diff --git a/src/pages/Claim/Card/ClaimAction.vue b/src/pages/Claim/Card/ClaimAction.vue index b8624fb07..b0650b610 100644 --- a/src/pages/Claim/Card/ClaimAction.vue +++ b/src/pages/Claim/Card/ClaimAction.vue @@ -10,7 +10,7 @@ import { tMobile } from 'src/composables/tMobile'; import CrudModel from 'src/components/CrudModel.vue'; import FetchData from 'src/components/FetchData.vue'; import VnSelect from 'src/components/common/VnSelect.vue'; -import VnConfirm from 'src/components/ui/VnConfirm.vue'; +import ItemDescriptorProxy from 'src/pages/Item/Card/ItemDescriptorProxy.vue'; import TicketDescriptorProxy from 'src/pages/Ticket/Card/TicketDescriptorProxy.vue'; import { useArrayData } from 'composables/useArrayData'; @@ -37,10 +37,11 @@ const marker_labels = [ { value: DEFAULT_MAX_RESPONSABILITY, label: t('claim.summary.person') }, ]; const multiplicatorValue = ref(); +const loading = ref(false); const columns = computed(() => [ { - name: 'Id', + name: 'id', label: t('Id item'), field: (row) => row.itemFk, }, @@ -118,7 +119,7 @@ async function updateDestinations(claimDestinationFk) { async function updateDestination(claimDestinationFk, row, options = {}) { if (claimDestinationFk) { - await axios.post('Claims/updateClaimDestination', { + await post('Claims/updateClaimDestination', { claimDestinationFk, rows: Array.isArray(row) ? row : [row], }); @@ -127,7 +128,7 @@ async function updateDestination(claimDestinationFk, row, options = {}) { } async function regularizeClaim() { - await axios.post(`Claims/${claimId}/regularizeClaim`); + await post(`Claims/${claimId}/regularizeClaim`); await claimRef.value.fetch(); await arrayData.fetch({ append: false }); quasar.notify({ @@ -146,7 +147,7 @@ async function onUpdateGreugeAccept() { const freightPickUpPrice = (await axios.get(`GreugeConfigs/findOne`)).data.freightPickUpPrice * multiplicatorValue.value; - await axios.post(`Greuges`, { + await post(`Greuges`, { clientFk: claim.value.clientFk, description: `${t('ClaimGreugeDescription')} ${claimId}`.toUpperCase(), amount: freightPickUpPrice, @@ -165,14 +166,22 @@ async function save(data) { } async function importToNewRefundTicket() { - const query = `ClaimBeginnings/${claimId}/importToNewRefundTicket`; - await axios.post(query); - claimActionsForm.value.reload(); + await post(`ClaimBeginnings/${claimId}/importToNewRefundTicket`); + await claimActionsForm.value.reload(); quasar.notify({ message: t('globals.dataSaved'), type: 'positive', }); } + +async function post(query, params) { + loading.value = true; + try { + await axios.post(query, params); + } finally { + loading.value = false; + } +}