diff --git a/src/components/FormModel.vue b/src/components/FormModel.vue
index 758ddd433..115145f37 100644
--- a/src/components/FormModel.vue
+++ b/src/components/FormModel.vue
@@ -159,8 +159,8 @@ onBeforeRouteLeave((to, from, next) => {
quasar.dialog({
component: VnConfirm,
componentProps: {
- title: t('Unsaved changes will be lost'),
- message: t('Are you sure exit without saving?'),
+ title: t('globals.unsavedPopup.title'),
+ message: t('globals.unsavedPopup.subtitle'),
promise: () => next(),
},
});
@@ -356,8 +356,3 @@ defineExpose({
padding: 32px;
}
-
-es:
- Unsaved changes will be lost: Los cambios que no haya guardado se perderán
- Are you sure exit without saving?: ¿Seguro que quiere salir sin guardar?
-
diff --git a/src/components/ui/VnNotes.vue b/src/components/ui/VnNotes.vue
index f4cdde310..cd2c1474c 100644
--- a/src/components/ui/VnNotes.vue
+++ b/src/components/ui/VnNotes.vue
@@ -1,13 +1,18 @@
diff --git a/src/components/ui/VnPaginate.vue b/src/components/ui/VnPaginate.vue
index fd903e759..c27111df4 100644
--- a/src/components/ui/VnPaginate.vue
+++ b/src/components/ui/VnPaginate.vue
@@ -115,8 +115,8 @@ watch(
);
watch(
- () => props.url,
- (url) => fetch({ url })
+ () => [props.url, props.filter],
+ ([url, filter]) => fetch({ url, filter })
);
const addFilter = async (filter, params) => {
diff --git a/src/css/app.scss b/src/css/app.scss
index 401fa8a72..3efe92db4 100644
--- a/src/css/app.scss
+++ b/src/css/app.scss
@@ -194,13 +194,6 @@ select:-webkit-autofill {
justify-content: center;
}
-.q-card,
-.q-table,
-.q-table__bottom,
-.q-drawer {
- background-color: var(--vn-section-color);
-}
-
input[type='number'] {
-moz-appearance: textfield;
}
@@ -254,6 +247,16 @@ input::-webkit-inner-spin-button {
white-space: nowrap;
text-overflow: ellipsis;
}
+ tr {
+ th {
+ font-size: 11pt;
+ }
+ td {
+ font-size: 11pt;
+ border-top: 1px solid var(--vn-page-color);
+ border-collapse: collapse;
+ }
+ }
.shrink {
max-width: 75px;
}
diff --git a/src/pages/Claim/Card/ClaimAction.vue b/src/pages/Claim/Card/ClaimAction.vue
index e64eab81d..2e890dba8 100644
--- a/src/pages/Claim/Card/ClaimAction.vue
+++ b/src/pages/Claim/Card/ClaimAction.vue
@@ -31,7 +31,7 @@ const destinationTypes = ref([]);
const totalClaimed = ref(null);
const DEFAULT_MAX_RESPONSABILITY = 5;
const DEFAULT_MIN_RESPONSABILITY = 1;
-const arrayData = useArrayData('claimData');
+const arrayData = useArrayData('Claim');
const marker_labels = [
{ value: DEFAULT_MIN_RESPONSABILITY, label: t('claim.company') },
{ value: DEFAULT_MAX_RESPONSABILITY, label: t('claim.person') },
diff --git a/src/pages/Claim/Card/ClaimNotes.vue b/src/pages/Claim/Card/ClaimNotes.vue
index 83e144e97..a4d11e9f6 100644
--- a/src/pages/Claim/Card/ClaimNotes.vue
+++ b/src/pages/Claim/Card/ClaimNotes.vue
@@ -14,22 +14,24 @@ const $props = defineProps({
});
const claimId = computed(() => $props.id || route.params.id);
-const claimFilter = {
- where: { claimFk: claimId.value },
- fields: ['id', 'created', 'workerFk', 'text'],
- include: {
- relation: 'worker',
- scope: {
- fields: ['id', 'firstName', 'lastName'],
- include: {
- relation: 'user',
- scope: {
- fields: ['id', 'nickname'],
+const claimFilter = computed(() => {
+ return {
+ where: { claimFk: claimId.value },
+ fields: ['id', 'created', 'workerFk', 'text'],
+ include: {
+ relation: 'worker',
+ scope: {
+ fields: ['id', 'firstName', 'lastName'],
+ include: {
+ relation: 'user',
+ scope: {
+ fields: ['id', 'nickname'],
+ },
},
},
},
- },
-};
+ };
+});
const body = {
claimFk: claimId.value,
diff --git a/src/pages/Claim/Card/ClaimPhoto.vue b/src/pages/Claim/Card/ClaimPhoto.vue
index 076f8d092..21f1be6ed 100644
--- a/src/pages/Claim/Card/ClaimPhoto.vue
+++ b/src/pages/Claim/Card/ClaimPhoto.vue
@@ -1,6 +1,6 @@