From ad8b72660fa80917f02598ad823ad0fe15fea3dd Mon Sep 17 00:00:00 2001 From: jorgep Date: Thu, 3 Oct 2024 13:37:21 +0200 Subject: [PATCH 1/4] fix: refs #7353 scopeDays --- src/pages/Monitor/Ticket/MonitorTickets.vue | 6 +++++- 1 file changed, 5 insertions(+), 1 deletion(-) diff --git a/src/pages/Monitor/Ticket/MonitorTickets.vue b/src/pages/Monitor/Ticket/MonitorTickets.vue index 16d5abffb..d24230c64 100644 --- a/src/pages/Monitor/Ticket/MonitorTickets.vue +++ b/src/pages/Monitor/Ticket/MonitorTickets.vue @@ -25,7 +25,11 @@ const stateOpts = ref([]); const zoneOpts = ref([]); const visibleColumns = ref([]); const { viewSummary } = useSummaryDialog(); -const [from, to] = dateRange(Date.vnNew()); +const from = Date.vnNew(); +from.setHours(0, 0, 0, 0); +const to = new Date(from.getTime()); +to.setDate(to.getDate() + 1); +to.setHours(23, 59, 59, 999); function exprBuilder(param, value) { switch (param) { From 4b78c1acd001fff12223ba5323a254571ada921d Mon Sep 17 00:00:00 2001 From: jorgep Date: Mon, 14 Oct 2024 12:00:05 +0200 Subject: [PATCH 2/4] fix: refs #7524 dynamic --- src/components/common/VnSelect.vue | 2 ++ .../Department/Card/DepartmentBasicData.vue | 15 ++--------- src/pages/InvoiceOut/InvoiceOutFilter.vue | 15 ----------- src/pages/Item/ItemTypeCreate.vue | 11 +++----- src/pages/ItemType/Card/ItemTypeBasicData.vue | 11 +++----- src/pages/Order/Card/OrderCreateDialog.vue | 13 ++++------ src/pages/Order/Card/OrderFilter.vue | 12 --------- src/pages/Shelving/Card/ShelvingFilter.vue | 15 ----------- src/pages/Ticket/TicketFilter.vue | 26 ++++++------------- 9 files changed, 23 insertions(+), 97 deletions(-) diff --git a/src/components/common/VnSelect.vue b/src/components/common/VnSelect.vue index aa629767d..952b7dd8c 100644 --- a/src/components/common/VnSelect.vue +++ b/src/components/common/VnSelect.vue @@ -227,6 +227,8 @@ function nullishToTrue(value) { } const getVal = (val) => ($props.useLike ? { like: `%${val}%` } : val); + +defineExpose({ opts: myOptions });