diff --git a/src/components/VnTable/VnTable.vue b/src/components/VnTable/VnTable.vue index 5b39265fb..2c9526ec0 100644 --- a/src/components/VnTable/VnTable.vue +++ b/src/components/VnTable/VnTable.vue @@ -415,7 +415,7 @@ function handleOnDataSaved(_, res) { @@ -502,8 +502,9 @@ function handleOnDataSaved(_, res) { :key="index" :title="btn.title" :icon="btn.icon" - class="q-px-sm" + class="q-pa-xs" flat + dense :class=" btn.isPrimary ? 'text-primary-light' : 'color-vn-text ' " @@ -745,10 +746,16 @@ es: } } -.q-table th { - padding: 0; -} +.q-table { + th { + padding: 0; + } + &__top { + padding: 12px 0px; + top: 0; + } +} .vnTable { thead tr th { position: sticky; @@ -757,9 +764,6 @@ es: thead tr:first-child th { top: 0; } - .q-table__top { - top: 0; - } tbody { .q-checkbox { display: flex; diff --git a/src/components/VnTable/VnVisibleColumn.vue b/src/components/VnTable/VnVisibleColumn.vue index 36f5ed7de..f5c3458cd 100644 --- a/src/components/VnTable/VnVisibleColumn.vue +++ b/src/components/VnTable/VnVisibleColumn.vue @@ -135,7 +135,7 @@ onMounted(async () => { }); diff --git a/src/pages/Monitor/MonitorOrders.vue b/src/pages/Monitor/MonitorOrders.vue index eb455a239..52d442d0a 100644 --- a/src/pages/Monitor/MonitorOrders.vue +++ b/src/pages/Monitor/MonitorOrders.vue @@ -132,7 +132,6 @@ const openTab = (id) => :table="{ 'row-key': 'id', selection: 'multiple', - 'hide-bottom': true, }" default-mode="table" :row-click="({ id }) => openTab(id)" diff --git a/src/pages/Monitor/Ticket/MonitorTickets.vue b/src/pages/Monitor/Ticket/MonitorTickets.vue index 258b5022f..16d5abffb 100644 --- a/src/pages/Monitor/Ticket/MonitorTickets.vue +++ b/src/pages/Monitor/Ticket/MonitorTickets.vue @@ -54,7 +54,6 @@ const columns = computed(() => [ label: t('salesTicketsTable.problems'), name: 'totalProblems', align: 'left', - columnFilter: false, attrs: { dense: true, @@ -65,7 +64,6 @@ const columns = computed(() => [ name: 'id', field: 'id', align: 'left', - columnFilter: { component: 'number', name: 'id', @@ -108,9 +106,7 @@ const columns = computed(() => [ { label: t('salesTicketsTable.date'), name: 'shippedDate', - style: { 'max-width': '100px' }, align: 'left', - columnFilter: { component: 'date', name: 'shippedDate', @@ -164,7 +160,6 @@ const columns = computed(() => [ label: t('salesTicketsTable.state'), name: 'state', align: 'left', - style: { 'max-width': '100px' }, columnFilter: { component: 'select', name: 'stateFk', @@ -193,7 +188,6 @@ const columns = computed(() => [ label: t('salesTicketsTable.zone'), name: 'zoneFk', align: 'left', - columnFilter: { component: 'select', name: 'zoneFk', @@ -210,8 +204,6 @@ const columns = computed(() => [ name: 'totalWithVat', field: 'totalWithVat', align: 'left', - style: { 'max-width': '75px' }, - columnFilter: { component: 'number', name: 'totalWithVat', @@ -370,7 +362,7 @@ const openTab = (id) => +