From cb0d3c5bca1319b995fcba4add6dd138372fb7ee Mon Sep 17 00:00:00 2001 From: pablone Date: Mon, 30 Sep 2024 09:46:00 +0200 Subject: [PATCH 1/7] fix: refs #7404 sticky footer and transparent header for vnTable --- src/components/LeftMenuItem.vue | 1 - src/components/VnTable/VnTable.vue | 44 ++++++++++------------ src/pages/Entry/EntryStockBought.vue | 22 +++++++---- src/pages/Entry/EntryStockBoughtDetail.vue | 15 +++----- 4 files changed, 41 insertions(+), 41 deletions(-) diff --git a/src/components/LeftMenuItem.vue b/src/components/LeftMenuItem.vue index ab74c1de5..a3112b17f 100644 --- a/src/components/LeftMenuItem.vue +++ b/src/components/LeftMenuItem.vue @@ -44,7 +44,6 @@ const itemComputed = computed(() => { - diff --git a/src/pages/Entry/EntryStockBought.vue b/src/pages/Entry/EntryStockBought.vue index 4750a8417..b41973243 100644 --- a/src/pages/Entry/EntryStockBought.vue +++ b/src/pages/Entry/EntryStockBought.vue @@ -47,7 +47,7 @@ const columns = [ }, }, { - align: 'left', + align: 'center', label: t('Reserve'), name: 'reserve', columnFilter: false, @@ -141,6 +141,10 @@ function setFooter(data) { }); tableRef.value.footer = footer; } + +function round(value) { + return Math.round(value * 100) / 100; +} +
- +
- +
From 868e6a312f063e54f9cd567e1a6f3b2cc7c52dcc Mon Sep 17 00:00:00 2001 From: pablone Date: Mon, 30 Sep 2024 10:04:00 +0200 Subject: [PATCH 2/7] fix: refs #7404 class name --- src/components/VnTable/VnTable.vue | 3 +-- src/pages/Entry/EntryStockBought.vue | 1 - 2 files changed, 1 insertion(+), 3 deletions(-) diff --git a/src/components/VnTable/VnTable.vue b/src/components/VnTable/VnTable.vue index 6d27f7ced..861a79432 100644 --- a/src/components/VnTable/VnTable.vue +++ b/src/components/VnTable/VnTable.vue @@ -899,8 +899,7 @@ es: user-select: all; } -.q-table__container.q-table--horizontal-separator.column.no-wrap.q-table__card.q-table__card--dark.q-dark.q-table--flat.q-table--dark.q-table--no-wrap.vnTable, -.q-table__container.q-table--horizontal-separator.column.no-wrap.q-table__card.q-table--flat.q-table--no-wrap.vnTable { +.q-table__container { background-color: transparent; } diff --git a/src/pages/Entry/EntryStockBought.vue b/src/pages/Entry/EntryStockBought.vue index b41973243..9b6eca132 100644 --- a/src/pages/Entry/EntryStockBought.vue +++ b/src/pages/Entry/EntryStockBought.vue @@ -211,7 +211,6 @@ function round(value) { /> -
Date: Mon, 30 Sep 2024 10:13:39 +0200 Subject: [PATCH 3/7] fix: refs #7404 translate and width problem --- src/pages/Entry/EntryStockBought.vue | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/src/pages/Entry/EntryStockBought.vue b/src/pages/Entry/EntryStockBought.vue index 9b6eca132..0e8013586 100644 --- a/src/pages/Entry/EntryStockBought.vue +++ b/src/pages/Entry/EntryStockBought.vue @@ -76,7 +76,7 @@ const columns = [ name: 'tableActions', actions: [ { - title: t('More'), + title: t('View more details'), icon: 'search', isPrimary: true, action: (row) => { @@ -279,7 +279,7 @@ function round(value) { display: flex; flex-direction: column; align-items: center; - width: 45%; + width: 35%; } .text-negative { color: $negative !important; @@ -293,8 +293,8 @@ function round(value) { Buyer: Comprador Reserve: Reservado Bought: Comprado - More: Más Date: Fecha + View more details: Ver más detalles Reserve some space: Reservar espacio - This buyer has already made a reservation for this date: Este comprador ya ha hecho una reserva para esta fecha + This buyer has already made a reservation for this date: Este comprador ya ha hecho una reserva para esta fecha From 7fa0a5b28cbe5c2e7c177758158e8d610c88bd82 Mon Sep 17 00:00:00 2001 From: pablone Date: Mon, 30 Sep 2024 10:47:02 +0200 Subject: [PATCH 4/7] fix: refs #7404 path name --- src/router/modules/entry.js | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/router/modules/entry.js b/src/router/modules/entry.js index 4750a4301..76b4a6e23 100644 --- a/src/router/modules/entry.js +++ b/src/router/modules/entry.js @@ -59,7 +59,7 @@ export default { component: () => import('src/pages/Entry/EntryLatestBuys.vue'), }, { - path: 'stock-Bought', + path: 'stock-bought', name: 'EntryStockBought', meta: { title: 'reserves', From cf67865b0bf099570086314099b9a214a3e17ce5 Mon Sep 17 00:00:00 2001 From: Javier Segarra Date: Mon, 30 Sep 2024 11:53:54 +0200 Subject: [PATCH 5/7] feat: refs #7404 updates --- src/components/common/VnInput.vue | 39 +++++++++++++++++++++++++ src/components/common/VnSelect.vue | 17 +++++++++++ src/components/ui/VnFilterPanel.vue | 16 +++------- src/css/app.scss | 8 +++++ src/pages/InvoiceOut/InvoiceOutList.vue | 5 +++- src/pages/Item/ItemFixedPrice.vue | 7 ++++- 6 files changed, 78 insertions(+), 14 deletions(-) diff --git a/src/components/common/VnInput.vue b/src/components/common/VnInput.vue index 1246eedcd..ce7918eda 100644 --- a/src/components/common/VnInput.vue +++ b/src/components/common/VnInput.vue @@ -130,4 +130,43 @@ const mixinRules = [ .q-field__append { padding-inline: 0; } +// .q-field--standard .q-field__control:after { +// padding: 0; +// } +// .q-field__control-container.col.relative-position.row.no-wrap.q-anchor--skip { +// display: flex; +// flex-direction: row; +// align-items: flex-end; +// } + +.q-field__append.q-field__marginal.row.no-wrap.items-center.row { + height: 20px; +} +.q-field--outlined .q-field__append.q-field__marginal.row.no-wrap.items-center.row { + height: auto; +} +.q-field__control, +.q-select--with-input { + /* color: var(--q-primary); */ + // margin-bottom: 10px; + height: 23px; + /* max-width: 100%; */ + /* outline: none; */ +} +// .q-field--labeled .q-field__native, +// .q-field--labeled .q-field__prefix, +// .q-field--labeled .q-field__suffix { +// padding-bottom: 0; +// } +.q-field__native, +.q-field__prefix, +.q-field__suffix, +.q-field__input { + padding: 0; +} +// .q-field__append.q-field__marginal.row.no-wrap.items-center.q-anchor--skip { +// display: flex; +// flex-direction: row; +// align-items: flex-end; +// } diff --git a/src/components/common/VnSelect.vue b/src/components/common/VnSelect.vue index aa629767d..bd505ed29 100644 --- a/src/components/common/VnSelect.vue +++ b/src/components/common/VnSelect.vue @@ -283,4 +283,21 @@ const getVal = (val) => ($props.useLike ? { like: `%${val}%` } : val); .q-field--outlined { max-width: 100%; } +.q-field__inner { + .q-field__control { + min-height: auto !important; + .q-field__native.row { + min-height: auto !important; + } + } +} +// &.q-field__control { +// min-height: auto; +// &.q-field__controler-container { +// .q-field__native { +// min-height: revert; +// } +// } +// } +// } diff --git a/src/components/ui/VnFilterPanel.vue b/src/components/ui/VnFilterPanel.vue index ef07b7bef..43d634ad9 100644 --- a/src/components/ui/VnFilterPanel.vue +++ b/src/components/ui/VnFilterPanel.vue @@ -3,7 +3,6 @@ import { onMounted, ref, computed, watch } from 'vue'; import { useI18n } from 'vue-i18n'; import { useArrayData } from 'composables/useArrayData'; import { useRoute } from 'vue-router'; -import { date } from 'quasar'; import toDate from 'filters/toDate'; import VnFilterPanelChip from 'components/ui/VnFilterPanelChip.vue'; @@ -59,7 +58,6 @@ const $props = defineProps({ }); defineExpose({ search, sanitizer }); - const emit = defineEmits([ 'update:modelValue', 'refresh', @@ -114,9 +112,9 @@ watch( ); const isLoading = ref(false); -async function search() { +async function search(evt) { try { - if ($props.disableSubmitEvent) return; + if (evt && $props.disableSubmitEvent) return; store.filter.where = {}; isLoading.value = true; @@ -167,7 +165,7 @@ const tagsList = computed(() => { for (const key of Object.keys(userParams.value)) { const value = userParams.value[key]; if (value == null || ($props.hiddenTags || []).includes(key)) continue; - tagList.push({ label: aliasField(key), value }); + tagList.push({ label: key, value }); } return tagList; }); @@ -187,7 +185,6 @@ async function remove(key) { } function formatValue(value) { - if (value instanceof Date) return date.formatDate(value, 'DD/MM/YYYY'); if (typeof value === 'boolean') return value ? t('Yes') : t('No'); if (isNaN(value) && !isNaN(Date.parse(value))) return toDate(value); @@ -203,11 +200,6 @@ function sanitizer(params) { } return params; } - -function aliasField(field) { - const split = field.split('.'); - return split[1] ?? split[0]; -}