Merge branch 'dev' into 6911-saveOnEnter

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;

src/pages/Claim/Card/ClaimAction.vue

@@ -37,6 +37,7 @@ const marker_labels = [
     { value: DEFAULT_MAX_RESPONSABILITY, label: t('claim.summary.person') },
 ];
 const multiplicatorValue = ref();
+const loading = ref(false);
 
 const columns = computed(() => [
     {
@@ -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;
+    }
+}
 </script>
 <template>
     <FetchData
@@ -279,6 +288,7 @@ async function importToNewRefundTicket() {
         :default-save="false"
         :default-reset="false"
         @on-fetch="setData"
+        :limit="0"
         auto-load
     >
         <template #body>
@@ -390,6 +400,7 @@ async function importToNewRefundTicket() {
                 icon="check"
                 @click="regularizeClaim"
                 :disable="claim.claimStateFk == resolvedStateId"
+                :loading="loading"
             />
 
             <QBtn
@@ -401,6 +412,7 @@ async function importToNewRefundTicket() {
                 :title="t('Change destination')"
                 icon="swap_horiz"
                 @click="dialogDestination = !dialogDestination"
+                :loading="loading"
             />
             <QBtn
                 color="primary"
@@ -411,6 +423,7 @@ async function importToNewRefundTicket() {
                 icon="Upload"
                 @click="importToNewRefundTicket"
                 :disable="claim.claimStateFk == resolvedStateId"
+                :loading="loading"
             />
         </template>
     </CrudModel>