diff --git a/src/pages/Ticket/Card/BasicData/TicketBasicDataForm.vue b/src/pages/Ticket/Card/BasicData/TicketBasicDataForm.vue
index d83d0f2b7..18af48283 100644
--- a/src/pages/Ticket/Card/BasicData/TicketBasicDataForm.vue
+++ b/src/pages/Ticket/Card/BasicData/TicketBasicDataForm.vue
@@ -290,7 +290,7 @@ async function getZone(options) {
diff --git a/src/pages/Ticket/TicketAdvance.vue b/src/pages/Ticket/TicketAdvance.vue
index bf3593acd..aa78fe7f0 100644
--- a/src/pages/Ticket/TicketAdvance.vue
+++ b/src/pages/Ticket/TicketAdvance.vue
@@ -101,7 +101,7 @@ const ticketColumns = computed(() => [
format: (row, dashIfEmpty) => dashIfEmpty(row.lines),
},
{
- align: 'left',
+ align: 'right',
label: t('advanceTickets.import'),
name: 'totalWithVat',
hidden: true,
@@ -145,6 +145,15 @@ const ticketColumns = computed(() => [
headerClass: 'horizontal-separator',
name: 'futureLiters',
},
+ {
+ label: t('advanceTickets.preparation'),
+ name: 'futurePreparation',
+ field: 'futurePreparation',
+ align: 'left',
+ sortable: true,
+ headerClass: 'horizontal-separator',
+ columnFilter: false,
+ },
{
align: 'left',
label: t('advanceTickets.futureZone'),
@@ -169,15 +178,17 @@ const ticketColumns = computed(() => [
label: t('advanceTickets.notMovableLines'),
headerClass: 'horizontal-separator',
name: 'notMovableLines',
+ class: 'shrink',
},
{
align: 'left',
label: t('advanceTickets.futureLines'),
headerClass: 'horizontal-separator',
name: 'futureLines',
+ class: 'shrink',
},
{
- align: 'left',
+ align: 'right',
label: t('advanceTickets.futureImport'),
name: 'futureTotalWithVat',
hidden: true,
@@ -332,7 +343,12 @@ watch(
if (!$el) return;
const head = $el.querySelector('thead');
const firstRow = $el.querySelector('thead > tr');
-
+ const headSelectionCol = $el.querySelector(
+ 'thead tr.bg-header th.q-table--col-auto-width',
+ );
+ if (headSelectionCol) {
+ headSelectionCol.classList.add('horizontal-separator');
+ }
const newRow = document.createElement('tr');
destinationElRef.value = document.createElement('th');
originElRef.value = document.createElement('th');
@@ -341,8 +357,10 @@ watch(
destinationElRef.value.classList.add('text-uppercase', 'color-vn-label');
originElRef.value.classList.add('text-uppercase', 'color-vn-label');
- destinationElRef.value.setAttribute('colspan', '7');
- originElRef.value.setAttribute('colspan', '9');
+ originElRef.value.classList.add('advance-icon');
+
+ destinationElRef.value.setAttribute('colspan', '9');
+ originElRef.value.setAttribute('colspan', '11');
destinationElRef.value.textContent = `${t(
'advanceTickets.destination',
@@ -453,10 +471,8 @@ watch(
selection: 'multiple',
}"
v-model:selected="selectedTickets"
- :pagination="{ rowsPerPage: 0 }"
- :no-data-label="t('globals.noResults')"
:right-search="false"
- :order="['futureTotalWithVat ASC']"
+ :order="['futureTotalWithVat ASC']"
auto-load
:disable-option="{ card: true }"
>
diff --git a/src/pages/Ticket/TicketFuture.vue b/src/pages/Ticket/TicketFuture.vue
index 6ed3afcc6..0939708c1 100644
--- a/src/pages/Ticket/TicketFuture.vue
+++ b/src/pages/Ticket/TicketFuture.vue
@@ -85,6 +85,7 @@ const ticketColumns = computed(() => [
label: t('advanceTickets.liters'),
name: 'liters',
align: 'left',
+ class: 'shrink',
headerClass: 'horizontal-separator',
},
{
@@ -177,7 +178,12 @@ watch(
if (!$el) return;
const head = $el.querySelector('thead');
const firstRow = $el.querySelector('thead > tr');
-
+ const headSelectionCol = $el.querySelector(
+ 'thead tr.bg-header th.q-table--col-auto-width',
+ );
+ if (headSelectionCol) {
+ headSelectionCol.classList.add('horizontal-separator');
+ }
const newRow = document.createElement('tr');
destinationElRef.value = document.createElement('th');
originElRef.value = document.createElement('th');
@@ -185,9 +191,10 @@ watch(
newRow.classList.add('bg-header');
destinationElRef.value.classList.add('text-uppercase', 'color-vn-label');
originElRef.value.classList.add('text-uppercase', 'color-vn-label');
+ originElRef.value.classList.add('advance-icon');
- destinationElRef.value.setAttribute('colspan', '7');
- originElRef.value.setAttribute('colspan', '9');
+ destinationElRef.value.setAttribute('colspan', '9');
+ originElRef.value.setAttribute('colspan', '7');
originElRef.value.textContent = `${t('advanceTickets.origin')}`;
destinationElRef.value.textContent = `${t('advanceTickets.destination')}`;
@@ -371,4 +378,12 @@ watch(
:deep(.horizontal-bottom-separator) {
border-bottom: 4px solid white !important;
}
+:deep(th.advance-icon::after) {
+ content: '>>';
+ font-size: larger;
+ position: absolute;
+ text-align: center;
+ float: 0;
+ left: 0;
+}
diff --git a/src/pages/Ticket/locale/en.yml b/src/pages/Ticket/locale/en.yml
index 175f0955b..2c9ea95f6 100644
--- a/src/pages/Ticket/locale/en.yml
+++ b/src/pages/Ticket/locale/en.yml
@@ -120,6 +120,7 @@ basicData:
difference: Difference
total: Total
price: Price
+ warehouse: Warehouse
newPrice: New price
chargeDifference: Charge difference to
withoutNegatives: Create without negatives
diff --git a/src/pages/Ticket/locale/es.yml b/src/pages/Ticket/locale/es.yml
index 3d03a7b33..6bd307d07 100644
--- a/src/pages/Ticket/locale/es.yml
+++ b/src/pages/Ticket/locale/es.yml
@@ -47,6 +47,7 @@ basicData:
difference: Diferencia
total: Total
price: Precio
+ warehouse: Almacén
newPrice: Nuevo precio
chargeDifference: Cargar diferencia a
withoutNegatives: Crear sin negativos