diff --git a/src/i18n/en/index.js b/src/i18n/en/index.js index 21cb2ea74..752314813 100644 --- a/src/i18n/en/index.js +++ b/src/i18n/en/index.js @@ -555,6 +555,7 @@ export default { create: 'Create', summary: 'Summary', basicData: 'Basic Data', + catalog: 'Catalog', }, field: { salesPersonFk: 'Sales Person', diff --git a/src/pages/Order/Card/OrderCard.vue b/src/pages/Order/Card/OrderCard.vue index 5a9a6452a..f6288207d 100644 --- a/src/pages/Order/Card/OrderCard.vue +++ b/src/pages/Order/Card/OrderCard.vue @@ -1,15 +1,11 @@ - - - diff --git a/src/pages/Order/Card/OrderCatalogItem.vue b/src/pages/Order/Card/OrderCatalogItem.vue new file mode 100644 index 000000000..d187df8ce --- /dev/null +++ b/src/pages/Order/Card/OrderCatalogItem.vue @@ -0,0 +1,182 @@ + + + + + + + + + + + + + {{ item.name }} + {{ item.subName }} + + + + + + + + + + + + + +es: + price-kg: Precio por Kg +en: + price-kg: Price per Kg + diff --git a/src/pages/Order/Card/OrderCatalogItemDialog.vue b/src/pages/Order/Card/OrderCatalogItemDialog.vue new file mode 100644 index 000000000..8d12824e6 --- /dev/null +++ b/src/pages/Order/Card/OrderCatalogItemDialog.vue @@ -0,0 +1,83 @@ + + + + + + + + + + {{ item.warehouse }} + + + { + item.quantity = + Number(item.quantity) + item.grouping; + } + " + > + {{ item.grouping }} + + x {{ toCurrency(item.price) }} + + + + + + + + + + {{ t('globals.add') }} + + + + + + + diff --git a/src/pages/Order/Card/OrderSummary.vue b/src/pages/Order/Card/OrderSummary.vue index 7902204ef..d3ecc7984 100644 --- a/src/pages/Order/Card/OrderSummary.vue +++ b/src/pages/Order/Card/OrderSummary.vue @@ -1,14 +1,17 @@ + + + {{ t('order.summary.basket') }} #{{ entity?.id }} - @@ -147,8 +153,12 @@ const detailsColumns = ref([ {{ t('order.summary.details') }} - - + diff --git a/src/pages/Order/OrderCatalog.vue b/src/pages/Order/OrderCatalog.vue new file mode 100644 index 000000000..c4fec45a4 --- /dev/null +++ b/src/pages/Order/OrderCatalog.vue @@ -0,0 +1,81 @@ + + + + + + + + + + + {{ t('globals.collapseMenu') }} + + + + + + + + + + + + + + + + + + + + + diff --git a/src/router/modules/order.js b/src/router/modules/order.js index ffbc1665e..e91e95493 100644 --- a/src/router/modules/order.js +++ b/src/router/modules/order.js @@ -11,7 +11,7 @@ export default { redirect: { name: 'OrderMain' }, menus: { main: ['OrderList'], - card: ['OrderBasicData'], + card: ['OrderBasicData', 'OrderCatalog'], }, children: [ { @@ -63,6 +63,15 @@ export default { }, component: () => import('src/pages/Order/Card/OrderForm.vue'), }, + { + name: 'OrderCatalog', + path: 'catalog', + meta: { + title: 'catalog', + icon: 'vn:basket', + }, + component: () => import('src/pages/Order/OrderCatalog.vue'), + }, ], }, ],
{{ item.subName }}
{{ t('order.summary.details') }}