From de68af5e132655d78c57ed91f820fa67bb887b91 Mon Sep 17 00:00:00 2001 From: guillermo Date: Mon, 15 Apr 2024 14:17:23 +0200 Subject: [PATCH 1/5] feat: refs #6724 Disabled QCheckbox entry isBooked --- src/pages/Entry/Card/EntryBasicData.vue | 2 ++ 1 file changed, 2 insertions(+) diff --git a/src/pages/Entry/Card/EntryBasicData.vue b/src/pages/Entry/Card/EntryBasicData.vue index 4a8cf154a..7af9238d6 100644 --- a/src/pages/Entry/Card/EntryBasicData.vue +++ b/src/pages/Entry/Card/EntryBasicData.vue @@ -205,7 +205,9 @@ const onFilterTravelSelected = (formData, id) => {
+ From 46fa06cf1e3c6042bc4e29ad2433896d85f7c854 Mon Sep 17 00:00:00 2001 From: guillermo Date: Tue, 16 Apr 2024 07:14:00 +0200 Subject: [PATCH 2/5] feat: refs #6724 Restriction QCheckbox entry isBooked --- src/pages/Entry/Card/EntryBasicData.vue | 6 ++++-- 1 file changed, 4 insertions(+), 2 deletions(-) diff --git a/src/pages/Entry/Card/EntryBasicData.vue b/src/pages/Entry/Card/EntryBasicData.vue index 7af9238d6..12e03fd32 100644 --- a/src/pages/Entry/Card/EntryBasicData.vue +++ b/src/pages/Entry/Card/EntryBasicData.vue @@ -2,6 +2,7 @@ import { ref } from 'vue'; import { useRoute } from 'vue-router'; import { useI18n } from 'vue-i18n'; +import { useRole } from 'src/composables/useRole'; import FetchData from 'components/FetchData.vue'; import FormModel from 'components/FormModel.vue'; @@ -15,6 +16,8 @@ import { toDate } from 'src/filters'; const route = useRoute(); const { t } = useI18n(); +const { hasAny } = useRole(); +const isAdministrative = () => hasAny(['administrative']); const suppliersOptions = ref([]); const travelsOptions = ref([]); @@ -205,9 +208,8 @@ const onFilterTravelSelected = (formData, id) => {
- From 248416b6763916d80c6990003076312f42764388 Mon Sep 17 00:00:00 2001 From: Javier Segarra Date: Wed, 17 Apr 2024 08:41:47 +0200 Subject: [PATCH 3/5] fix(lilium) #7180 SupplierList Scroll --- src/components/ui/VnPaginate.vue | 13 ++++++++++--- src/composables/useArrayData.js | 11 +++++++++-- 2 files changed, 19 insertions(+), 5 deletions(-) diff --git a/src/components/ui/VnPaginate.vue b/src/components/ui/VnPaginate.vue index b259bf8be..3328dc437 100644 --- a/src/components/ui/VnPaginate.vue +++ b/src/components/ui/VnPaginate.vue @@ -83,7 +83,12 @@ const store = arrayData.store; onMounted(() => { if (props.autoLoad) fetch(); }); - +// watch( +// () => arrayData, +// () => { +// console.error(this); +// } +// ); watch( () => props.data, () => { @@ -127,7 +132,7 @@ async function paginate() { } function endPagination() { - hasMoreData.value = arrayData.hasMoreData.value; + // hasMoreData.value = store.hasMoreData.value; isLoading.value = false; emit('onFetch', store.data); emit('onPaginate'); @@ -183,11 +188,13 @@ defineExpose({ fetch, addFilter });
+ diff --git a/src/composables/useArrayData.js b/src/composables/useArrayData.js index 093806567..c3d969f55 100644 --- a/src/composables/useArrayData.js +++ b/src/composables/useArrayData.js @@ -20,6 +20,13 @@ export function useArrayData(key, userOptions) { const page = ref(1); + // watch( + // () => store.hasMoreData, + // () => { + // hasMoreData.value = store.hasMoreData; + // arrayDataStore.$state.console.error(this); + // } + // ); onMounted(() => { setOptions(); @@ -98,7 +105,7 @@ export function useArrayData(key, userOptions) { const { limit } = filter; hasMoreData.value = response.data.length >= limit; - + store.hasMoreData = hasMoreData.value; if (append) { if (!store.data) store.data = []; for (const row of response.data) store.data.push(row); @@ -169,7 +176,7 @@ export function useArrayData(key, userOptions) { } async function loadMore() { - if (!hasMoreData.value) return; + if (!hasMoreData.value && !store.hasMoreData) return; store.skip = store.limit * page.value; page.value += 1; From 846c85ed1a3a4a7634eeefa01d8c60e45c7a03d5 Mon Sep 17 00:00:00 2001 From: Javier Segarra Date: Thu, 18 Apr 2024 09:36:24 +0000 Subject: [PATCH 4/5] Actualizar src/components/ui/VnPaginate.vue --- src/components/ui/VnPaginate.vue | 11 ++--------- 1 file changed, 2 insertions(+), 9 deletions(-) diff --git a/src/components/ui/VnPaginate.vue b/src/components/ui/VnPaginate.vue index 3328dc437..f516f473d 100644 --- a/src/components/ui/VnPaginate.vue +++ b/src/components/ui/VnPaginate.vue @@ -83,12 +83,7 @@ const store = arrayData.store; onMounted(() => { if (props.autoLoad) fetch(); }); -// watch( -// () => arrayData, -// () => { -// console.error(this); -// } -// ); + watch( () => props.data, () => { @@ -132,7 +127,6 @@ async function paginate() { } function endPagination() { - // hasMoreData.value = store.hasMoreData.value; isLoading.value = false; emit('onFetch', store.data); emit('onPaginate'); @@ -188,8 +182,7 @@ defineExpose({ fetch, addFilter }); - + Date: Thu, 18 Apr 2024 09:37:01 +0000 Subject: [PATCH 5/5] Actualizar src/composables/useArrayData.js --- src/composables/useArrayData.js | 7 ------- 1 file changed, 7 deletions(-) diff --git a/src/composables/useArrayData.js b/src/composables/useArrayData.js index c3d969f55..a87ccbb96 100644 --- a/src/composables/useArrayData.js +++ b/src/composables/useArrayData.js @@ -20,13 +20,6 @@ export function useArrayData(key, userOptions) { const page = ref(1); - // watch( - // () => store.hasMoreData, - // () => { - // hasMoreData.value = store.hasMoreData; - // arrayDataStore.$state.console.error(this); - // } - // ); onMounted(() => { setOptions();