From 322ad816b9b5387c3a11c86ea55dbbe1dcbb2269 Mon Sep 17 00:00:00 2001
From: wbuezas <wbuezas@verdnatura.es>
Date: Sun, 28 Apr 2024 19:37:44 -0300
Subject: [PATCH 1/2] item diary
---
src/pages/Item/Card/ItemDiary.vue | 291 +++++++++++++++++++++++++++++-
src/router/modules/item.js | 6 +-
2 files changed, 293 insertions(+), 4 deletions(-)
diff --git a/src/pages/Item/Card/ItemDiary.vue b/src/pages/Item/Card/ItemDiary.vue
index 21249349f..ef4c7b993 100644
--- a/src/pages/Item/Card/ItemDiary.vue
+++ b/src/pages/Item/Card/ItemDiary.vue
@@ -1 +1,290 @@
-<template>Item diary (CREAR CUANDO SE DESARROLLE EL MODULO DE ITEMS)</template>
+<script setup>
+import { onMounted, computed, onUnmounted, reactive, ref } from 'vue';
+import { useI18n } from 'vue-i18n';
+import { useRoute } from 'vue-router';
+
+import TicketDescriptorProxy from 'src/pages/Ticket/Card/TicketDescriptorProxy.vue';
+import EntryDescriptorProxy from 'src/pages/Entry/Card/EntryDescriptorProxy.vue';
+import CustomerDescriptorProxy from 'src/pages/Customer/Card/CustomerDescriptorProxy.vue';
+import FetchData from 'components/FetchData.vue';
+import VnSelect from 'src/components/common/VnSelect.vue';
+import VnInputDate from 'src/components/common/VnInputDate.vue';
+
+import { useStateStore } from 'stores/useStateStore';
+import { toDateFormat } from 'src/filters/date.js';
+import { dashIfEmpty } from 'src/filters';
+import { date } from 'quasar';
+import { useState } from 'src/composables/useState';
+
+const { t } = useI18n();
+const route = useRoute();
+const stateStore = useStateStore();
+const state = useState();
+
+const user = state.getUser();
+const today = ref(Date.vnNew());
+const warehousesOptions = ref([]);
+const itemBalancesRef = ref(null);
+const itemsBalanceFilter = reactive({
+ where: { itemFk: route.params.id, warehouseFk: null, date: null },
+});
+const itemBalances = ref([]);
+const warehouseFk = ref(null);
+const _showWhatsBeforeInventory = ref(false);
+
+const columns = computed(() => [
+ {
+ name: 'claim',
+ align: 'left',
+ field: 'itemFk',
+ },
+ {
+ label: t('Date'),
+ name: 'date',
+ field: 'shipped',
+ align: 'left',
+ },
+ {
+ label: t('Id'),
+ name: 'id',
+ align: 'left',
+ },
+ {
+ label: t('State'),
+ field: 'stateName',
+ name: 'state',
+ align: 'left',
+ format: (val) => dashIfEmpty(val),
+ },
+ {
+ label: t('Reference'),
+ field: 'reference',
+ name: 'reference',
+ align: 'left',
+ format: (val) => dashIfEmpty(val),
+ },
+
+ {
+ label: t('Client'),
+ name: 'client',
+ align: 'left',
+ format: (val) => dashIfEmpty(val),
+ },
+ {
+ label: t('In'),
+ field: 'invalue',
+ name: 'in',
+ align: 'left',
+ format: (val) => dashIfEmpty(val),
+ },
+ {
+ label: t('Out'),
+ field: 'out',
+ name: 'out',
+ align: 'left',
+ format: (val) => dashIfEmpty(val),
+ },
+ {
+ label: t('Balance'),
+ name: 'balance',
+ align: 'left',
+ },
+]);
+
+const showWhatsBeforeInventory = computed({
+ get: () => _showWhatsBeforeInventory.value,
+ set: (val) => {
+ _showWhatsBeforeInventory.value = val;
+ if (!val) itemsBalanceFilter.where.date = null;
+ else itemsBalanceFilter.where.date = new Date();
+ },
+});
+
+const fetchItemBalances = async () => await itemBalancesRef.value.fetch();
+
+const getBadgeAttrs = (_date) => {
+ const isSameDate = date.isSameDate(today.value, _date);
+ const attrs = {
+ 'text-color': isSameDate ? 'black' : 'white',
+ color: isSameDate ? 'warning' : 'transparent',
+ };
+ return attrs;
+};
+
+const getIdDescriptor = (row) => {
+ let descriptor = EntryDescriptorProxy;
+ if (row.isTicket) descriptor = TicketDescriptorProxy;
+ return descriptor;
+};
+
+onMounted(async () => {
+ today.value.setHours(0, 0, 0, 0);
+ if (route.query.warehouseFk) warehouseFk.value = route.query.warehouseFk;
+ else if (user.value) warehouseFk.value = user.value.warehouseFk;
+ itemsBalanceFilter.where.warehouseFk = warehouseFk.value;
+ await fetchItemBalances();
+});
+
+onUnmounted(() => (stateStore.rightDrawer = false));
+</script>
+
+<template>
+ <FetchData
+ ref="itemBalancesRef"
+ url="Items/getBalance"
+ :filter="itemsBalanceFilter"
+ @on-fetch="(data) => (itemBalances = data)"
+ />
+ <FetchData
+ url="Warehouses"
+ :filter="{ fields: ['id', 'name'], order: 'name ASC' }"
+ auto-load
+ @on-fetch="(data) => (warehousesOptions = data)"
+ />
+ <QToolbar class="justify-end">
+ <div id="st-data" class="row">
+ <VnSelect
+ :label="t('Warehouse')"
+ :options="warehousesOptions"
+ hide-selected
+ option-label="name"
+ option-value="id"
+ dense
+ v-model="itemsBalanceFilter.where.warehouseFk"
+ @update:model-value="fetchItemBalances"
+ class="q-mr-lg"
+ />
+ <QCheckbox
+ :label="t(`Show what's before the inventory`)"
+ v-model="showWhatsBeforeInventory"
+ @update:model-value="fetchItemBalances"
+ class="q-mr-lg"
+ />
+ <VnInputDate
+ v-if="showWhatsBeforeInventory"
+ :label="t('Since')"
+ dense
+ v-model="itemsBalanceFilter.where.date"
+ @update:model-value="fetchItemBalances"
+ />
+ </div>
+ <QSpace />
+ <div id="st-actions"></div>
+ </QToolbar>
+ <QPage class="column items-center q-pa-md">
+ <QTable
+ :rows="itemBalances"
+ :columns="columns"
+ class="full-width q-mt-md"
+ :no-data-label="t('globals.noResults')"
+ >
+ <template #body-cell-claim="{ row }">
+ <QTd @click.stop>
+ <QBtn
+ v-show="row.claimFk"
+ flat
+ color="primary"
+ :to="{ name: 'ClaimSummary', params: { id: row.claimFk } }"
+ icon="vn:claims"
+ dense
+ >
+ <QTooltip> {{ t('Claim') }}: {{ row.claimFk }} </QTooltip>
+ </QBtn>
+ </QTd>
+ </template>
+ <template #body-cell-date="{ row }">
+ <QTd @click.stop>
+ <QBadge
+ v-bind="getBadgeAttrs(row.shipped)"
+ class="q-ma-none"
+ dense
+ style="font-size: 14px"
+ >
+ {{ toDateFormat(row.shipped) }}
+ </QBadge>
+ </QTd>
+ </template>
+ <template #body-cell-id="{ row }">
+ <QTd @click.stop>
+ <component
+ :is="getIdDescriptor(row)"
+ :id="row.origin"
+ class="q-ma-none"
+ dense
+ style="font-size: 14px"
+ >
+ {{ row.origin }}
+ </component>
+ <span class="link">{{ row.origin }}</span>
+ </QTd>
+ </template>
+ <template #body-cell-client="{ row }">
+ <QTd @click.stop>
+ <QBadge
+ :color="row.highlighted ? 'warning' : 'transparent'"
+ :text-color="row.highlighted ? 'black' : 'white'"
+ dense
+ style="font-size: 14px"
+ >
+ <span v-if="row.isTicket" class="link">
+ {{ dashIfEmpty(row.name) }}
+ <CustomerDescriptorProxy :id="row.clientFk" />
+ </span>
+ <span v-else>{{ dashIfEmpty(row.name) }}</span>
+ </QBadge>
+ </QTd>
+ </template>
+ <template #body-cell-in="{ row }">
+ <QTd @click.stop>
+ <span :class="{ 'is-in': row.invalue }">
+ {{ dashIfEmpty(row.invalue) }}
+ </span>
+ </QTd>
+ </template>
+ <template #body-cell-balance="{ row }">
+ <QTd @click.stop>
+ <QBadge
+ class="balance-negative"
+ :color="
+ row.lineFk == row.lastPreparedLineFk
+ ? 'grey-13'
+ : 'transparent'
+ "
+ :text-color="
+ row.lineFk == row.lastPreparedLineFk
+ ? 'black'
+ : row.balance < 0
+ ? 'negative'
+ : ''
+ "
+ dense
+ style="font-size: 14px"
+ >
+ <span>{{ dashIfEmpty(row.balance) }}</span>
+ </QBadge>
+ </QTd>
+ </template>
+ </QTable>
+ </QPage>
+</template>
+
+<style lang="scss" scoped>
+.is-in {
+ color: $positive;
+}
+</style>
+
+<i18n>
+es:
+ Date: Fecha
+ Id: Id
+ State: Estado
+ Reference: Referencia
+ Client: Cliente
+ In: Entrada
+ Out: Salida
+ Balance: Balance
+ Claim: Reclamación
+ Show what's before the inventory: Mostrar lo anterior al inventario
+ Since: Desde
+</i18n>
diff --git a/src/router/modules/item.js b/src/router/modules/item.js
index bc1e72a94..729cfd30c 100644
--- a/src/router/modules/item.js
+++ b/src/router/modules/item.js
@@ -134,8 +134,8 @@ export default {
path: 'diary',
name: 'ItemDiary',
meta: {
- title: 'basicData',
- icon: 'vn:settings',
+ title: 'diary',
+ icon: 'vn:transaction',
},
component: () => import('src/pages/Item/Card/ItemDiary.vue'),
},
@@ -144,7 +144,7 @@ export default {
name: 'ItemLog',
meta: {
title: 'log',
- icon: 'history',
+ icon: 'vn:History',
},
component: () => import('src/pages/Item/Card/ItemLog.vue'),
},
--
2.40.1
From ccac3a54f96fff7f88f13ece50774bd1428d6f98 Mon Sep 17 00:00:00 2001
From: wbuezas <wbuezas@verdnatura.es>
Date: Mon, 29 Apr 2024 17:39:37 -0300
Subject: [PATCH 2/2] move translations
---
src/pages/Item/Card/ItemDiary.vue | 41 +++++++++++--------------------
src/pages/Item/locale/en.yml | 13 ++++++++++
src/pages/Item/locale/es.yml | 13 ++++++++++
3 files changed, 40 insertions(+), 27 deletions(-)
create mode 100644 src/pages/Item/locale/en.yml
create mode 100644 src/pages/Item/locale/es.yml
diff --git a/src/pages/Item/Card/ItemDiary.vue b/src/pages/Item/Card/ItemDiary.vue
index ef4c7b993..c2687e0fd 100644
--- a/src/pages/Item/Card/ItemDiary.vue
+++ b/src/pages/Item/Card/ItemDiary.vue
@@ -39,25 +39,25 @@ const columns = computed(() => [
field: 'itemFk',
},
{
- label: t('Date'),
+ label: t('itemDiary.date'),
name: 'date',
field: 'shipped',
align: 'left',
},
{
- label: t('Id'),
+ label: t('itemDiary.id'),
name: 'id',
align: 'left',
},
{
- label: t('State'),
+ label: t('itemDiary.state'),
field: 'stateName',
name: 'state',
align: 'left',
format: (val) => dashIfEmpty(val),
},
{
- label: t('Reference'),
+ label: t('itemDiary.reference'),
field: 'reference',
name: 'reference',
align: 'left',
@@ -65,27 +65,27 @@ const columns = computed(() => [
},
{
- label: t('Client'),
+ label: t('itemDiary.client'),
name: 'client',
align: 'left',
format: (val) => dashIfEmpty(val),
},
{
- label: t('In'),
+ label: t('itemDiary.in'),
field: 'invalue',
name: 'in',
align: 'left',
format: (val) => dashIfEmpty(val),
},
{
- label: t('Out'),
+ label: t('itemDiary.out'),
field: 'out',
name: 'out',
align: 'left',
format: (val) => dashIfEmpty(val),
},
{
- label: t('Balance'),
+ label: t('itemDiary.balance'),
name: 'balance',
align: 'left',
},
@@ -144,7 +144,7 @@ onUnmounted(() => (stateStore.rightDrawer = false));
<QToolbar class="justify-end">
<div id="st-data" class="row">
<VnSelect
- :label="t('Warehouse')"
+ :label="t('itemDiary.warehouse')"
:options="warehousesOptions"
hide-selected
option-label="name"
@@ -155,14 +155,14 @@ onUnmounted(() => (stateStore.rightDrawer = false));
class="q-mr-lg"
/>
<QCheckbox
- :label="t(`Show what's before the inventory`)"
+ :label="t('itemDiary.showBefore')"
v-model="showWhatsBeforeInventory"
@update:model-value="fetchItemBalances"
class="q-mr-lg"
/>
<VnInputDate
v-if="showWhatsBeforeInventory"
- :label="t('Since')"
+ :label="t('itemDiary.since')"
dense
v-model="itemsBalanceFilter.where.date"
@update:model-value="fetchItemBalances"
@@ -188,7 +188,9 @@ onUnmounted(() => (stateStore.rightDrawer = false));
icon="vn:claims"
dense
>
- <QTooltip> {{ t('Claim') }}: {{ row.claimFk }} </QTooltip>
+ <QTooltip>
+ {{ t('itemDiary.claim') }}: {{ row.claimFk }}
+ </QTooltip>
</QBtn>
</QTd>
</template>
@@ -273,18 +275,3 @@ onUnmounted(() => (stateStore.rightDrawer = false));
color: $positive;
}
</style>
-
-<i18n>
-es:
- Date: Fecha
- Id: Id
- State: Estado
- Reference: Referencia
- Client: Cliente
- In: Entrada
- Out: Salida
- Balance: Balance
- Claim: Reclamación
- Show what's before the inventory: Mostrar lo anterior al inventario
- Since: Desde
-</i18n>
diff --git a/src/pages/Item/locale/en.yml b/src/pages/Item/locale/en.yml
new file mode 100644
index 000000000..ec3b134e8
--- /dev/null
+++ b/src/pages/Item/locale/en.yml
@@ -0,0 +1,13 @@
+itemDiary:
+ date: Date
+ id: Id
+ state: State
+ reference: Reference
+ client: Client
+ in: In
+ out: Out
+ balance: Balance
+ claim: Claim
+ showBefore: Show what's before the inventory
+ since: Since
+ warehouse: Warehouse
diff --git a/src/pages/Item/locale/es.yml b/src/pages/Item/locale/es.yml
new file mode 100644
index 000000000..4f76313fa
--- /dev/null
+++ b/src/pages/Item/locale/es.yml
@@ -0,0 +1,13 @@
+itemDiary:
+ date: Fecha
+ id: Id
+ state: Estado
+ reference: Referencia
+ client: Cliente
+ in: Entrada
+ out: Salida
+ balance: Balance
+ claim: Reclamación
+ showBefore: Mostrar lo anterior al inventario
+ since: Desde
+ warehouse: Almacén
--
2.40.1