From 1af5b270a0d1669297509223d17836e3b9941f9f Mon Sep 17 00:00:00 2001 From: jorgep Date: Wed, 21 Feb 2024 10:26:20 +0100 Subject: [PATCH 01/14] fear: refs #5186 WIP parking section --- src/i18n/en/index.js | 27 +++++ src/i18n/es/index.js | 25 +++++ .../Parking/Card/ParkingBasicData.vue | 59 +++++++++++ .../Shelving/Parking/Card/ParkingCard.vue | 56 ++++++++++ .../Parking/Card/ParkingDescriptor.vue | 52 +++++++++ .../Shelving/Parking/Card/ParkingLog.vue | 6 ++ .../Shelving/Parking/Card/ParkingSummary.vue | 50 +++++++++ src/pages/Shelving/Parking/ParkingFilter.vue | 77 ++++++++++++++ src/pages/Shelving/Parking/ParkingList.vue | 100 ++++++++++++++++++ src/pages/Shelving/Parking/ParkingMain.vue | 17 +++ src/router/modules/index.js | 2 + src/router/modules/parking.js | 63 +++++++++++ src/router/modules/shelving.js | 23 ++-- src/router/routes.js | 2 + 14 files changed, 551 insertions(+), 8 deletions(-) create mode 100644 src/pages/Shelving/Parking/Card/ParkingBasicData.vue create mode 100644 src/pages/Shelving/Parking/Card/ParkingCard.vue create mode 100644 src/pages/Shelving/Parking/Card/ParkingDescriptor.vue create mode 100644 src/pages/Shelving/Parking/Card/ParkingLog.vue create mode 100644 src/pages/Shelving/Parking/Card/ParkingSummary.vue create mode 100644 src/pages/Shelving/Parking/ParkingFilter.vue create mode 100644 src/pages/Shelving/Parking/ParkingList.vue create mode 100644 src/pages/Shelving/Parking/ParkingMain.vue create mode 100644 src/router/modules/parking.js diff --git a/src/i18n/en/index.js b/src/i18n/en/index.js index 9e0ad7c9b..f79c3c157 100644 --- a/src/i18n/en/index.js +++ b/src/i18n/en/index.js @@ -656,6 +656,7 @@ export default { summary: 'Summary', basicData: 'Basic Data', log: 'Logs', + parkingList: 'Parking list', }, list: { parking: 'Parking', @@ -676,6 +677,32 @@ export default { recyclable: 'Recyclable', }, }, + parking: { + pageTitles: { + parking: 'Parking', + parkingList: 'Parkings list', + summary: 'Summary', + basicData: 'Basic data', + log: 'Logs', + }, + list: { + pickingOrder: 'Picking order', + }, + searchBar: { + info: 'You can search by parking code', + label: 'Search parking...', + }, + summary: { + code: 'Code', + pickingOrder: 'Picking order', + sector: 'Sector', + }, + basicData: { + code: 'Code', + pickingOrder: 'Picking order', + sector: 'Sector', + }, + }, invoiceIn: { pageTitles: { invoiceIns: 'Invoices In', diff --git a/src/i18n/es/index.js b/src/i18n/es/index.js index 6083dfad7..fd9aafef6 100644 --- a/src/i18n/es/index.js +++ b/src/i18n/es/index.js @@ -715,6 +715,7 @@ export default { summary: 'Resumen', basicData: 'Datos básicos', log: 'Registros de auditoría', + parkingList: 'Listado de parkings', }, list: { parking: 'Parking', @@ -735,6 +736,30 @@ export default { recyclable: 'Reciclable', }, }, + parking: { + pageTitles: { + parking: 'Parking', + parkingList: 'Listado de parkings', + summary: 'Resumen', + basicData: 'Datos básicos', + log: 'Registros de auditoría', + }, + list: { + pickingOrder: 'Orden de recogida', + }, + searchBar: { + info: 'Puedes buscar por código de parking', + label: 'Buscar parking...', + }, + summary: { + code: 'Código', + pickingOrder: 'Orden de recogida', + }, + basicData: { + code: 'Código', + pickingOrder: 'Orden de recogida', + }, + }, invoiceIn: { pageTitles: { invoiceIns: 'Fact. recibidas', diff --git a/src/pages/Shelving/Parking/Card/ParkingBasicData.vue b/src/pages/Shelving/Parking/Card/ParkingBasicData.vue new file mode 100644 index 000000000..e5b886eff --- /dev/null +++ b/src/pages/Shelving/Parking/Card/ParkingBasicData.vue @@ -0,0 +1,59 @@ + + diff --git a/src/pages/Shelving/Parking/Card/ParkingCard.vue b/src/pages/Shelving/Parking/Card/ParkingCard.vue new file mode 100644 index 000000000..1dfc51173 --- /dev/null +++ b/src/pages/Shelving/Parking/Card/ParkingCard.vue @@ -0,0 +1,56 @@ + + diff --git a/src/pages/Shelving/Parking/Card/ParkingDescriptor.vue b/src/pages/Shelving/Parking/Card/ParkingDescriptor.vue new file mode 100644 index 000000000..1805b5af0 --- /dev/null +++ b/src/pages/Shelving/Parking/Card/ParkingDescriptor.vue @@ -0,0 +1,52 @@ + + + diff --git a/src/pages/Shelving/Parking/Card/ParkingLog.vue b/src/pages/Shelving/Parking/Card/ParkingLog.vue new file mode 100644 index 000000000..f25abd2e4 --- /dev/null +++ b/src/pages/Shelving/Parking/Card/ParkingLog.vue @@ -0,0 +1,6 @@ + + diff --git a/src/pages/Shelving/Parking/Card/ParkingSummary.vue b/src/pages/Shelving/Parking/Card/ParkingSummary.vue new file mode 100644 index 000000000..e94fa8d9e --- /dev/null +++ b/src/pages/Shelving/Parking/Card/ParkingSummary.vue @@ -0,0 +1,50 @@ + + + diff --git a/src/pages/Shelving/Parking/ParkingFilter.vue b/src/pages/Shelving/Parking/ParkingFilter.vue new file mode 100644 index 000000000..2e559a879 --- /dev/null +++ b/src/pages/Shelving/Parking/ParkingFilter.vue @@ -0,0 +1,77 @@ + + + + + +en: + params: + code: Code + sectorFk: Sector + search: General Search +es: + params: + code: Código + search: Búsqueda general + + diff --git a/src/pages/Shelving/Parking/ParkingList.vue b/src/pages/Shelving/Parking/ParkingList.vue new file mode 100644 index 000000000..4fff9b3cb --- /dev/null +++ b/src/pages/Shelving/Parking/ParkingList.vue @@ -0,0 +1,100 @@ + + + diff --git a/src/pages/Shelving/Parking/ParkingMain.vue b/src/pages/Shelving/Parking/ParkingMain.vue new file mode 100644 index 000000000..66ce78f23 --- /dev/null +++ b/src/pages/Shelving/Parking/ParkingMain.vue @@ -0,0 +1,17 @@ + + + diff --git a/src/router/modules/index.js b/src/router/modules/index.js index 84a26798d..770941b23 100644 --- a/src/router/modules/index.js +++ b/src/router/modules/index.js @@ -13,6 +13,7 @@ import Travel from './travel'; import Order from './order'; import Department from './department'; import Entry from './entry'; +import Parking from './parking'; export default [ Item, @@ -30,4 +31,5 @@ export default [ invoiceIn, Department, Entry, + Parking, ]; diff --git a/src/router/modules/parking.js b/src/router/modules/parking.js new file mode 100644 index 000000000..b6868cc22 --- /dev/null +++ b/src/router/modules/parking.js @@ -0,0 +1,63 @@ +import { RouterView } from 'vue-router'; + +export default { + path: '/parking', + name: 'Parking', + meta: { + title: 'parking', + icon: 'garage_home', + }, + component: RouterView, + redirect: { name: 'ParkingMain' }, + menus: { + main: ['ParkingList'], + card: ['ParkingBasicData', 'ParkingLog'], + }, + children: [ + { + path: '', + name: 'ParkingMain', + component: () => import('src/pages/Shelving/Parking/ParkingMain.vue'), + redirect: { name: 'ParkingList' }, + children: [ + { + path: 'list', + name: 'ParkingList', + meta: { + title: 'parkingList', + icon: 'view_list', + }, + component: () => import('src/pages/Shelving/Parking/ParkingList.vue'), + }, + ], + }, + { + path: ':id', + name: 'ParkingCard', + component: () => import('src/pages/Shelving/Parking/Card/ParkingCard.vue'), + redirect: { name: 'ParkingSummary' }, + children: [ + { + name: 'ParkingSummary', + path: 'summary', + meta: { + title: 'summary', + icon: 'view_list', + }, + component: () => + import('src/pages/Shelving/Parking/Card/ParkingSummary.vue'), + }, + { + name: 'ShelvingBasicData', + path: 'basic-data', + meta: { + title: 'basicData', + icon: 'vn:settings', + roles: ['salesPerson'], + }, + component: () => import('pages/Shelving/Card/ShelvingForm.vue'), + }, + ], + }, + ], +}; diff --git a/src/router/modules/shelving.js b/src/router/modules/shelving.js index 494f286c3..92e479f27 100644 --- a/src/router/modules/shelving.js +++ b/src/router/modules/shelving.js @@ -1,17 +1,17 @@ -import {RouterView} from "vue-router"; +import { RouterView } from 'vue-router'; export default { path: '/shelving', name: 'Shelving', meta: { title: 'shelving', - icon: 'vn:inventory' + icon: 'vn:inventory', }, component: RouterView, redirect: { name: 'ShelvingMain' }, menus: { - main: ['ShelvingList'], - card: ['ShelvingBasicData', 'ShelvingLog'] + main: ['ShelvingList', 'ParkingList'], + card: ['ShelvingBasicData', 'ShelvingLog'], }, children: [ { @@ -51,8 +51,7 @@ export default { meta: { title: 'summary', }, - component: () => - import('pages/Shelving/Card/ShelvingSummary.vue'), + component: () => import('pages/Shelving/Card/ShelvingSummary.vue'), }, { name: 'ShelvingBasicData', @@ -75,6 +74,14 @@ export default { }, ], }, - ] + { + path: 'parking', + name: 'ParkingList', + meta: { + title: 'parkingList', + icon: 'view_list', + }, + component: () => import('src/pages/Shelving/Parking/ParkingMain.vue'), + }, + ], }; - diff --git a/src/router/routes.js b/src/router/routes.js index d1027955f..a8ca03377 100644 --- a/src/router/routes.js +++ b/src/router/routes.js @@ -13,6 +13,7 @@ import department from './modules/department'; import shelving from 'src/router/modules/shelving'; import order from 'src/router/modules/order'; import entry from 'src/router/modules/entry'; +import parking from 'src/router/modules/parking'; const routes = [ { @@ -67,6 +68,7 @@ const routes = [ travel, department, entry, + parking, { path: '/:catchAll(.*)*', name: 'NotFound', From ddb6bdeb47e1fdf69dc89e27310a391f757249e4 Mon Sep 17 00:00:00 2001 From: jorgep Date: Wed, 21 Feb 2024 11:31:25 +0100 Subject: [PATCH 02/14] fix: refs #5186 parking routes --- src/router/modules/parking.js | 16 +++++++++++++--- 1 file changed, 13 insertions(+), 3 deletions(-) diff --git a/src/router/modules/parking.js b/src/router/modules/parking.js index b6868cc22..565a9eec6 100644 --- a/src/router/modules/parking.js +++ b/src/router/modules/parking.js @@ -48,14 +48,24 @@ export default { import('src/pages/Shelving/Parking/Card/ParkingSummary.vue'), }, { - name: 'ShelvingBasicData', + name: 'ParkingBasicData', path: 'basic-data', meta: { title: 'basicData', icon: 'vn:settings', - roles: ['salesPerson'], }, - component: () => import('pages/Shelving/Card/ShelvingForm.vue'), + component: () => + import('pages/Shelving/Parking/Card/ParkingBasicData.vue'), + }, + { + name: 'ParkingLog', + path: 'log', + meta: { + title: 'log', + icon: 'history', + }, + component: () => + import('src/pages/Shelving/Parking/Card/ParkingLog.vue'), }, ], }, From 46bcba99bcb6e085b8696a4ac6b8f7d715979fd1 Mon Sep 17 00:00:00 2001 From: jorgep Date: Fri, 1 Mar 2024 09:59:32 +0100 Subject: [PATCH 03/14] fix: refs #5186 margin top --- src/components/common/VnLog.vue | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/components/common/VnLog.vue b/src/components/common/VnLog.vue index 6368a3e52..4ecefb92d 100644 --- a/src/components/common/VnLog.vue +++ b/src/components/common/VnLog.vue @@ -403,7 +403,7 @@ setLogTree(); auto-load />
From ebbe38a14e02d5d089cdb2e064a41d6e406f2018 Mon Sep 17 00:00:00 2001 From: jorgep Date: Fri, 1 Mar 2024 11:05:34 +0100 Subject: [PATCH 04/14] fix: refs #5186 parking routes --- .../Parking/Card/ParkingBasicData.vue | 36 ++++++++----------- .../Parking/Card/ParkingCard.vue | 2 +- .../Parking/Card/ParkingDescriptor.vue | 0 .../Parking/Card/ParkingLog.vue | 0 .../Parking/Card/ParkingSummary.vue | 0 .../{Shelving => }/Parking/ParkingFilter.vue | 0 .../{Shelving => }/Parking/ParkingList.vue | 0 src/pages/Shelving/Parking/ParkingMain.vue | 17 --------- src/router/modules/parking.js | 34 ++++-------------- src/router/modules/shelving.js | 18 +++++----- 10 files changed, 32 insertions(+), 75 deletions(-) rename src/pages/{Shelving => }/Parking/Card/ParkingBasicData.vue (57%) rename src/pages/{Shelving => }/Parking/Card/ParkingCard.vue (95%) rename src/pages/{Shelving => }/Parking/Card/ParkingDescriptor.vue (100%) rename src/pages/{Shelving => }/Parking/Card/ParkingLog.vue (100%) rename src/pages/{Shelving => }/Parking/Card/ParkingSummary.vue (100%) rename src/pages/{Shelving => }/Parking/ParkingFilter.vue (100%) rename src/pages/{Shelving => }/Parking/ParkingList.vue (100%) delete mode 100644 src/pages/Shelving/Parking/ParkingMain.vue diff --git a/src/pages/Shelving/Parking/Card/ParkingBasicData.vue b/src/pages/Parking/Card/ParkingBasicData.vue similarity index 57% rename from src/pages/Shelving/Parking/Card/ParkingBasicData.vue rename to src/pages/Parking/Card/ParkingBasicData.vue index e5b886eff..5f3e824e1 100644 --- a/src/pages/Shelving/Parking/Card/ParkingBasicData.vue +++ b/src/pages/Parking/Card/ParkingBasicData.vue @@ -30,29 +30,23 @@ const filter = { diff --git a/src/pages/Shelving/Parking/Card/ParkingCard.vue b/src/pages/Parking/Card/ParkingCard.vue similarity index 95% rename from src/pages/Shelving/Parking/Card/ParkingCard.vue rename to src/pages/Parking/Card/ParkingCard.vue index 1dfc51173..74d021fff 100644 --- a/src/pages/Shelving/Parking/Card/ParkingCard.vue +++ b/src/pages/Parking/Card/ParkingCard.vue @@ -6,7 +6,7 @@ import { useStateStore } from 'stores/useStateStore'; import { useArrayData } from 'src/composables/useArrayData'; import LeftMenu from 'components/LeftMenu.vue'; import VnSearchbar from 'src/components/ui/VnSearchbar.vue'; -import ParkingDescriptor from 'pages/Shelving/Parking/Card/ParkingDescriptor.vue'; +import ParkingDescriptor from 'pages/Parking/Card/ParkingDescriptor.vue'; const stateStore = useStateStore(); const { t } = useI18n(); diff --git a/src/pages/Shelving/Parking/Card/ParkingDescriptor.vue b/src/pages/Parking/Card/ParkingDescriptor.vue similarity index 100% rename from src/pages/Shelving/Parking/Card/ParkingDescriptor.vue rename to src/pages/Parking/Card/ParkingDescriptor.vue diff --git a/src/pages/Shelving/Parking/Card/ParkingLog.vue b/src/pages/Parking/Card/ParkingLog.vue similarity index 100% rename from src/pages/Shelving/Parking/Card/ParkingLog.vue rename to src/pages/Parking/Card/ParkingLog.vue diff --git a/src/pages/Shelving/Parking/Card/ParkingSummary.vue b/src/pages/Parking/Card/ParkingSummary.vue similarity index 100% rename from src/pages/Shelving/Parking/Card/ParkingSummary.vue rename to src/pages/Parking/Card/ParkingSummary.vue diff --git a/src/pages/Shelving/Parking/ParkingFilter.vue b/src/pages/Parking/ParkingFilter.vue similarity index 100% rename from src/pages/Shelving/Parking/ParkingFilter.vue rename to src/pages/Parking/ParkingFilter.vue diff --git a/src/pages/Shelving/Parking/ParkingList.vue b/src/pages/Parking/ParkingList.vue similarity index 100% rename from src/pages/Shelving/Parking/ParkingList.vue rename to src/pages/Parking/ParkingList.vue diff --git a/src/pages/Shelving/Parking/ParkingMain.vue b/src/pages/Shelving/Parking/ParkingMain.vue deleted file mode 100644 index 66ce78f23..000000000 --- a/src/pages/Shelving/Parking/ParkingMain.vue +++ /dev/null @@ -1,17 +0,0 @@ - - - diff --git a/src/router/modules/parking.js b/src/router/modules/parking.js index 565a9eec6..993400f75 100644 --- a/src/router/modules/parking.js +++ b/src/router/modules/parking.js @@ -8,33 +8,16 @@ export default { icon: 'garage_home', }, component: RouterView, - redirect: { name: 'ParkingMain' }, + redirect: { name: 'ParkingCard' }, menus: { - main: ['ParkingList'], + main: [], card: ['ParkingBasicData', 'ParkingLog'], }, children: [ { - path: '', - name: 'ParkingMain', - component: () => import('src/pages/Shelving/Parking/ParkingMain.vue'), - redirect: { name: 'ParkingList' }, - children: [ - { - path: 'list', - name: 'ParkingList', - meta: { - title: 'parkingList', - icon: 'view_list', - }, - component: () => import('src/pages/Shelving/Parking/ParkingList.vue'), - }, - ], - }, - { - path: ':id', + path: '/parking/:id', name: 'ParkingCard', - component: () => import('src/pages/Shelving/Parking/Card/ParkingCard.vue'), + component: () => import('src/pages/Parking/Card/ParkingCard.vue'), redirect: { name: 'ParkingSummary' }, children: [ { @@ -44,8 +27,7 @@ export default { title: 'summary', icon: 'view_list', }, - component: () => - import('src/pages/Shelving/Parking/Card/ParkingSummary.vue'), + component: () => import('src/pages/Parking/Card/ParkingSummary.vue'), }, { name: 'ParkingBasicData', @@ -54,8 +36,7 @@ export default { title: 'basicData', icon: 'vn:settings', }, - component: () => - import('pages/Shelving/Parking/Card/ParkingBasicData.vue'), + component: () => import('pages/Parking/Card/ParkingBasicData.vue'), }, { name: 'ParkingLog', @@ -64,8 +45,7 @@ export default { title: 'log', icon: 'history', }, - component: () => - import('src/pages/Shelving/Parking/Card/ParkingLog.vue'), + component: () => import('src/pages/Parking/Card/ParkingLog.vue'), }, ], }, diff --git a/src/router/modules/shelving.js b/src/router/modules/shelving.js index 92e479f27..af2605c93 100644 --- a/src/router/modules/shelving.js +++ b/src/router/modules/shelving.js @@ -37,6 +37,15 @@ export default { }, component: () => import('src/pages/Shelving/Card/ShelvingForm.vue'), }, + { + path: '/parking', + name: 'ParkingList', + meta: { + title: 'parkingList', + icon: 'view_list', + }, + component: () => import('src/pages/Parking/ParkingList.vue'), + }, ], }, { @@ -74,14 +83,5 @@ export default { }, ], }, - { - path: 'parking', - name: 'ParkingList', - meta: { - title: 'parkingList', - icon: 'view_list', - }, - component: () => import('src/pages/Shelving/Parking/ParkingMain.vue'), - }, ], }; From 67d97eef8f03fccdfab8e15163b0e1af7f3ef5e0 Mon Sep 17 00:00:00 2001 From: jorgep Date: Fri, 1 Mar 2024 11:19:40 +0100 Subject: [PATCH 05/14] fix: refs #5186 add searchbar --- src/pages/Parking/ParkingList.vue | 9 ++++++++- 1 file changed, 8 insertions(+), 1 deletion(-) diff --git a/src/pages/Parking/ParkingList.vue b/src/pages/Parking/ParkingList.vue index 4fff9b3cb..0830ef175 100644 --- a/src/pages/Parking/ParkingList.vue +++ b/src/pages/Parking/ParkingList.vue @@ -5,6 +5,7 @@ import { useI18n } from 'vue-i18n'; import { useStateStore } from 'stores/useStateStore'; import { useSummaryDialog } from 'src/composables/useSummaryDialog'; import VnPaginate from 'components/ui/VnPaginate.vue'; +import VnSearchbar from 'src/components/ui/VnSearchbar.vue'; import CardList from 'components/ui/CardList.vue'; import VnLv from 'components/ui/VnLv.vue'; import ParkingFilter from './ParkingFilter.vue'; @@ -37,7 +38,13 @@ function exprBuilder(param, value) { diff --git a/src/pages/Parking/Card/ParkingSummary.vue b/src/pages/Parking/Card/ParkingSummary.vue index 3322ba9ba..f72fc7d2c 100644 --- a/src/pages/Parking/Card/ParkingSummary.vue +++ b/src/pages/Parking/Card/ParkingSummary.vue @@ -29,9 +29,12 @@ const filter = {