From ac219bfbb79d748b9f19d51d816d457af235368e Mon Sep 17 00:00:00 2001 From: wbuezas Date: Tue, 30 Apr 2024 16:15:48 -0300 Subject: [PATCH 1/3] Item shelvings --- src/i18n/locale/en.yml | 1 + src/i18n/locale/es.yml | 1 + src/pages/Item/Card/ItemShelving.vue | 275 +++++++++++++++++++++++++++ src/pages/Item/locale/en.yml | 14 ++ src/pages/Item/locale/es.yml | 14 ++ src/router/modules/item.js | 10 + 6 files changed, 315 insertions(+) create mode 100644 src/pages/Item/Card/ItemShelving.vue create mode 100644 src/pages/Item/locale/en.yml create mode 100644 src/pages/Item/locale/es.yml diff --git a/src/i18n/locale/en.yml b/src/i18n/locale/en.yml index abe59fe18..1000fd308 100644 --- a/src/i18n/locale/en.yml +++ b/src/i18n/locale/en.yml @@ -1135,6 +1135,7 @@ item: tax: Tax barcode: Barcode botanical: Botanical + shelving: Shelving descriptor: item: Item buyer: Buyer diff --git a/src/i18n/locale/es.yml b/src/i18n/locale/es.yml index 06aa057e3..2727b9113 100644 --- a/src/i18n/locale/es.yml +++ b/src/i18n/locale/es.yml @@ -1134,6 +1134,7 @@ item: botanical: 'Botánico' barcode: 'Código de barras' log: Historial + shelving: Carros descriptor: item: Artículo buyer: Comprador diff --git a/src/pages/Item/Card/ItemShelving.vue b/src/pages/Item/Card/ItemShelving.vue new file mode 100644 index 000000000..573c4be0c --- /dev/null +++ b/src/pages/Item/Card/ItemShelving.vue @@ -0,0 +1,275 @@ + + + diff --git a/src/pages/Item/locale/en.yml b/src/pages/Item/locale/en.yml new file mode 100644 index 000000000..19bbd7f06 --- /dev/null +++ b/src/pages/Item/locale/en.yml @@ -0,0 +1,14 @@ +shelvings: + created: Created + item: Item + concept: Concept + parking: Parking + shelving: Shelving + label: Label + packing: Packing + total: Total + totalLabels: Total labels + removeLines: Remove selected lines + shelvingsRemoved: ItemShelvings removed + removeConfirmTitle: Selected lines will be deleted + removeConfirmSubtitle: Are you sure you want to continue? diff --git a/src/pages/Item/locale/es.yml b/src/pages/Item/locale/es.yml new file mode 100644 index 000000000..6f99bb4be --- /dev/null +++ b/src/pages/Item/locale/es.yml @@ -0,0 +1,14 @@ +shelvings: + created: Creado + item: Artículo + concept: Concepto + parking: Parking + shelving: Matrícula + label: Etiqueta + packing: Packing + total: Total + totalLabels: Total etiquetas + removeLines: Eliminar líneas seleccionadas + shelvingsRemoved: Carros eliminados + removeConfirmTitle: Las líneas seleccionadas serán eliminadas + removeConfirmSubtitle: ¿Seguro que quieres continuar? diff --git a/src/router/modules/item.js b/src/router/modules/item.js index bc1e72a94..59bd07d20 100644 --- a/src/router/modules/item.js +++ b/src/router/modules/item.js @@ -20,6 +20,7 @@ export default { 'ItemTax', 'ItemBotanical', 'ItemBarcode', + 'ItemShelving', ], }, children: [ @@ -157,6 +158,15 @@ export default { }, component: () => import('src/pages/Item/Card/ItemBotanical.vue'), }, + { + path: 'shelving', + name: 'ItemShelving', + meta: { + title: 'shelving', + icon: 'vn:inventory', + }, + component: () => import('src/pages/Item/Card/ItemShelving.vue'), + }, ], }, ], From f85665b271e1c01a665a1369052446a67f916ba0 Mon Sep 17 00:00:00 2001 From: Javier Segarra Date: Mon, 6 May 2024 08:37:41 +0200 Subject: [PATCH 2/3] fix: replace QToolbar by Teleport --- src/pages/Item/Card/ItemShelving.vue | 76 +++++++++++++++------------- 1 file changed, 41 insertions(+), 35 deletions(-) diff --git a/src/pages/Item/Card/ItemShelving.vue b/src/pages/Item/Card/ItemShelving.vue index 573c4be0c..830628f3b 100644 --- a/src/pages/Item/Card/ItemShelving.vue +++ b/src/pages/Item/Card/ItemShelving.vue @@ -14,6 +14,9 @@ import { useArrayData } from 'src/composables/useArrayData'; import useNotify from 'src/composables/useNotify.js'; import { useVnConfirm } from 'composables/useVnConfirm'; import axios from 'axios'; +import { useStateStore } from 'stores/useStateStore'; + +const stateStore = useStateStore(); const route = useRoute(); const { t } = useI18n(); @@ -197,43 +200,46 @@ onMounted(async () => { auto-load @on-fetch="(data) => (shelvingsOptions = data)" /> - -
-
- - - {{ t('shelvings.total') }} - - - -
- {{ t('shelvings.totalLabels') }} + + Date: Mon, 6 May 2024 08:41:12 +0200 Subject: [PATCH 3/3] change action to st-actions --- src/pages/Item/Card/ItemShelving.vue | 62 ++++++++++++++-------------- 1 file changed, 30 insertions(+), 32 deletions(-) diff --git a/src/pages/Item/Card/ItemShelving.vue b/src/pages/Item/Card/ItemShelving.vue index 830628f3b..7e7faab36 100644 --- a/src/pages/Item/Card/ItemShelving.vue +++ b/src/pages/Item/Card/ItemShelving.vue @@ -202,42 +202,40 @@ onMounted(async () => { />