From 627226d3cd125785abd40540a7f8e8ddacc1a80f Mon Sep 17 00:00:00 2001 From: wbuezas Date: Thu, 11 Jan 2024 14:58:22 -0300 Subject: [PATCH 1/2] Entry list --- src/components/ui/CardList.vue | 4 + src/i18n/en/index.js | 6 ++ src/i18n/es/index.js | 6 ++ src/pages/Entry/EntryList.vue | 139 +++++++++++++++++++++++++++++++-- 4 files changed, 149 insertions(+), 6 deletions(-) diff --git a/src/components/ui/CardList.vue b/src/components/ui/CardList.vue index 7d7cee23e..eba69a952 100644 --- a/src/components/ui/CardList.vue +++ b/src/components/ui/CardList.vue @@ -9,6 +9,7 @@ const $props = defineProps({ isSelected: { type: Boolean, default: false }, title: { type: String, default: null }, showCheckbox: { type: Boolean, default: false }, + hasInfoIcons: { type: Boolean, default: false }, }); const emit = defineEmits(['toggleCardCheck']); @@ -39,6 +40,9 @@ const toggleCardCheck = (item) => {
+
+ +
diff --git a/src/i18n/en/index.js b/src/i18n/en/index.js index 1b3c1298c..ffff99cc4 100644 --- a/src/i18n/en/index.js +++ b/src/i18n/en/index.js @@ -267,6 +267,12 @@ export default { }, list: { newEntry: 'New entry', + landed: 'Landed', + invoiceNumber: 'Invoice number', + supplier: 'Supplier', + booked: 'Booked', + confirmed: 'Confirmed', + ordered: 'Ordered', }, }, ticket: { diff --git a/src/i18n/es/index.js b/src/i18n/es/index.js index 9758baefd..d8993a08c 100644 --- a/src/i18n/es/index.js +++ b/src/i18n/es/index.js @@ -265,6 +265,12 @@ export default { }, list: { newEntry: 'Nueva entrada', + landed: 'F. entrega', + invoiceNumber: 'Núm. factura', + supplier: 'Proveedor', + booked: 'Asentado', + confirmed: 'Confirmado', + ordered: 'Pedida', }, }, ticket: { diff --git a/src/pages/Entry/EntryList.vue b/src/pages/Entry/EntryList.vue index 1baa9e019..84f0d8112 100644 --- a/src/pages/Entry/EntryList.vue +++ b/src/pages/Entry/EntryList.vue @@ -1,22 +1,149 @@ + + + + +es: + Search entries: Buscar entradas + You can search by entry reference: Puedes buscar por referencia de la entrada + Inventory entry: Es inventario + Virtual entry: Es una redada + From f64ac5c70d0974a0022c21547160aacc4f26d0f8 Mon Sep 17 00:00:00 2001 From: wbuezas Date: Fri, 12 Jan 2024 17:02:52 -0300 Subject: [PATCH 2/2] Entry summary --- src/i18n/en/index.js | 30 ++ src/i18n/es/index.js | 30 ++ src/pages/Entry/Card/EntrySummary.vue | 373 ++++++++++++++++++++ src/pages/Entry/Card/EntrySummaryDialog.vue | 29 ++ src/pages/Entry/EntryList.vue | 17 +- src/pages/Supplier/Card/SupplierSummary.vue | 1 - src/router/modules/entry.js | 35 +- 7 files changed, 488 insertions(+), 27 deletions(-) create mode 100644 src/pages/Entry/Card/EntrySummary.vue create mode 100644 src/pages/Entry/Card/EntrySummaryDialog.vue 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 @@ + + + + + +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'), + }, + ], + }, ], };