From b97f7e6b424753d13b43bb091786a2687b63477f Mon Sep 17 00:00:00 2001 From: Jon Date: Wed, 15 May 2024 09:05:29 +0200 Subject: [PATCH 1/5] 6464 --- src/components/common/VnDmsList.vue | 1 + src/components/ui/VnFilterPanel.vue | 2 + src/css/app.scss | 9 +++ src/pages/Customer/Card/CustomerAddress.vue | 3 +- src/pages/Customer/Card/CustomerBalance.vue | 6 +- .../Customer/Card/CustomerFileManagement.vue | 1 + src/pages/Customer/Card/CustomerSummary.vue | 11 ++++ src/pages/Entry/Card/EntrySummary.vue | 7 +++ src/pages/InvoiceIn/Card/InvoiceInSummary.vue | 1 + .../InvoiceOut/InvoiceOutNegativeBases.vue | 59 ++++++++++++------- src/pages/Item/Card/ItemLastEntries.vue | 1 + src/pages/Item/Card/ItemSummary.vue | 1 + src/pages/Item/ItemList.vue | 6 +- src/pages/Supplier/Card/SupplierSummary.vue | 2 + src/pages/Travel/Card/TravelSummary.vue | 2 + 15 files changed, 87 insertions(+), 25 deletions(-) diff --git a/src/components/common/VnDmsList.vue b/src/components/common/VnDmsList.vue index e3cb2874a..cd2cf2eb3 100644 --- a/src/components/common/VnDmsList.vue +++ b/src/components/common/VnDmsList.vue @@ -139,6 +139,7 @@ const columns = computed(() => [ props: (prop) => ({ disable: true, 'model-value': Boolean(prop.value), + class: 'disabled-checkbox', }), }, { diff --git a/src/components/ui/VnFilterPanel.vue b/src/components/ui/VnFilterPanel.vue index dac028965..a29a2c8b2 100644 --- a/src/components/ui/VnFilterPanel.vue +++ b/src/components/ui/VnFilterPanel.vue @@ -86,7 +86,9 @@ async function search() { store.filter.skip = 0; store.skip = 0; const { params: newParams } = await arrayData.addFilter({ params }); + console.log('params: ', params); userParams.value = newParams; + console.log('userParams: ', userParams); if (!props.showAll && !Object.values(params).length) store.data = []; diff --git a/src/css/app.scss b/src/css/app.scss index 2e524e693..8afd17160 100644 --- a/src/css/app.scss +++ b/src/css/app.scss @@ -145,6 +145,15 @@ select:-webkit-autofill { color: var(--vn-label-color); } +.disabled-checkbox { + & .q-checkbox__label { + color: var(--vn-text-color); + } + & .q-checkbox__inner { + color: var(--vn-label-color); + } +} + .q-chip, .q-notification__message, .q-notification__icon { diff --git a/src/pages/Customer/Card/CustomerAddress.vue b/src/pages/Customer/Card/CustomerAddress.vue index cd5ef1483..553e29f54 100644 --- a/src/pages/Customer/Card/CustomerAddress.vue +++ b/src/pages/Customer/Card/CustomerAddress.vue @@ -183,10 +183,11 @@ const toCustomerAddressEdit = (addressId) => { { diff --git a/src/pages/Customer/Card/CustomerFileManagement.vue b/src/pages/Customer/Card/CustomerFileManagement.vue index 43aacf6a0..08ab4425b 100644 --- a/src/pages/Customer/Card/CustomerFileManagement.vue +++ b/src/pages/Customer/Card/CustomerFileManagement.vue @@ -81,6 +81,7 @@ const tableColumnComponents = { props: (prop) => ({ disable: true, 'model-value': Boolean(prop.value), + class: 'disabled-checkbox', }), event: () => {}, }, diff --git a/src/pages/Customer/Card/CustomerSummary.vue b/src/pages/Customer/Card/CustomerSummary.vue index f386b0359..827dfc667 100644 --- a/src/pages/Customer/Card/CustomerSummary.vue +++ b/src/pages/Customer/Card/CustomerSummary.vue @@ -128,36 +128,43 @@ const creditWarning = computed(() => { :text="t('customer.summary.fiscalData')" /> { { :value="entity.account.name" /> { /> { /> { { }; arrayData.value = useArrayData('InvoiceOutNegative', { url: 'InvoiceOuts/negativeBases', - limit: 0, userParams: defaultParams, exprBuilder: exprBuilder, }); - await arrayData.value.fetch({ append: false }); + const test = await arrayData.value.fetch({ append: false }); + console.log('test: ', test); stateStore.rightDrawer = true; }); const componentIsRendered = ref(false); +console.log('componentIsRendered: ', componentIsRendered); onMounted(() => - nextTick(() => { + nextTick(async () => { componentIsRendered.value = true; + await arrayData.value.fetch(); + console.log('3ntra'); }) ); const rows = computed(() => arrayData.value.store.data); +console.log('rows: ', rows); const columns = computed(() => [ { @@ -147,6 +151,13 @@ const downloadCSV = async () => { @@ -216,6 +228,9 @@ const downloadCSV = async () => { .no-uppercase { text-transform: none; } +.q-btn { + color: $color-link; +} diff --git a/src/pages/Item/Card/ItemLastEntries.vue b/src/pages/Item/Card/ItemLastEntries.vue index 9071cc6eb..101e95f78 100644 --- a/src/pages/Item/Card/ItemLastEntries.vue +++ b/src/pages/Item/Card/ItemLastEntries.vue @@ -224,6 +224,7 @@ onUnmounted(() => (stateStore.rightDrawer = false));