From 7ae05f23fccee0345990f0a7554a78a60cb128a7 Mon Sep 17 00:00:00 2001
From: carlossa <carlossa@verdnatura.es>
Date: Thu, 4 Jan 2024 14:38:33 +0100
Subject: [PATCH] refs #6420 notes
---
src/components/ui/VnNotes.vue | 2 +-
src/components/ui/VnPaginate.vue | 8 +++++++-
src/pages/Claim/Card/ClaimNotes.vue | 6 +++++-
src/pages/Claim/Card/ClaimSummary.vue | 8 +++++---
4 files changed, 18 insertions(+), 6 deletions(-)
diff --git a/src/components/ui/VnNotes.vue b/src/components/ui/VnNotes.vue
index f02551575..b9a009a32 100644
--- a/src/components/ui/VnNotes.vue
+++ b/src/components/ui/VnNotes.vue
@@ -28,7 +28,7 @@ async function insert() {
}
</script>
<template>
- <div class="column items-center">
+ <div class="column items-center full-height">
<VnPaginate
:data-key="$props.url"
:url="$props.url"
diff --git a/src/components/ui/VnPaginate.vue b/src/components/ui/VnPaginate.vue
index c75761462..7470a4d74 100644
--- a/src/components/ui/VnPaginate.vue
+++ b/src/components/ui/VnPaginate.vue
@@ -168,7 +168,13 @@ async function onLoad(...params) {
</QCard>
</div>
</div>
- <QInfiniteScroll v-if="store.data" @load="onLoad" :offset="offset" class="full-width">
+ <QInfiniteScroll
+ v-if="store.data"
+ @load="onLoad"
+ :offset="offset"
+ class="full-width full-height"
+ style="overflow: auto"
+ >
<slot name="body" :rows="store.data"></slot>
<div v-if="isLoading" class="info-row q-pa-md text-center">
<QSpinner color="orange" size="md" />
diff --git a/src/pages/Claim/Card/ClaimNotes.vue b/src/pages/Claim/Card/ClaimNotes.vue
index 84d350e38..35ecb0451 100644
--- a/src/pages/Claim/Card/ClaimNotes.vue
+++ b/src/pages/Claim/Card/ClaimNotes.vue
@@ -8,6 +8,10 @@ const state = useState();
const user = state.getUser();
const id = route.params.id;
+const $props = defineProps({
+ addNote: { type: Boolean, default: true },
+});
+
const claimFilter = {
where: { claimFk: id },
fields: ['created', 'workerFk', 'text'],
@@ -27,7 +31,7 @@ const body = {
<template>
<div class="column items-center">
<VnNotes
- :add-note="true"
+ :add-note="$props.addNote"
:id="id"
url="claimObservations"
:filter="claimFilter"
diff --git a/src/pages/Claim/Card/ClaimSummary.vue b/src/pages/Claim/Card/ClaimSummary.vue
index 6bc0a8b66..9f2fa20d6 100644
--- a/src/pages/Claim/Card/ClaimSummary.vue
+++ b/src/pages/Claim/Card/ClaimSummary.vue
@@ -225,13 +225,15 @@ function openDialog(dmsId) {
</template>
</VnLv>
</QCard>
- <QCard class="vn-one">
+ <QCard class="vn-max">
<a class="header" :href="`#/claim/${entityId}/notes`">
{{ t('claim.summary.notes') }}
<QIcon name="open_in_new" color="primary" />
</a>
- <ClaimNotes />
- <QVirtualScroll :items="observations" separator> </QVirtualScroll>
+ <ClaimNotes :add-note="false" style="height: 600px" />
+ <!-- <QVirtualScroll :items="observations" separator
+ >
+ </QVirtualScroll> -->
</QCard>
<QCard class="vn-max" v-if="salesClaimed.length > 0">
<a class="header" :href="`#/claim/${entityId}/notes`">