diff --git a/src/components/NavBar.vue b/src/components/NavBar.vue index 9174e4d3a..80f6dba45 100644 --- a/src/components/NavBar.vue +++ b/src/components/NavBar.vue @@ -48,24 +48,13 @@ onMounted(() => stateStore.setMounted());
-
+
{{ t('globals.pinnedModules') }} - - - {{ t('globals.collapseMenu') }} - - stateStore.setMounted()); +
diff --git a/src/components/PaginateData.vue b/src/components/PaginateData.vue index 78389f75b..849cadb98 100644 --- a/src/components/PaginateData.vue +++ b/src/components/PaginateData.vue @@ -86,6 +86,7 @@ async function paginate() { if (!props.url) return; + isLoading.value = true; await arrayData.loadMore(); if (!arrayData.hasMoreData.value) { @@ -121,7 +122,7 @@ async function onLoad(...params) { diff --git a/src/pages/Claim/Card/ClaimLog.vue b/src/pages/Claim/Card/ClaimLog.vue index d71b565e9..d9fe3eb60 100644 --- a/src/pages/Claim/Card/ClaimLog.vue +++ b/src/pages/Claim/Card/ClaimLog.vue @@ -1,120 +1,190 @@ + en: + actions: + insert: Creates + update: Updates + delete: Deletes models: Claim: Claim + ClaimDms: Document + ClaimBeginning: Claimed Sales + ClaimObservation: Observation properties: id: ID + claimFk: Claim ID + saleFk: Sale ID + quantity: Quantity observation: Observation + ticketCreated: Created + created: Created + isChargedToMana: Charged to mana + hasToPickUp: Has to pick Up + dmsFk: Document ID + text: Description es: + Audit logs: Registros de auditoría + Property: Propiedad + Before: Antes + After: Después + Yes: Si + Nothing: Nada + actions: + insert: Crea + update: Actualiza + delete: Elimina models: Claim: Reclamación + ClaimDms: Documento + ClaimBeginning: Línea reclamada + ClaimObservation: Observación properties: id: ID + claimFk: ID reclamación + saleFk: ID linea de venta + quantity: Cantidad observation: Observación + ticketCreated: Creado + created: Creado + isChargedToMana: Cargado a maná + hasToPickUp: Se debe recoger + dmsFk: ID documento + text: Descripción diff --git a/src/pages/Claim/Card/ClaimLogFilter.vue b/src/pages/Claim/Card/ClaimLogFilter.vue new file mode 100644 index 000000000..33cf823d2 --- /dev/null +++ b/src/pages/Claim/Card/ClaimLogFilter.vue @@ -0,0 +1,79 @@ + + + + + +en: + params: + search: Contains + userFk: User + created: Created +es: + params: + search: Contiene + userFk: Usuario + created: Creada + User: Usuario + diff --git a/src/pages/Claim/Card/ClaimPhoto.vue b/src/pages/Claim/Card/ClaimPhoto.vue index 9e89211b2..d47f9798f 100644 --- a/src/pages/Claim/Card/ClaimPhoto.vue +++ b/src/pages/Claim/Card/ClaimPhoto.vue @@ -239,7 +239,7 @@ function onDrag() { - +