diff --git a/src/i18n/en/index.js b/src/i18n/en/index.js index 6904353da..49a475b9e 100644 --- a/src/i18n/en/index.js +++ b/src/i18n/en/index.js @@ -63,6 +63,7 @@ export default { selectRows: 'Select all { numberRows } row(s)', allRows: 'All { numberRows } row(s)', markAll: 'Mark all', + noResults: 'No results' }, errors: { statusUnauthorized: 'Access denied', @@ -619,6 +620,7 @@ export default { basicData: 'Basic Data', catalog: 'Catalog', volume: 'Volume', + lines: 'Lines', }, field: { salesPersonFk: 'Sales Person', diff --git a/src/i18n/es/index.js b/src/i18n/es/index.js index 59bf0027b..ccac8dc1e 100644 --- a/src/i18n/es/index.js +++ b/src/i18n/es/index.js @@ -63,6 +63,7 @@ export default { selectRows: 'Seleccionar las { numberRows } filas(s)', allRows: 'Todo { numberRows } filas(s)', markAll: 'Marcar todo', + noResults: 'Sin resultados' }, errors: { statusUnauthorized: 'Acceso denegado', @@ -527,6 +528,7 @@ export default { basicData: 'Datos básicos', catalog: 'Catálogo', volume: 'Volumen', + lines: 'Líneas', }, field: { salesPersonFk: 'Comercial', diff --git a/src/pages/Order/Card/OrderDescriptor.vue b/src/pages/Order/Card/OrderDescriptor.vue index 09c87f138..d9fa46471 100644 --- a/src/pages/Order/Card/OrderDescriptor.vue +++ b/src/pages/Order/Card/OrderDescriptor.vue @@ -10,6 +10,7 @@ import WorkerDescriptorProxy from 'src/pages/Worker/Card/WorkerDescriptorProxy.v import CardDescriptor from 'components/ui/CardDescriptor.vue'; import VnLv from 'src/components/ui/VnLv.vue'; import OrderDescriptorMenu from "pages/Order/Card/OrderDescriptorMenu.vue"; +import FetchData from "components/FetchData.vue"; const $props = defineProps({ id: { @@ -60,9 +61,15 @@ const setData = (entity) => { data.value = useCardDescription(entity.client.name, entity.id); state.set('ClaimDescriptor', entity); }; +const total = ref(null); - diff --git a/src/pages/Order/OrderLines.vue b/src/pages/Order/OrderLines.vue new file mode 100644 index 000000000..316c9ae3f --- /dev/null +++ b/src/pages/Order/OrderLines.vue @@ -0,0 +1,286 @@ + + + + + + +en: + summary: Summary + subtotal: Subtotal + VAT: VAT + total: Total + item: Item + warehouse: Warehouse + shipped: Shipped + quantity: Quantity + price: Price + amount: Amount + remove: Remove + confirmDeletion: Confirm deletion, + confirmDeletionMessage: Are you sure you want to delete this item? + confirm: Confirm +es: + summary: Resumen + subtotal: Subtotal + VAT: IVA + total: Total + item: Artículo + warehouse: Almacén + shipped: F. envío + quantity: Cantidad + price: Precio + amount: Importe + remove: Eliminar + confirmDeletion: Confirmar eliminación, + confirmDeletionMessage: Seguro que quieres eliminar este artículo? + confirm: Confirmar + diff --git a/src/pages/Order/OrderVolume.vue b/src/pages/Order/OrderVolume.vue index 2c962600e..48d91574b 100644 --- a/src/pages/Order/OrderVolume.vue +++ b/src/pages/Order/OrderVolume.vue @@ -34,14 +34,17 @@ const loadVolumes = async (rows) => { />
- +
+ {{ t('globals.noResults') }} +
+

{{ t('summary') }}

- + { font-size: 20px; display: inline-block; } + +.no-result { + font-size: 24px; + font-weight: bold; + color: var(--vn-label); + text-align: center; +} en: diff --git a/src/router/modules/order.js b/src/router/modules/order.js index 8a55a39d2..4599394cd 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', 'OrderCatalog', 'OrderVolume'], + card: ['OrderBasicData', 'OrderCatalog', 'OrderVolume', 'OrderLines'], }, children: [ { @@ -81,6 +81,15 @@ export default { }, component: () => import('src/pages/Order/OrderVolume.vue'), }, + { + name: 'OrderLines', + path: 'line', + meta: { + title: 'lines', + icon: 'vn:lines', + }, + component: () => import('src/pages/Order/OrderLines.vue'), + }, ], }, ],