diff --git a/src/i18n/en/index.js b/src/i18n/en/index.js index ffff99cc4..a8859798e 100644 --- a/src/i18n/en/index.js +++ b/src/i18n/en/index.js @@ -274,6 +274,36 @@ export default { confirmed: 'Confirmed', ordered: 'Ordered', }, + summary: { + commission: 'Commission', + currency: 'Currency', + company: 'Company', + reference: 'Reference', + invoiceNumber: 'Invoice number', + ordered: 'Ordered', + confirmed: 'Confirmed', + booked: 'Booked', + raid: 'Raid', + excludedFromAvailable: 'Inventory', + travelReference: 'Reference', + travelAgency: 'Agency', + travelShipped: 'Shipped', + travelWarehouseOut: 'Warehouse Out', + travelDelivered: 'Delivered', + travelLanded: 'Landed', + travelWarehouseIn: 'Warehouse In', + travelReceived: 'Received', + buys: 'Buys', + quantity: 'Quantity', + stickers: 'Stickers', + package: 'Package', + weight: 'Weight', + packing: 'Packing', + grouping: 'Grouping', + buyingValue: 'Buying value', + import: 'Import', + pvp: 'PVP', + }, }, ticket: { pageTitles: { diff --git a/src/i18n/es/index.js b/src/i18n/es/index.js index d8993a08c..27687ef57 100644 --- a/src/i18n/es/index.js +++ b/src/i18n/es/index.js @@ -272,6 +272,36 @@ export default { confirmed: 'Confirmado', ordered: 'Pedida', }, + summary: { + commission: 'Comisión', + currency: 'Moneda', + company: 'Empresa', + reference: 'Referencia', + invoiceNumber: 'Núm. factura', + ordered: 'Pedida', + confirmed: 'Confirmado', + booked: 'Asentado', + raid: 'Redada', + excludedFromAvailable: 'Inventario', + travelReference: 'Referencia', + travelAgency: 'Agencia', + travelShipped: 'F. envio', + travelWarehouseOut: 'Alm. salida', + travelDelivered: 'Enviada', + travelLanded: 'F. entrega', + travelWarehouseIn: 'Alm. entrada', + travelReceived: 'Recibida', + buys: 'Compras', + quantity: 'Cantidad', + stickers: 'Etiquetas', + package: 'Embalaje', + weight: 'Peso', + packing: 'Packing', + grouping: 'Grouping', + buyingValue: 'Coste', + import: 'Importe', + pvp: 'PVP', + }, }, ticket: { pageTitles: { diff --git a/src/pages/Entry/Card/EntrySummary.vue b/src/pages/Entry/Card/EntrySummary.vue new file mode 100644 index 000000000..19c59da27 --- /dev/null +++ b/src/pages/Entry/Card/EntrySummary.vue @@ -0,0 +1,373 @@ + + + + setEntryData(data)" + > + + + + + + + {{ entry.id }} - {{ entry.supplier.nickname }} + + + + + + {{ t('globals.summary.basicData') }} + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + {{ t('Travel data') }} + + + + + + + + {{ entry.travel.ref }} + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + {{ t('entry.summary.buys') }} + + + + + + + {{ col.value }} + {{ + col.toolTip + }} + + + + + + {{ row.item.itemType.code }} + + + {{ row.item.id }} + + + {{ row.item.size }} + + + {{ toCurrency(row.item.minPrice) }} + + + {{ row.item.concept }} + + {{ row.item.subName }} + + + + + + + + + + + + + + + + +es: + Travel data: 'Datos envío' + diff --git a/src/pages/Entry/Card/EntrySummaryDialog.vue b/src/pages/Entry/Card/EntrySummaryDialog.vue new file mode 100644 index 000000000..527421ce2 --- /dev/null +++ b/src/pages/Entry/Card/EntrySummaryDialog.vue @@ -0,0 +1,29 @@ + + + + + + + + + diff --git a/src/pages/Entry/EntryList.vue b/src/pages/Entry/EntryList.vue index 84f0d8112..fc4f60ff0 100644 --- a/src/pages/Entry/EntryList.vue +++ b/src/pages/Entry/EntryList.vue @@ -8,6 +8,7 @@ import VnPaginate from 'src/components/ui/VnPaginate.vue'; import VnSearchbar from 'src/components/ui/VnSearchbar.vue'; import VnLv from 'src/components/ui/VnLv.vue'; import CardList from 'src/components/ui/CardList.vue'; +import EntrySummaryDialog from './Card/EntrySummaryDialog.vue'; import { useStateStore } from 'stores/useStateStore'; import { toDate } from 'src/filters/index'; @@ -23,7 +24,7 @@ onMounted(async () => { onUnmounted(() => (stateStore.rightDrawer = false)); function navigate(id) { - router.push({ path: `/invoice-in/${id}` }); + router.push({ path: `/entry/${id}` }); } const redirectToCreateView = () => { @@ -31,12 +32,12 @@ const redirectToCreateView = () => { }; function viewSummary(id) { - // quasar.dialog({ - // component: EntrySummaryDialog, - // componentProps: { - // id, - // }, - // }); + quasar.dialog({ + component: EntrySummaryDialog, + componentProps: { + id, + }, + }); } @@ -66,7 +67,7 @@ function viewSummary(id) { :title="row.reference" @click="navigate(row.id)" :id="row.id" - :has-info-icons="row.isExcludedFromAvailable || row.isRaid" + :has-info-icons="!!row.isExcludedFromAvailable || !!row.isRaid" > { - diff --git a/src/router/modules/entry.js b/src/router/modules/entry.js index 6a1cd6173..a806190a8 100644 --- a/src/router/modules/entry.js +++ b/src/router/modules/entry.js @@ -39,23 +39,22 @@ export default { }, ], }, - // { - // name: 'EntryCard', - // path: ':id', - // component: () => import('src/pages/Entry/Card/EntryCard.vue'), - // redirect: { name: 'EntrySummary' }, - // children: [ - // { - // name: 'EntrySummary', - // path: 'summary', - // meta: { - // title: 'summary', - // icon: 'launch', - // }, - // component: () => - // import('src/pages/Entry/Card/EntrySummary.vue'), - // }, - // ], - // }, + { + name: 'EntryCard', + path: ':id', + component: () => import('src/pages/Entry/Card/EntryCard.vue'), + redirect: { name: 'EntrySummary' }, + children: [ + { + name: 'EntrySummary', + path: 'summary', + meta: { + title: 'summary', + icon: 'launch', + }, + component: () => import('src/pages/Entry/Card/EntrySummary.vue'), + }, + ], + }, ], };