diff --git a/src/components/ui/CardDescriptor.vue b/src/components/ui/CardDescriptor.vue
index f63b75de62..3fa681638d 100644
--- a/src/components/ui/CardDescriptor.vue
+++ b/src/components/ui/CardDescriptor.vue
@@ -1,8 +1,9 @@
diff --git a/src/composables/useArrayData.js b/src/composables/useArrayData.js
index 35997c9d50..348c8e23f8 100644
--- a/src/composables/useArrayData.js
+++ b/src/composables/useArrayData.js
@@ -29,6 +29,10 @@ export function useArrayData(key, userOptions) {
}
});
+ if (key && userOptions) {
+ setOptions();
+ }
+
function setOptions() {
const allowedOptions = [
'url',
@@ -97,6 +101,7 @@ export function useArrayData(key, userOptions) {
store.isLoading = false;
canceller = null;
+ return response;
}
function destroy() {
@@ -147,10 +152,11 @@ export function useArrayData(key, userOptions) {
if (store.userParams && Object.keys(store.userParams).length !== 0)
query.params = JSON.stringify(store.userParams);
- router.replace({
- path: route.path,
- query: query,
- });
+ if (router)
+ router.replace({
+ path: route.path,
+ query: query,
+ });
}
const totalRows = computed(() => (store.data && store.data.length) || 0);
diff --git a/src/pages/Claim/Card/ClaimAction.vue b/src/pages/Claim/Card/ClaimAction.vue
index 22e32a8835..2d8498367e 100644
--- a/src/pages/Claim/Card/ClaimAction.vue
+++ b/src/pages/Claim/Card/ClaimAction.vue
@@ -2,7 +2,7 @@
import { ref, computed, onMounted } from 'vue';
import { useQuasar } from 'quasar';
import { useI18n } from 'vue-i18n';
-import { useRoute } from 'vue-router';
+import { useRoute, useRouter } from 'vue-router';
import axios from 'axios';
import { useStateStore } from 'src/stores/useStateStore';
import { toDate, toPercentage, toCurrency } from 'filters/index';
@@ -17,6 +17,7 @@ import { useArrayData } from 'composables/useArrayData';
const { t } = useI18n();
const quasar = useQuasar();
const route = useRoute();
+const router = useRouter();
const stateStore = computed(() => useStateStore());
const claim = ref(null);
const claimRef = ref();
@@ -30,6 +31,7 @@ const selectedRows = ref([]);
const destinationTypes = ref([]);
const totalClaimed = ref(null);
const DEFAULT_MAX_RESPONSABILITY = 5;
+const arrayData = useArrayData('claimData');
const columns = computed(() => [
{
@@ -140,9 +142,7 @@ async function regularizeClaim() {
type: 'positive',
});
}
- claimActionsForm.value.reload();
- const arrayData = useArrayData('Claim');
- await arrayData.refresh();
+ await arrayData.fetch({ append: false });
}
async function updateGreuge(greuges) {
diff --git a/src/pages/Claim/Card/ClaimDescriptor.vue b/src/pages/Claim/Card/ClaimDescriptor.vue
index 147974c36e..9dd8aa1f60 100644
--- a/src/pages/Claim/Card/ClaimDescriptor.vue
+++ b/src/pages/Claim/Card/ClaimDescriptor.vue
@@ -64,11 +64,10 @@ const filter = {
const STATE_COLOR = {
pending: 'positive',
-
managed: 'warning',
-
resolved: 'negative',
};
+
function stateColor(code) {
return STATE_COLOR[code];
}