From c95b738e0c28bc43da0469be0888efb6cb532226 Mon Sep 17 00:00:00 2001 From: Javier Segarra Date: Sat, 20 Jan 2024 12:23:51 +0100 Subject: [PATCH 001/197] refs #6321 feat: create new section for ticket module --- src/i18n/en/index.js | 21 +++ src/i18n/es/index.js | 21 +++ src/pages/Ticket/Negative/TicketFilter.vue | 179 +++++++++++++++++++ src/pages/Ticket/Negative/TicketList.vue | 190 +++++++++++++++++++++ src/router/modules/ticket.js | 11 +- 5 files changed, 421 insertions(+), 1 deletion(-) create mode 100644 src/pages/Ticket/Negative/TicketFilter.vue create mode 100644 src/pages/Ticket/Negative/TicketList.vue diff --git a/src/i18n/en/index.js b/src/i18n/en/index.js index 139977e32..36bc65a85 100644 --- a/src/i18n/en/index.js +++ b/src/i18n/en/index.js @@ -63,6 +63,7 @@ export default { allRows: 'All { numberRows } row(s)', markAll: 'Mark all', noResults: 'No results', + results: 'Results', system: 'System', }, errors: { @@ -272,6 +273,7 @@ export default { ticket: { pageTitles: { tickets: 'Tickets', + negative: 'Tickets negative', list: 'List', createTicket: 'Create ticket', summary: 'Summary', @@ -349,6 +351,25 @@ export default { weight: 'Weight', goTo: 'Go to', }, + negative:{ + hour: 'Hora', + id: 'Id_Articulo', + longName:'Articulo', + supplier: 'Productor', + colour:'Color', + size:'Medida', + origen:'Origen', + value:'Negativo', + itemFk: 'itemFk', + warehouseFk: 'warehouseFk', + producer: 'producer', + category: 'category', + warehouse: 'warehouse', + lack: 'Negativo', + inkFk: 'inkFk', + timed: 'timed', + minTimed: 'minTimed', + } }, claim: { pageTitles: { diff --git a/src/i18n/es/index.js b/src/i18n/es/index.js index 43f624cb3..e29f28d59 100644 --- a/src/i18n/es/index.js +++ b/src/i18n/es/index.js @@ -64,6 +64,7 @@ export default { markAll: 'Marcar todo', noResults: 'Sin resultados', system: 'Sistema', + results: 'resultados' }, errors: { statusUnauthorized: 'Acceso denegado', @@ -270,6 +271,7 @@ export default { ticket: { pageTitles: { tickets: 'Tickets', + negative: 'Tickets negativos', list: 'Listado', createTicket: 'Crear ticket', summary: 'Resumen', @@ -296,6 +298,25 @@ export default { warehouse: 'Almacén', customerCard: 'Ficha del cliente', }, + negative:{ + hour: 'Hora', + id: 'Id_Articulo', + longName:'Articulo', + supplier: 'Productor', + colour:'Color', + size:'Medida', + origen:'Origen', + value:'Negativo', + itemFk: 'itemFk', + warehouseFk: 'warehouseFk', + producer: 'producer', + category: 'category', + warehouse: 'warehouse', + lack: 'Negativo', + inkFk: 'inkFk', + timed: 'timed', + minTimed: 'minTimed', + }, boxing: { expedition: 'Expedición', item: 'Artículo', diff --git a/src/pages/Ticket/Negative/TicketFilter.vue b/src/pages/Ticket/Negative/TicketFilter.vue new file mode 100644 index 000000000..db4dad9db --- /dev/null +++ b/src/pages/Ticket/Negative/TicketFilter.vue @@ -0,0 +1,179 @@ + + + + + +en: + params: + search: Contains + clientFk: Customer + orderFk: Order + from: From + to: To + salesPersonFk: Salesperson + stateFk: State + refFk: Invoice Ref. + myTeam: My team + pending: Pending + hasInvoice: Invoiced + hasRoute: Routed + provinceFk: Province + agencyModeFk: Agency + warehouseFk: Warehouse +es: + params: + search: Contiene + clientFk: Cliente + orderFk: Pedido + from: Desde + to: Hasta + salesPersonFk: Comercial + stateFk: Estado + refFk: Ref. Factura + myTeam: Mi equipo + pending: Pendiente + hasInvoice: Facturado + hasRoute: Enrutado + Customer ID: ID Cliente + Order ID: ID Pedido + From: Desde + To: Hasta + Salesperson: Comercial + State: Estado + Invoice Ref.: Ref. Factura + My team: Mi equipo + Pending: Pendiente + With problems: Con problemas + Invoiced: Facturado + Routed: Enrutado + More options: Más opciones + Province: Provincia + Agency: Agencia + Warehouse: Almacén + Yes: Si + No: No + diff --git a/src/pages/Ticket/Negative/TicketList.vue b/src/pages/Ticket/Negative/TicketList.vue new file mode 100644 index 000000000..69190bf41 --- /dev/null +++ b/src/pages/Ticket/Negative/TicketList.vue @@ -0,0 +1,190 @@ + + + + diff --git a/src/router/modules/ticket.js b/src/router/modules/ticket.js index 73c441b4d..b731de22f 100644 --- a/src/router/modules/ticket.js +++ b/src/router/modules/ticket.js @@ -10,7 +10,7 @@ export default { component: RouterView, redirect: { name: 'TicketMain' }, menus: { - main: ['TicketList'], + main: ['TicketList', 'TicketNegative'], card: ['TicketBoxing', 'TicketSms'], }, children: [ @@ -29,6 +29,15 @@ export default { }, component: () => import('src/pages/Ticket/TicketList.vue'), }, + { + name: 'TicketNegative', + path: 'negative', + meta: { + title: 'negative', + icon: 'view_list', + }, + component: () => import('src/pages/Ticket/Negative/TicketList.vue'), + }, { name: 'TicketCreate', path: 'create', From f6f84e191b243b9556126900ec8b489073c9cc38 Mon Sep 17 00:00:00 2001 From: Javier Segarra Date: Tue, 23 Jan 2024 11:14:46 +0100 Subject: [PATCH 002/197] refs #6321 feat dialog approach --- .../Ticket/Negative/TicketDescriptor.vue | 273 ++++++++++++++++++ .../Negative/TicketDescriptorDialog.vue | 15 + src/pages/Ticket/Negative/TicketList.vue | 67 +++-- 3 files changed, 324 insertions(+), 31 deletions(-) create mode 100644 src/pages/Ticket/Negative/TicketDescriptor.vue create mode 100644 src/pages/Ticket/Negative/TicketDescriptorDialog.vue diff --git a/src/pages/Ticket/Negative/TicketDescriptor.vue b/src/pages/Ticket/Negative/TicketDescriptor.vue new file mode 100644 index 000000000..a5bd86012 --- /dev/null +++ b/src/pages/Ticket/Negative/TicketDescriptor.vue @@ -0,0 +1,273 @@ + + + + + diff --git a/src/pages/Ticket/Negative/TicketDescriptorDialog.vue b/src/pages/Ticket/Negative/TicketDescriptorDialog.vue new file mode 100644 index 000000000..1b6086d17 --- /dev/null +++ b/src/pages/Ticket/Negative/TicketDescriptorDialog.vue @@ -0,0 +1,15 @@ + + diff --git a/src/pages/Ticket/Negative/TicketList.vue b/src/pages/Ticket/Negative/TicketList.vue index 69190bf41..5ea224e30 100644 --- a/src/pages/Ticket/Negative/TicketList.vue +++ b/src/pages/Ticket/Negative/TicketList.vue @@ -5,25 +5,34 @@ import { useStateStore } from 'stores/useStateStore'; import VnPaginate from 'components/ui/VnPaginate.vue'; import { useSession } from 'src/composables/useSession'; import TicketFilter from 'pages/Ticket/Negative/TicketFilter.vue'; -// import TicketDescriptorProxy from 'pages/Ticket/Card/TicketDescriptorProxy.vue'; -// import CustomerDescriptorProxy from 'pages/Customer/Card/CustomerDescriptorProxy.vue'; +import TicketDescriptorDialog from 'pages/Ticket/Negative/TicketDescriptorDialog.vue'; +import { useQuasar } from 'quasar'; const stateStore = useStateStore(); const { t } = useI18n(); const session = useSession(); const selected = ref([]); +const quasar = useQuasar(); +const viewSummary = (value) => { + quasar.dialog({ + component: TicketDescriptorDialog, + componentProps: { + id: value, + }, + }); +}; const columns = computed(() => [ { name: 'itemFk', label: t('ticket.negative.id'), - field: ({itemFk}) => itemFk, + field: ({ itemFk }) => itemFk, sortable: true, }, { name: 'longName', label: t('ticket.negative.longName'), - field: ({longName}) => longName, + field: ({ longName }) => longName, align: 'center', sortable: true, headerStyle: 'padding-left: 35px', @@ -31,32 +40,32 @@ const columns = computed(() => [ { name: 'producer', label: t('ticket.negative.supplier'), - field: ({producer}) => producer, + field: ({ producer }) => producer, sortable: true, }, { name: 'inkFk', label: t('ticket.negative.colour'), - field: ({inkFk}) => inkFk, + field: ({ inkFk }) => inkFk, sortable: true, }, { name: 'size', label: t('ticket.negative.size'), - field: ({size}) => size, + field: ({ size }) => size, sortable: true, }, { name: 'category', label: t('ticket.negative.origen'), - field: ({category}) => category, + field: ({ category }) => category, align: 'left', sortable: true, }, { name: 'lack', label: t('ticket.negative.lack'), - field: ({lack}) => lack, + field: ({ lack }) => lack, align: 'center', sortable: true, headerStyle: 'padding-left: 33px', @@ -86,21 +95,16 @@ const columns = computed(() => [ headerStyle: 'padding-left: 33px', },*/ { - align: 'right', - field: 'actions', - label: '', - name: 'actions', - } + name: 'icons', + align: 'center', + field: (row) => row, + }, ]);