From 61a9676c322990e4ab24db2a3dc128a66a0eabff Mon Sep 17 00:00:00 2001 From: jorgep Date: Fri, 28 Mar 2025 12:14:16 +0100 Subject: [PATCH] feat: refs #8277 changes --- src/pages/Entry/EntryControl.vue | 20 +++++++++++++++++++- src/router/modules/entry.js | 1 + 2 files changed, 20 insertions(+), 1 deletion(-) diff --git a/src/pages/Entry/EntryControl.vue b/src/pages/Entry/EntryControl.vue index be8faa593..effdbb653 100644 --- a/src/pages/Entry/EntryControl.vue +++ b/src/pages/Entry/EntryControl.vue @@ -16,11 +16,15 @@ import VnConfirm from 'src/components/ui/VnConfirm.vue'; import VnDms from 'src/components/common/VnDms.vue'; import { useState } from 'src/composables/useState'; import { useQuasar } from 'quasar'; +import VnSubToolbar from 'src/components/ui/VnSubToolbar.vue'; +import InvoiceInDescriptorProxy from '../InvoiceIn/Card/InvoiceInDescriptorProxy.vue'; +import { useStateStore } from 'src/stores/useStateStore'; const { t } = useI18n(); const quasar = useQuasar(); const { notify } = useNotify(); const user = useState().getUser(); +const stateStore = useStateStore(); const dialog = ref(); const dmsDialog = ref(); const MAXDAYS = 365; @@ -181,6 +185,7 @@ const columns = computed(() => [ name: 'isAgricultural', label: t('entry.control.isAgricultural'), component: 'checkbox', + isEditable: false, }, { name: 'isBooked', @@ -191,6 +196,7 @@ const columns = computed(() => [ name: 'received', label: t('entry.control.received'), component: 'checkbox', + isEditable: false, }, // { // name: 'travelFk', @@ -214,9 +220,12 @@ const columns = computed(() => [ onBeforeMount(() => { daysAgo.value = arrayData.store.userParams.daysAgo || DEFAULTDAYS; isBooked.value = arrayData.store.userParams.isBooked || false; + stateStore.leftDrawer = false; }); watch(selectedRows, (nVal, oVal) => { + const lastRow = nVal.at(-1); + if (lastRow?.isBooked) selectedRows.value.pop(); if (nVal.length > oVal.length && nVal.at(-1).invoiceInFk) quasar.dialog({ component: VnConfirm, @@ -310,6 +319,7 @@ async function createInvoice(isAgricultural) { table.value.reload(); supplierRef = null; selectedGestDoc = null; + selectedRows.value.length = 0; } } @@ -351,12 +361,14 @@ async function createInvoice(isAgricultural) { :info="t('entry.control.searchInfo')" :search-remove-params="false" /> + +