Merge pull request 'fix: refs #6989 show entity name & default time from config table' (!576) from 6989-showClientName into dev
gitea/salix-front/pipeline/head This commit looks good
Details
gitea/salix-front/pipeline/head This commit looks good
Details
Reviewed-on: #576 Reviewed-by: Javi Gallego <jgallego@verdnatura.es>
This commit is contained in:
commit
c306969f6a
|
@ -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 }}
|
||||
</component>
|
||||
<span class="link">
|
||||
<span :class="{ link: row.entityId }">
|
||||
{{ dashIfEmpty(row.entityName) }}
|
||||
</span>
|
||||
</QBadge>
|
||||
|
|
Loading…
Reference in New Issue