From a6ebe9cf19f2ddd6c05649b8096ad93367c18aae Mon Sep 17 00:00:00 2001 From: wbuezas Date: Wed, 24 Apr 2024 12:54:38 -0300 Subject: [PATCH 1/3] Item barcode --- src/css/app.scss | 5 ++ src/i18n/locale/en.yml | 1 + src/i18n/locale/es.yml | 1 + src/pages/Item/Card/ItemBarcode.vue | 80 +++++++++++++++++++++++++++++ src/router/modules/item.js | 12 ++++- 5 files changed, 98 insertions(+), 1 deletion(-) create mode 100644 src/pages/Item/Card/ItemBarcode.vue diff --git a/src/css/app.scss b/src/css/app.scss index 25b484649..9037802ad 100644 --- a/src/css/app.scss +++ b/src/css/app.scss @@ -119,6 +119,11 @@ select:-webkit-autofill { font-variation-settings: 'FILL' 1; } +.fill-icon-on-hover:hover { + font-variation-settings: 'FILL' 1; + cursor: pointer; +} + .vn-table-separation-row { height: 16px !important; background-color: var(--vn-section-color) !important; diff --git a/src/i18n/locale/en.yml b/src/i18n/locale/en.yml index 3ac3d18a0..338dff60b 100644 --- a/src/i18n/locale/en.yml +++ b/src/i18n/locale/en.yml @@ -1119,6 +1119,7 @@ item: tags: Tags wasteBreakdown: Waste breakdown itemCreate: New item + barcode: Barcode descriptor: item: Item buyer: Buyer diff --git a/src/i18n/locale/es.yml b/src/i18n/locale/es.yml index 4ecbcdbc0..7e9c5f669 100644 --- a/src/i18n/locale/es.yml +++ b/src/i18n/locale/es.yml @@ -1118,6 +1118,7 @@ item: tags: Etiquetas wasteBreakdown: Deglose de mermas itemCreate: Nuevo artículo + barcode: Códigos de barras descriptor: item: Artículo buyer: Comprador diff --git a/src/pages/Item/Card/ItemBarcode.vue b/src/pages/Item/Card/ItemBarcode.vue new file mode 100644 index 000000000..6a13a9ea7 --- /dev/null +++ b/src/pages/Item/Card/ItemBarcode.vue @@ -0,0 +1,80 @@ + + + + +es: + Code: Código + Remove barcode: Quitar código de barras + Add barcode: Añadir código de barras + diff --git a/src/router/modules/item.js b/src/router/modules/item.js index 41f3ec92a..35abbb5c7 100644 --- a/src/router/modules/item.js +++ b/src/router/modules/item.js @@ -6,12 +6,13 @@ export default { meta: { title: 'items', icon: 'vn:item', + moduleName: 'Item', }, component: RouterView, redirect: { name: 'ItemMain' }, menus: { main: ['ItemList', 'WasteBreakdown'], - card: ['ItemBasicData'], + card: ['ItemBasicData', 'ItemBarcode'], }, children: [ { @@ -94,6 +95,15 @@ export default { }, component: () => import('src/pages/Item/Card/ItemBasicData.vue'), }, + { + path: 'barcode', + name: 'ItemBarcode', + meta: { + title: 'barcode', + icon: 'vn:barcode', + }, + component: () => import('src/pages/Item/Card/ItemBarcode.vue'), + }, ], }, ], From 84a9dc831906ab02c253026b22b8073301df3fd6 Mon Sep 17 00:00:00 2001 From: wbuezas Date: Wed, 24 Apr 2024 17:30:53 -0300 Subject: [PATCH 2/3] Fix ItemDescriptor labels --- src/pages/Item/Card/ItemDescriptor.vue | 21 +++++++++++++++++---- 1 file changed, 17 insertions(+), 4 deletions(-) diff --git a/src/pages/Item/Card/ItemDescriptor.vue b/src/pages/Item/Card/ItemDescriptor.vue index 981de0632..77b078296 100644 --- a/src/pages/Item/Card/ItemDescriptor.vue +++ b/src/pages/Item/Card/ItemDescriptor.vue @@ -271,14 +271,27 @@ const openCloneDialog = async () => { - - - + + + +