From e499fd151173e7d026b862bfb8d36e8173fa4678 Mon Sep 17 00:00:00 2001 From: alexandre Date: Wed, 30 Nov 2022 15:00:02 +0100 Subject: [PATCH 001/579] working on create deliveryMan --- src/i18n/en/index.js | 41 ++++++ src/i18n/es/index.js | 41 ++++++ src/pages/Route/Card/DeliveryManBasicData.vue | 115 ++++++++++++++++ src/pages/Route/Card/DeliveryManCard.vue | 58 ++++++++ .../Route/Card/DeliveryManDescriptor.vue | 82 ++++++++++++ src/pages/Route/Card/DeliveryManSummary.vue | 124 ++++++++++++++++++ src/pages/Route/DeliveryManCreate.vue | 44 +++++++ src/pages/Route/DeliveryManList.vue | 78 +++++++++++ src/pages/Route/RouteMain.vue | 17 +++ src/router/modules/route.js | 65 +++++++++ src/router/routes.js | 6 +- 11 files changed, 669 insertions(+), 2 deletions(-) create mode 100644 src/pages/Route/Card/DeliveryManBasicData.vue create mode 100644 src/pages/Route/Card/DeliveryManCard.vue create mode 100644 src/pages/Route/Card/DeliveryManDescriptor.vue create mode 100644 src/pages/Route/Card/DeliveryManSummary.vue create mode 100644 src/pages/Route/DeliveryManCreate.vue create mode 100644 src/pages/Route/DeliveryManList.vue create mode 100644 src/pages/Route/RouteMain.vue create mode 100644 src/router/modules/route.js diff --git a/src/i18n/en/index.js b/src/i18n/en/index.js index 88fae5bb7..f567edcab 100644 --- a/src/i18n/en/index.js +++ b/src/i18n/en/index.js @@ -251,6 +251,47 @@ export default { returnOfMaterial: 'Return of material authorization (RMA)', }, }, + route: { + pageTitles: { + routes: 'Routes', + deliveryManList: 'Delivery Men', + basicData: 'Basic Data', + deliveryManCreate: 'Create Delivery Man', + }, + deliveryMan: { + list: { + deliveryMan: 'Delivery man', + supplier: 'Supplier', + id: 'ID', + minCost: 'Minimum cost', + minM3: 'M3', + agency: 'Agency', + }, + basicData: { + supplier: 'Supplier', + id: 'ID', + minCost: 'Minimum cost', + minM3: 'M3', + agency: 'Agency', + }, + card: { + supplier: 'Supplier', + id: 'ID', + minCost: 'Minimum cost', + minM3: 'M3', + agency: 'Agency', + }, + summary: { + deliveryMan: 'Delivery man', + supplier: 'Supplier', + id: 'ID', + minCost: 'Minimum cost', + minM3: 'M3', + agency: 'Agency', + }, + } + + }, components: { topbar: {}, userPanel: { diff --git a/src/i18n/es/index.js b/src/i18n/es/index.js index 0103b1a92..567fe71e4 100644 --- a/src/i18n/es/index.js +++ b/src/i18n/es/index.js @@ -250,6 +250,47 @@ export default { returnOfMaterial: 'Autorización de retorno de materiales (RMA)', }, }, + route: { + pageTitles: { + routes: 'Rutas', + deliveryManList: 'Repartidores', + basicData: 'Datos básicos', + deliveryManCreate: 'Crear Repartidor', + }, + deliveryMan: { + list: { + deliveryMan: 'Repartidor', + supplier: 'Proveedor', + id: 'ID', + minCost: 'Coste mínimo', + minM3: 'Número de M3', + agency: 'Agencia', + }, + basicData: { + supplier: 'Proveedor', + id: 'ID', + minCost: 'Coste mínimo', + minM3: 'Número de M3', + agency: 'Agencia', + }, + card: { + supplier: 'Proveedor', + id: 'ID', + minCost: 'Coste mínimo', + minM3: 'Número de M3', + agency: 'Agencia', + }, + summary: { + deliveryMan: 'Repartidor', + supplier: 'Proveedor', + id: 'ID', + minCost: 'Coste mínimo', + minM3: 'Número de M3', + agency: 'Agencia', + } + } + + }, components: { topbar: {}, userPanel: { diff --git a/src/pages/Route/Card/DeliveryManBasicData.vue b/src/pages/Route/Card/DeliveryManBasicData.vue new file mode 100644 index 000000000..1aad8d8cc --- /dev/null +++ b/src/pages/Route/Card/DeliveryManBasicData.vue @@ -0,0 +1,115 @@ + + + + diff --git a/src/pages/Route/Card/DeliveryManCard.vue b/src/pages/Route/Card/DeliveryManCard.vue new file mode 100644 index 000000000..cabf0266c --- /dev/null +++ b/src/pages/Route/Card/DeliveryManCard.vue @@ -0,0 +1,58 @@ + + + + + + diff --git a/src/pages/Route/Card/DeliveryManDescriptor.vue b/src/pages/Route/Card/DeliveryManDescriptor.vue new file mode 100644 index 000000000..6d9e64c32 --- /dev/null +++ b/src/pages/Route/Card/DeliveryManDescriptor.vue @@ -0,0 +1,82 @@ + + + diff --git a/src/pages/Route/Card/DeliveryManSummary.vue b/src/pages/Route/Card/DeliveryManSummary.vue new file mode 100644 index 000000000..b76ca8a05 --- /dev/null +++ b/src/pages/Route/Card/DeliveryManSummary.vue @@ -0,0 +1,124 @@ + + + + + diff --git a/src/pages/Route/DeliveryManCreate.vue b/src/pages/Route/DeliveryManCreate.vue new file mode 100644 index 000000000..8cb66d510 --- /dev/null +++ b/src/pages/Route/DeliveryManCreate.vue @@ -0,0 +1,44 @@ + + + + + diff --git a/src/pages/Route/DeliveryManList.vue b/src/pages/Route/DeliveryManList.vue new file mode 100644 index 000000000..2103e6129 --- /dev/null +++ b/src/pages/Route/DeliveryManList.vue @@ -0,0 +1,78 @@ + + + diff --git a/src/pages/Route/RouteMain.vue b/src/pages/Route/RouteMain.vue new file mode 100644 index 000000000..fd50f1521 --- /dev/null +++ b/src/pages/Route/RouteMain.vue @@ -0,0 +1,17 @@ + + + diff --git a/src/router/modules/route.js b/src/router/modules/route.js new file mode 100644 index 000000000..a5e86a446 --- /dev/null +++ b/src/router/modules/route.js @@ -0,0 +1,65 @@ +import { RouterView } from 'vue-router'; + +export default { + name: 'Route', + path: '/route', + meta: { + title: 'routes', + icon: 'vn:delivery' + }, + component: RouterView, + redirect: { name: 'RouteMain' }, + children: [ + { + path: '', + name: 'RouteMain', + component: () => import('src/pages/Route/RouteMain.vue'), + redirect: { name: 'DeliveryManList' }, + children: [ + { + name: 'DeliveryManList', + path: 'deliveryMan/list', + meta: { + title: 'deliveryManList', + icon: 'person', + }, + component: () => import('src/pages/Route/DeliveryManList.vue'), + }, + { + name: 'DeliveryManCreate', + path: 'deliveryMan/create', + meta: { + title: 'deliveryManCreate', + icon: 'vn:addperson', + }, + component: () => import('src/pages/Route/DeliveryManCreate.vue'), + }, + + ] + }, + { + name: 'DeliveryManCard', + path: ':id', + component: () => import('src/pages/Route/Card/DeliveryManCard.vue'), + redirect: { name: 'DeliveryManSummary' }, + children: [ + { + name: 'DeliveryManSummary', + path: 'deliveryMan/summary', + meta: { + title: 'summary', + }, + component: () => import('src/pages/Route/Card/DeliveryManSummary.vue'), + }, + { + name: 'DeliveryManBasicData', + path: 'deliveryMan/basic-data', + meta: { + title: 'basicData', + }, + component: () => import('src/pages/Route/Card/DeliveryManBasicData.vue'), + }, + ] + }, + ] +}; diff --git a/src/router/routes.js b/src/router/routes.js index a7261379f..f0090d380 100644 --- a/src/router/routes.js +++ b/src/router/routes.js @@ -1,6 +1,7 @@ import customer from './modules/customer'; import ticket from './modules/ticket'; import claim from './modules/claim'; +import route from './modules/route'; const routes = [ { @@ -25,13 +26,14 @@ const routes = [ customer, ticket, claim, + route, { path: '/:pathMatch(.*)*', name: 'NotFound', component: () => import('../pages/NotFound.vue'), - } + }, ], } ]; -export default routes; \ No newline at end of file +export default routes; From 20e284fe594507ecc15542ce98bba359921ce5b5 Mon Sep 17 00:00:00 2001 From: alexandre Date: Thu, 1 Dec 2022 15:16:41 +0100 Subject: [PATCH 002/579] wornking on invoiceAllocation --- src/i18n/en/index.js | 1 + src/i18n/es/index.js | 1 + src/pages/Route/DeliveryManCreate.vue | 114 +++++++++++++++++++---- src/pages/Route/DeliveryManList.vue | 13 ++- src/pages/Route/InvoiceAllocation.vue | 126 ++++++++++++++++++++++++++ src/router/modules/route.js | 9 ++ 6 files changed, 244 insertions(+), 20 deletions(-) create mode 100644 src/pages/Route/InvoiceAllocation.vue diff --git a/src/i18n/en/index.js b/src/i18n/en/index.js index f567edcab..66c8b5ca5 100644 --- a/src/i18n/en/index.js +++ b/src/i18n/en/index.js @@ -257,6 +257,7 @@ export default { deliveryManList: 'Delivery Men', basicData: 'Basic Data', deliveryManCreate: 'Create Delivery Man', + invoiceAllocation: 'Invoice Allocation', }, deliveryMan: { list: { diff --git a/src/i18n/es/index.js b/src/i18n/es/index.js index 567fe71e4..bbc335a6e 100644 --- a/src/i18n/es/index.js +++ b/src/i18n/es/index.js @@ -256,6 +256,7 @@ export default { deliveryManList: 'Repartidores', basicData: 'Datos básicos', deliveryManCreate: 'Crear Repartidor', + invoiceAllocation: 'Imputación Facturas', }, deliveryMan: { list: { diff --git a/src/pages/Route/DeliveryManCreate.vue b/src/pages/Route/DeliveryManCreate.vue index 8cb66d510..fbe0be4d0 100644 --- a/src/pages/Route/DeliveryManCreate.vue +++ b/src/pages/Route/DeliveryManCreate.vue @@ -1,44 +1,126 @@ diff --git a/src/pages/Route/DeliveryManList.vue b/src/pages/Route/DeliveryManList.vue index 2103e6129..058be1e80 100644 --- a/src/pages/Route/DeliveryManList.vue +++ b/src/pages/Route/DeliveryManList.vue @@ -22,9 +22,13 @@ const filter = { ], }; -function navigate(id) { +function navigateCard(id) { router.push({ path: `/route/${id}` }); } + +function navigateCreate() { + router.push({ path: `/route/deliveryMan/create` }); +} From e0379dd1bc5d2dc565e0052b1e15b7e006c76605 Mon Sep 17 00:00:00 2001 From: alexm Date: Sun, 28 Apr 2024 18:47:44 +0200 Subject: [PATCH 004/579] feat: refs #6825 fix modes --- src/components/common/VnTable.vue | 131 +++++++++++++++++++++--------- 1 file changed, 94 insertions(+), 37 deletions(-) diff --git a/src/components/common/VnTable.vue b/src/components/common/VnTable.vue index a537c5215..2f60fb634 100644 --- a/src/components/common/VnTable.vue +++ b/src/components/common/VnTable.vue @@ -1,14 +1,14 @@ diff --git a/src/pages/Customer/ExtendedList/CustomerExtendedList.vue b/src/pages/Customer/ExtendedList/CustomerExtendedList.vue index 789e90834..444726ad2 100644 --- a/src/pages/Customer/ExtendedList/CustomerExtendedList.vue +++ b/src/pages/Customer/ExtendedList/CustomerExtendedList.vue @@ -1,19 +1,15 @@ diff --git a/src/components/common/VnTableFilterMore.vue b/src/components/common/VnTableFilterMore.vue new file mode 100644 index 000000000..fd4880431 --- /dev/null +++ b/src/components/common/VnTableFilterMore.vue @@ -0,0 +1,13 @@ + + diff --git a/src/components/common/VnTableObj.json b/src/components/common/VnTableObj.json new file mode 100644 index 000000000..ceaedd647 --- /dev/null +++ b/src/components/common/VnTableObj.json @@ -0,0 +1,33 @@ +// { +// isId: Boolean +// align: 'left', +// field: 'hasFile', +// label: t('globals.original'), +// name: 'hasFile', +// component: QCheckbox ?? span, +// cardVisible: Boolean +// isId: 1/2 +// color: function +// props: (prop) => ({ +// disable: true, +// 'model-value': Boolean(prop.value), +// }), +// tableActions: { +// field: 'tableActions', +// name: 'tableActions', +// actions: [ +// { +// title: t('Client ticket list'), +// icon: 'vn:ticket', +// action: redirectToCreateView, +// isPrimary: true, +// }, +// { +// title: t('Client ticket list'), +// icon: 'preview', +// action: (row) => viewSummary(row.id, CustomerSummary), +// }, +// ], +// }, +// }, +// tableActions y hacer bucle diff --git a/src/components/ui/VnFilterPanel.vue b/src/components/ui/VnFilterPanel.vue index eb0bbbe66..380bafb03 100644 --- a/src/components/ui/VnFilterPanel.vue +++ b/src/components/ui/VnFilterPanel.vue @@ -62,6 +62,8 @@ onMounted(() => { if (Object.keys(store.userParams).length > 0) { userParams.value = JSON.parse(JSON.stringify(store.userParams)); } + + console.log('userParams.value: ', userParams.value); emit('init', { params: userParams.value }); }); @@ -165,7 +167,7 @@ function formatValue(value) { - + [ field: 'customerStatus', label: 'customerStatus', name: 'customerStatus', + columnFilter: false, }, { align: 'left', @@ -272,6 +273,9 @@ const columns = computed(() => [ label: t('customer.extendedList.tableVisibleColumns.id'), name: 'id', isId: 1, + columnFilter: { + field: 'search', + }, }, { align: 'left', @@ -279,6 +283,11 @@ const columns = computed(() => [ label: t('customer.extendedList.tableVisibleColumns.name'), name: 'name', isId: 2, + columnFilter: { + inWhere: { + prefix: 'c', + }, + }, }, { align: 'left', From 4b4c02c01a3fd0af89f16c1ff71d5a49ab1ba0c3 Mon Sep 17 00:00:00 2001 From: jorgep Date: Fri, 3 May 2024 16:40:11 +0200 Subject: [PATCH 010/579] feat: refs #6273 create worker form toggle --- src/pages/Worker/WorkerCreate.vue | 310 ++++++++++++++---------------- src/pages/Worker/locale/es.yml | 1 + 2 files changed, 149 insertions(+), 162 deletions(-) diff --git a/src/pages/Worker/WorkerCreate.vue b/src/pages/Worker/WorkerCreate.vue index 6c2c9f36e..24b6153c4 100644 --- a/src/pages/Worker/WorkerCreate.vue +++ b/src/pages/Worker/WorkerCreate.vue @@ -1,27 +1,20 @@ -