diff --git a/src/components/common/VnInputTime.vue b/src/components/common/VnInputTime.vue
index a59f0e9e8..7ee93de19 100644
--- a/src/components/common/VnInputTime.vue
+++ b/src/components/common/VnInputTime.vue
@@ -50,7 +50,7 @@ const formattedTime = computed({
}
if (!props.timeOnly) {
const [hh, mm] = time.split(':');
- const date = model.value ?? Date.vnNew();
+ const date = new Date(model.value ? model.value : null);
date.setHours(hh, mm, 0);
time = date?.toISOString();
}
@@ -62,7 +62,7 @@ const formattedTime = computed({
function dateToTime(newDate) {
return date.formatDate(new Date(newDate), dateFormat);
}
-const timeField = ref();
+
watch(
() => model.value,
(val) => (formattedTime.value = val),
@@ -153,4 +153,3 @@ watch(
es:
Open time: Abrir tiempo
-, nextTick
diff --git a/src/composables/useArrayData.js b/src/composables/useArrayData.js
index 50d620a34..651bcefb0 100644
--- a/src/composables/useArrayData.js
+++ b/src/composables/useArrayData.js
@@ -28,7 +28,7 @@ export function useArrayData(key = useRoute().meta.moduleName, userOptions) {
delete params.filter;
store.userParams = { ...params, ...store.userParams };
store.userFilter = { ...filter, ...store.userFilter };
- if (filter.order) store.order = filter.order;
+ if (filter?.order) store.order = filter.order;
}
});
diff --git a/src/pages/InvoiceOut/Card/InvoiceOutDescriptor.vue b/src/pages/InvoiceOut/Card/InvoiceOutDescriptor.vue
index bd52e5b02..5e4be407e 100644
--- a/src/pages/InvoiceOut/Card/InvoiceOutDescriptor.vue
+++ b/src/pages/InvoiceOut/Card/InvoiceOutDescriptor.vue
@@ -100,7 +100,7 @@ const setData = (entity) => (data.value = useCardDescription(entity.ref, entity.
color="primary"
:to="{
name: 'TicketList',
- query: { q: ticketFilter(entity) },
+ query: { table: ticketFilter(entity) },
}"
>
{{ t('invoiceOut.card.ticketList') }}
diff --git a/src/pages/InvoiceOut/InvoiceOutList.vue b/src/pages/InvoiceOut/InvoiceOutList.vue
index 5a611d388..7e4622560 100644
--- a/src/pages/InvoiceOut/InvoiceOutList.vue
+++ b/src/pages/InvoiceOut/InvoiceOutList.vue
@@ -13,6 +13,7 @@ import { toCurrency, toDate } from 'src/filters/index';
import { useStateStore } from 'stores/useStateStore';
import { QBtn } from 'quasar';
import { watchEffect } from 'vue';
+import CustomerDescriptorProxy from '../Customer/Card/CustomerDescriptorProxy.vue';
const { t } = useI18n();
const stateStore = useStateStore();
@@ -214,6 +215,12 @@ watchEffect(selectedRows);
selection: 'multiple',
}"
>
+
+
+ {{ row.clientSocialName }}
+
+
+
{
:is-editable="false"
:use-model="true"
>
+
+
+ {{ row.clientId }}
+
+
+
+
+
+ {{ row.ticketFk }}
+
+
+
+
+
+ {{ row.workerName }}
+
+
+
diff --git a/src/pages/Route/Card/RouteFilter.vue b/src/pages/Route/Card/RouteFilter.vue
index f0215370f..24b155389 100644
--- a/src/pages/Route/Card/RouteFilter.vue
+++ b/src/pages/Route/Card/RouteFilter.vue
@@ -1,7 +1,5 @@
- (workerList = data)"
- auto-load
- />
- (agencyList = data)"
- auto-load
- />
- (vehicleList = data)"
- auto-load
- />
- (warehouseList = data)" auto-load />
-
+
@@ -91,19 +57,17 @@ const warehouseList = ref([]);
-
+
@@ -147,19 +111,17 @@ const warehouseList = ref([]);
-
+
@@ -170,19 +132,16 @@ const warehouseList = ref([]);
-
+
diff --git a/src/pages/Route/Card/RouteSearchbar.vue b/src/pages/Route/Card/RouteSearchbar.vue
index 0e5c1643d..48ad09151 100644
--- a/src/pages/Route/Card/RouteSearchbar.vue
+++ b/src/pages/Route/Card/RouteSearchbar.vue
@@ -9,10 +9,9 @@ const { t } = useI18n();
data-key="RouteList"
:label="t('Search route')"
:info="t('You can search by route reference')"
+ url="Routes/filter"
/>
-
-
es:
Search route: Buscar rutas
diff --git a/src/pages/Route/RouteList.vue b/src/pages/Route/RouteList.vue
index cb54b360d..a978d8fda 100644
--- a/src/pages/Route/RouteList.vue
+++ b/src/pages/Route/RouteList.vue
@@ -11,6 +11,8 @@ import axios from 'axios';
import RouteSearchbar from 'pages/Route/Card/RouteSearchbar.vue';
import RouteListTicketsDialog from 'pages/Route/Card/RouteListTicketsDialog.vue';
import RouteSummary from 'pages/Route/Card/RouteSummary.vue';
+import RightMenu from 'src/components/common/RightMenu.vue';
+import RouteFilter from 'pages/Route/Card/RouteFilter.vue';
import VnSubToolbar from 'src/components/ui/VnSubToolbar.vue';
import VnInputDate from 'components/common/VnInputDate.vue';
@@ -271,13 +273,18 @@ const openTicketsDialog = (id) => {
+
+
+
+
+
{{ dashIfEmpty(ticket.refFk) }}