From a35ccb5b5180e731e5e92ef5bc9fa2b8af3cab8a Mon Sep 17 00:00:00 2001 From: wbuezas Date: Thu, 16 May 2024 16:38:27 -0300 Subject: [PATCH] Zone Locations --- .../Worker}/CreateDepartmentChild.vue | 0 src/pages/Worker/WorkerDepartment.vue | 4 +- .../Worker/WorkerDepartmentTree.vue} | 2 +- src/pages/Zone/Card/ZoneLocations.vue | 10 +- src/pages/Zone/Card/ZoneLocationsTree.vue | 169 ++++++++++++++++++ src/pages/Zone/locale/en.yml | 3 + src/pages/Zone/locale/es.yml | 3 + src/router/modules/zone.js | 2 +- 8 files changed, 188 insertions(+), 5 deletions(-) rename src/{components => pages/Worker}/CreateDepartmentChild.vue (100%) rename src/{components/ui/VnTree.vue => pages/Worker/WorkerDepartmentTree.vue} (99%) create mode 100644 src/pages/Zone/Card/ZoneLocationsTree.vue diff --git a/src/components/CreateDepartmentChild.vue b/src/pages/Worker/CreateDepartmentChild.vue similarity index 100% rename from src/components/CreateDepartmentChild.vue rename to src/pages/Worker/CreateDepartmentChild.vue diff --git a/src/pages/Worker/WorkerDepartment.vue b/src/pages/Worker/WorkerDepartment.vue index 3c0e5fdd0..fe4c23051 100644 --- a/src/pages/Worker/WorkerDepartment.vue +++ b/src/pages/Worker/WorkerDepartment.vue @@ -1,10 +1,10 @@ diff --git a/src/components/ui/VnTree.vue b/src/pages/Worker/WorkerDepartmentTree.vue similarity index 99% rename from src/components/ui/VnTree.vue rename to src/pages/Worker/WorkerDepartmentTree.vue index 13aa05635..09220be7e 100644 --- a/src/components/ui/VnTree.vue +++ b/src/pages/Worker/WorkerDepartmentTree.vue @@ -4,7 +4,7 @@ import { useI18n } from 'vue-i18n'; import { useState } from 'src/composables/useState'; import { useQuasar } from 'quasar'; import DepartmentDescriptorProxy from 'src/pages/Department/Card/DepartmentDescriptorProxy.vue'; -import CreateDepartmentChild from '../CreateDepartmentChild.vue'; +import CreateDepartmentChild from './CreateDepartmentChild.vue'; import axios from 'axios'; import useNotify from 'src/composables/useNotify.js'; import { useRouter } from 'vue-router'; diff --git a/src/pages/Zone/Card/ZoneLocations.vue b/src/pages/Zone/Card/ZoneLocations.vue index e4305c898..e04442080 100644 --- a/src/pages/Zone/Card/ZoneLocations.vue +++ b/src/pages/Zone/Card/ZoneLocations.vue @@ -1 +1,9 @@ - + + + diff --git a/src/pages/Zone/Card/ZoneLocationsTree.vue b/src/pages/Zone/Card/ZoneLocationsTree.vue new file mode 100644 index 000000000..0940e071d --- /dev/null +++ b/src/pages/Zone/Card/ZoneLocationsTree.vue @@ -0,0 +1,169 @@ + + + + + diff --git a/src/pages/Zone/locale/en.yml b/src/pages/Zone/locale/en.yml index 746d3f2e7..39f065496 100644 --- a/src/pages/Zone/locale/en.yml +++ b/src/pages/Zone/locale/en.yml @@ -5,6 +5,7 @@ zone: zoneCreate: Create zone deliveryList: Delivery days upcomingList: Upcoming deliveries + locations: Locations list: clone: Clone id: Id @@ -40,3 +41,5 @@ summary: filterPanel: name: Name agencyModeFk: Agency +zoneLocations: + locations: Locations diff --git a/src/pages/Zone/locale/es.yml b/src/pages/Zone/locale/es.yml index d9266b150..aa7b7d2b4 100644 --- a/src/pages/Zone/locale/es.yml +++ b/src/pages/Zone/locale/es.yml @@ -5,6 +5,7 @@ zone: zoneCreate: Nueva zona deliveryList: Días de entrega upcomingList: Próximos repartos + locations: Localizaciones list: clone: Clonar id: Id @@ -40,3 +41,5 @@ summary: filterPanel: name: Nombre agencyModeFk: Agencia +zoneLocations: + locations: Localizaciones diff --git a/src/router/modules/zone.js b/src/router/modules/zone.js index 9c917c301..0628c00aa 100644 --- a/src/router/modules/zone.js +++ b/src/router/modules/zone.js @@ -79,7 +79,7 @@ export default { path: 'location', meta: { title: 'locations', - icon: 'vn:greuge', + icon: 'my_location', }, component: () => import('src/pages/Zone/Card/ZoneLocations.vue'), },