From 322ad816b9b5387c3a11c86ea55dbbe1dcbb2269 Mon Sep 17 00:00:00 2001 From: wbuezas 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 @@ - + + + + + + + +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 + 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'), }, From ccac3a54f96fff7f88f13ece50774bd1428d6f98 Mon Sep 17 00:00:00 2001 From: wbuezas 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));
(stateStore.rightDrawer = false)); class="q-mr-lg" /> (stateStore.rightDrawer = false)); icon="vn:claims" dense > - {{ t('Claim') }}: {{ row.claimFk }} + + {{ t('itemDiary.claim') }}: {{ row.claimFk }} + @@ -273,18 +275,3 @@ onUnmounted(() => (stateStore.rightDrawer = false)); color: $positive; } - - -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 - 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