From 8660b1bea447470044047948e1e92fe1f5043d2e Mon Sep 17 00:00:00 2001 From: jorgep Date: Wed, 29 Jan 2025 12:24:26 +0100 Subject: [PATCH 1/2] fix: refs #8198 ensure warehouseFk is a number when set from query --- src/pages/Item/Card/ItemDiary.vue | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/pages/Item/Card/ItemDiary.vue b/src/pages/Item/Card/ItemDiary.vue index c2f2c19a0..3e8b1f676 100644 --- a/src/pages/Item/Card/ItemDiary.vue +++ b/src/pages/Item/Card/ItemDiary.vue @@ -125,7 +125,7 @@ onMounted(async () => { inventoriedDate.value = (await axios.get('Configs/findOne')).data?.inventoried || today; - if (query.warehouseFk) ref.warehouseFk = query.warehouseFk; + if (query.warehouseFk) ref.warehouseFk = +query.warehouseFk; else if (!ref.warehouseFk && user.value) ref.warehouseFk = user.value.warehouseFk; if (ref.date) showWhatsBeforeInventory.value = true; ref.itemFk = route.params.id; -- 2.40.1 From ef129eb54228c67253f250fa5d57f4b66ce57c1b Mon Sep 17 00:00:00 2001 From: jorgep Date: Wed, 29 Jan 2025 14:38:58 +0100 Subject: [PATCH 2/2] fix: refs #8198 correct date comparison in getBadgeAttrs function --- src/pages/Item/Card/ItemDiary.vue | 4 +--- 1 file changed, 1 insertion(+), 3 deletions(-) diff --git a/src/pages/Item/Card/ItemDiary.vue b/src/pages/Item/Card/ItemDiary.vue index 3e8b1f676..4b6775183 100644 --- a/src/pages/Item/Card/ItemDiary.vue +++ b/src/pages/Item/Card/ItemDiary.vue @@ -143,7 +143,7 @@ onMounted(async () => { const fetchItemBalances = async () => await arrayDataItemBalances.fetch({}); const getBadgeAttrs = (_date) => { - const isSameDate = date.isSameDate(today.value, _date); + const isSameDate = date.isSameDate(today, _date); const attrs = { 'text-color': isSameDate ? 'black' : 'white', color: isSameDate ? 'warning' : 'transparent', @@ -153,8 +153,6 @@ const getBadgeAttrs = (_date) => { const scrollToToday = async () => { await nextTick(); - const today = Date.vnNew(); - today.setHours(0, 0, 0, 0); const todayCell = document.querySelector(`td[data-date="${today.toISOString()}"]`); if (todayCell) { todayCell.scrollIntoView({ behavior: 'smooth', block: 'center' }); -- 2.40.1