{{ t(`params.${tag.label}`) }}:
@@ -341,7 +303,6 @@ function validateDateRange(params) {
en:
- dateRangeMustHaveBothFrom: The date range must have both 'from' and 'to'
params:
search: Contains
clientFk: Customer
@@ -370,7 +331,6 @@ en:
DELIVERED: Delivered
ON_PREVIOUS: ON_PREVIOUS
es:
- dateRangeMustHaveBothFrom: El rango de fechas debe tener 'desde' y 'hasta'
params:
search: Contiene
clientFk: Cliente
diff --git a/src/pages/Ticket/TicketList.vue b/src/pages/Ticket/TicketList.vue
index 01bb23807..ee092d40f 100644
--- a/src/pages/Ticket/TicketList.vue
+++ b/src/pages/Ticket/TicketList.vue
@@ -44,12 +44,22 @@ from.setDate(from.getDate() - 7);
const to = Date.vnNew();
to.setHours(23, 59, 0, 0);
to.setDate(to.getDate() + 1);
-
+const userParams = {
+ from: null,
+ to: null,
+};
onBeforeMount(() => {
+ initializeFromQuery();
stateStore.rightDrawer = true;
if (!route.query.createForm) return;
onClientSelected(JSON.parse(route.query.createForm));
});
+const initializeFromQuery = () => {
+ const query = route.query.table ? JSON.parse(route.query.table) : {};
+ from.value = query.from || from.toISOString();
+ to.value = query.to || to.toISOString();
+ Object.assign(userParams, { from, to });
+};
const selectedRows = ref([]);
const hasSelectedRows = computed(() => selectedRows.value.length > 0);
@@ -471,17 +481,11 @@ watch(
:array-data-props="{
url: 'Tickets/filter',
order: ['shippedDate DESC', 'shippedHour ASC', 'zoneLanding ASC', 'id'],
- filterPanel: filterPanelRef,
- searchRemoveParams: true,
exprBuilder,
}"
>
-
+