diff --git a/src/components/common/VnInputDate.vue b/src/components/common/VnInputDate.vue index 2053eceb1..72d9bb2bc 100644 --- a/src/components/common/VnInputDate.vue +++ b/src/components/common/VnInputDate.vue @@ -15,6 +15,10 @@ const props = defineProps({ type: Boolean, default: false, }, + emitDate: { + type: Boolean, + default: false, + }, }); const hover = ref(false); @@ -37,7 +41,10 @@ const value = computed({ return props.modelValue; }, set(value) { - emit('update:modelValue', joinDateAndTime(value, time.value)); + emit( + 'update:modelValue', + props.emitDate ? new Date(value) : joinDateAndTime(value, time.value) + ); }, }); diff --git a/src/i18n/locale/en.yml b/src/i18n/locale/en.yml index abe59fe18..a898f4d53 100644 --- a/src/i18n/locale/en.yml +++ b/src/i18n/locale/en.yml @@ -1135,6 +1135,7 @@ item: tax: Tax barcode: Barcode botanical: Botanical + lastEntries: Last entries descriptor: item: Item buyer: Buyer diff --git a/src/i18n/locale/es.yml b/src/i18n/locale/es.yml index 06aa057e3..dd176e235 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 + lastEntries: Últimas entradas descriptor: item: Artículo buyer: Comprador diff --git a/src/pages/Item/Card/ItemLastEntries.vue b/src/pages/Item/Card/ItemLastEntries.vue new file mode 100644 index 000000000..2a2d84dfe --- /dev/null +++ b/src/pages/Item/Card/ItemLastEntries.vue @@ -0,0 +1,291 @@ + + + + + diff --git a/src/pages/Item/locale/en.yml b/src/pages/Item/locale/en.yml new file mode 100644 index 000000000..b7909bdf9 --- /dev/null +++ b/src/pages/Item/locale/en.yml @@ -0,0 +1,20 @@ +lastEntries: + since: Since + to: To + ig: Ig + warehouse: Warehouse + landed: Landed + entry: Entry + pvp: PVP + label: Label + packing: Packing + grouping: Grouping + stems: Stems + quantity: Quantity + cost: Cost + kg: Kg. + cube: Cube + supplier: Supplier + package: Package + freight: Freight + comission: Comission diff --git a/src/pages/Item/locale/es.yml b/src/pages/Item/locale/es.yml new file mode 100644 index 000000000..052ba1981 --- /dev/null +++ b/src/pages/Item/locale/es.yml @@ -0,0 +1,20 @@ +lastEntries: + since: Desde + to: Hasta + ig: Ig + warehouse: Almacén + landed: F. Entrega + entry: Entrada + pvp: PVP + label: Etiquetas + packing: Packing + grouping: Grouping + stems: Tallos + quantity: Cantidad + cost: Coste + kg: Kg. + cube: Cubo + supplier: Proveedor + package: Embalaje + freight: Porte + comission: Comisión diff --git a/src/router/modules/item.js b/src/router/modules/item.js index bc1e72a94..91c43a540 100644 --- a/src/router/modules/item.js +++ b/src/router/modules/item.js @@ -20,6 +20,7 @@ export default { 'ItemTax', 'ItemBotanical', 'ItemBarcode', + 'ItemLastEntries', ], }, children: [ @@ -157,6 +158,15 @@ export default { }, component: () => import('src/pages/Item/Card/ItemBotanical.vue'), }, + { + path: 'last-entries', + name: 'ItemLastEntries', + meta: { + title: 'lastEntries', + icon: 'vn:botanical', + }, + component: () => import('src/pages/Item/Card/ItemLastEntries.vue'), + }, ], }, ],