diff --git a/src/components/common/VnInputDate.vue b/src/components/common/VnInputDate.vue index 2053eceb1..fe0866292 100644 --- a/src/components/common/VnInputDate.vue +++ b/src/components/common/VnInputDate.vue @@ -15,6 +15,10 @@ const props = defineProps({ type: Boolean, default: false, }, + emitDateFormat: { + 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.emitDateFormat ? new Date(value) : joinDateAndTime(value, time.value) + ); }, }); diff --git a/src/i18n/locale/en.yml b/src/i18n/locale/en.yml index 26cfa6489..3486cc1d8 100644 --- a/src/i18n/locale/en.yml +++ b/src/i18n/locale/en.yml @@ -1138,6 +1138,7 @@ item: botanical: Botanical itemTypeCreate: New item type family: Item Type + lastEntries: Last entries descriptor: item: Item buyer: Buyer diff --git a/src/i18n/locale/es.yml b/src/i18n/locale/es.yml index cb2be6dc9..70a39dd3c 100644 --- a/src/i18n/locale/es.yml +++ b/src/i18n/locale/es.yml @@ -1137,6 +1137,7 @@ item: log: Historial itemTypeCreate: Nueva familia family: Familia + lastEntries: Últimas entradas descriptor: item: Artículo buyer: Comprador diff --git a/src/pages/InvoiceIn/Card/InvoiceInDueDay.vue b/src/pages/InvoiceIn/Card/InvoiceInDueDay.vue index 476a0f31e..0e68b740f 100644 --- a/src/pages/InvoiceIn/Card/InvoiceInDueDay.vue +++ b/src/pages/InvoiceIn/Card/InvoiceInDueDay.vue @@ -70,7 +70,7 @@ const columns = computed(() => [ const isNotEuro = (code) => code != 'EUR'; async function insert() { - await axios.post('/InvoiceInDueDays/new ', { id: +invoiceId }); + await axios.post('/InvoiceInDueDays/new', { id: +invoiceId }); await invoiceInFormRef.value.reload(); } diff --git a/src/pages/Item/Card/ItemLastEntries.vue b/src/pages/Item/Card/ItemLastEntries.vue new file mode 100644 index 000000000..5200db239 --- /dev/null +++ b/src/pages/Item/Card/ItemLastEntries.vue @@ -0,0 +1,317 @@ + + + + + diff --git a/src/pages/Item/locale/en.yml b/src/pages/Item/locale/en.yml index f0904c272..9acd1de4d 100644 --- a/src/pages/Item/locale/en.yml +++ b/src/pages/Item/locale/en.yml @@ -14,3 +14,23 @@ itemDiary: tax: country: Country class: Class +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 index ae3022b1d..46e0d9eb7 100644 --- a/src/pages/Item/locale/es.yml +++ b/src/pages/Item/locale/es.yml @@ -14,3 +14,23 @@ itemDiary: tax: country: País class: Clase +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 d79ac3071..f0c68f0e7 100644 --- a/src/router/modules/item.js +++ b/src/router/modules/item.js @@ -26,6 +26,7 @@ export default { 'ItemTax', 'ItemBotanical', 'ItemBarcode', + 'ItemLastEntries', ], }, children: [ @@ -135,6 +136,15 @@ export default { }, component: () => import('src/pages/Item/Card/ItemTags.vue'), }, + { + path: 'last-entries', + name: 'ItemLastEntries', + meta: { + title: 'lastEntries', + icon: 'vn:regentry', + }, + component: () => import('src/pages/Item/Card/ItemLastEntries.vue'), + }, { path: 'tax', name: 'ItemTax', @@ -144,6 +154,15 @@ export default { }, component: () => import('src/pages/Item/Card/ItemTax.vue'), }, + { + path: 'botanical', + name: 'ItemBotanical', + meta: { + title: 'botanical', + icon: 'local_florist', + }, + component: () => import('src/pages/Item/Card/ItemBotanical.vue'), + }, { path: 'barcode', name: 'ItemBarcode', @@ -171,15 +190,6 @@ export default { }, component: () => import('src/pages/Item/Card/ItemLog.vue'), }, - { - path: 'botanical', - name: 'ItemBotanical', - meta: { - title: 'botanical', - icon: 'vn:botanical', - }, - component: () => import('src/pages/Item/Card/ItemBotanical.vue'), - }, ], }, ],