diff --git a/package.json b/package.json index 0a66ddb4f..0590a1526 100644 --- a/package.json +++ b/package.json @@ -1,6 +1,6 @@ { "name": "salix-front", - "version": "24.32.0", + "version": "24.34.0", "description": "Salix frontend", "productName": "Salix", "author": "Verdnatura", diff --git a/src/pages/Item/Card/ItemDiary.vue b/src/pages/Item/Card/ItemDiary.vue index bd60745cd..6fc7ab4fb 100644 --- a/src/pages/Item/Card/ItemDiary.vue +++ b/src/pages/Item/Card/ItemDiary.vue @@ -17,6 +17,7 @@ import { toDateFormat } from 'src/filters/date.js'; import { dashIfEmpty } from 'src/filters'; import { date } from 'quasar'; import { useState } from 'src/composables/useState'; +import axios from 'axios'; const { t } = useI18n(); const route = useRoute(); @@ -33,6 +34,7 @@ const itemsBalanceFilter = reactive({ const itemBalances = ref([]); const warehouseFk = ref(null); const _showWhatsBeforeInventory = ref(false); +const inventoriedDate = ref(null); const columns = computed(() => [ { @@ -98,7 +100,7 @@ const showWhatsBeforeInventory = computed({ set: (val) => { _showWhatsBeforeInventory.value = val; if (!val) itemsBalanceFilter.where.date = null; - else itemsBalanceFilter.where.date = new Date(); + else itemsBalanceFilter.where.date = inventoriedDate.value ?? new Date(); }, }); @@ -160,6 +162,8 @@ onMounted(async () => { if (route.query.warehouseFk) warehouseFk.value = route.query.warehouseFk; else if (user.value) warehouseFk.value = user.value.warehouseFk; itemsBalanceFilter.where.warehouseFk = warehouseFk.value; + const { data } = await axios.get('Configs/findOne'); + inventoriedDate.value = data.inventoried; await fetchItemBalances(); await scrollToToday(); }); @@ -284,7 +288,7 @@ onUnmounted(() => (stateStore.rightDrawer = false)); > {{ row.entityId }} - + {{ dashIfEmpty(row.entityName) }}