diff --git a/src/components/common/VnCard.vue b/src/components/common/VnCard.vue index 17fa74317..b211a3c7f 100644 --- a/src/components/common/VnCard.vue +++ b/src/components/common/VnCard.vue @@ -23,6 +23,7 @@ const props = defineProps({ searchCustomRouteRedirect: { type: String, default: undefined }, searchRedirect: { type: Boolean, default: true }, searchMakeFetch: { type: Boolean, default: true }, + searchUrlQuery: { type: String, default: undefined }, }); const stateStore = useStateStore(); @@ -70,6 +71,7 @@ if (props.baseUrl) { :url="props.searchUrl" :label="props.searchbarLabel" :info="props.searchbarInfo" + :search-url="props.searchUrlQuery" :custom-route-redirect-name="searchCustomRouteRedirect" :redirect="searchRedirect" /> 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/components/ui/VnSearchbar.vue b/src/components/ui/VnSearchbar.vue index 0c7a8a3f6..2053efd62 100644 --- a/src/components/ui/VnSearchbar.vue +++ b/src/components/ui/VnSearchbar.vue @@ -67,6 +67,10 @@ const props = defineProps({ type: Boolean, default: true, }, + searchUrl: { + type: String, + default: 'params', + }, }); const searchText = ref(''); 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', }" > + 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 @@