diff --git a/src/pages/Customer/Card/CustomerBalance.vue b/src/pages/Customer/Card/CustomerBalance.vue
index 15f80b2f65..43b0ef84f4 100644
--- a/src/pages/Customer/Card/CustomerBalance.vue
+++ b/src/pages/Customer/Card/CustomerBalance.vue
@@ -131,6 +131,7 @@ const columns = computed(() => [
name: 'isConciliate',
label: t('Conciliated'),
cardVisible: true,
+ component: 'checkbox',
},
{
align: 'left',
diff --git a/src/pages/Customer/CustomerList.vue b/src/pages/Customer/CustomerList.vue
index b721a6ad91..f5e7485a2e 100644
--- a/src/pages/Customer/CustomerList.vue
+++ b/src/pages/Customer/CustomerList.vue
@@ -111,14 +111,11 @@ const columns = computed(() => [
component: 'number',
},
columnField: {
- component: null,
- after: {
- component: markRaw(VnLinkPhone),
- attrs: ({ model }) => {
- return {
- 'phone-number': model,
- };
- },
+ component: markRaw(VnLinkPhone),
+ attrs: ({ model }) => {
+ return {
+ 'phone-number': model,
+ };
},
},
},
diff --git a/src/pages/Ticket/TicketFilter.vue b/src/pages/Ticket/TicketFilter.vue
index d84d1c0823..43311007d6 100644
--- a/src/pages/Ticket/TicketFilter.vue
+++ b/src/pages/Ticket/TicketFilter.vue
@@ -273,6 +273,7 @@ en:
orderFk: Order
from: From
shipped: Shipped
+ shippedDate: Shipped date
to: To
stateFk: State
groupedStates: Grouped State
@@ -300,6 +301,7 @@ es:
orderFk: Pedido
from: Desde
shipped: F. envío
+ shippedDate: F. envío
to: Hasta
stateFk: Estado
groupedStates: Estado agrupado
diff --git a/src/pages/Ticket/TicketList.vue b/src/pages/Ticket/TicketList.vue
index 634b8e50ae..3612cb24a2 100644
--- a/src/pages/Ticket/TicketList.vue
+++ b/src/pages/Ticket/TicketList.vue
@@ -113,13 +113,13 @@ const columns = computed(() => [
},
{
align: 'left',
- name: 'shippedDate',
+ name: 'shipped',
cardVisible: true,
label: t('ticketList.shipped'),
columnFilter: {
component: 'date',
},
- format: ({ shippedDate }) => toDate(shippedDate),
+ format: ({ shipped }) => toDate(shipped),
},
{
align: 'left',
@@ -477,7 +477,7 @@ function setReference(data) {
prefix="card"
:array-data-props="{
url: 'Tickets/filter',
- order: ['shippedDate DESC', 'shippedHour ASC', 'zoneLanding ASC', 'id'],
+ order: ['shipped DESC', 'shippedHour ASC', 'zoneLanding ASC', 'id'],
exprBuilder,
}"
>
@@ -515,10 +515,10 @@ function setReference(data) {
-
+
- {{ toDate(row.shippedDate) }}
+ {{ toDate(row.shipped) }}