diff --git a/src/pages/Customer/Defaulter/CustomerDefaulter.vue b/src/pages/Customer/Defaulter/CustomerDefaulter.vue
index eca2ad596..dc4ac9162 100644
--- a/src/pages/Customer/Defaulter/CustomerDefaulter.vue
+++ b/src/pages/Customer/Defaulter/CustomerDefaulter.vue
@@ -9,7 +9,7 @@ import WorkerDescriptorProxy from 'src/pages/Worker/Card/WorkerDescriptorProxy.v
import VnSubToolbar from 'src/components/ui/VnSubToolbar.vue';
import VnInput from 'src/components/common/VnInput.vue';
import CustomerDefaulterAddObservation from './CustomerDefaulterAddObservation.vue';
-import DepartmentDescriptorProxy from 'src/pages/Department/Card/DepartmentDescriptorProxy.vue';
+import DepartmentDescriptorProxy from 'src/pages/Worker/Department/Card/DepartmentDescriptorProxy.vue';
import VnTable from 'src/components/VnTable/VnTable.vue';
import { useArrayData } from 'src/composables/useArrayData';
diff --git a/src/pages/Parking/Card/ParkingBasicData.vue b/src/pages/Shelving/Parking/Card/ParkingBasicData.vue
similarity index 100%
rename from src/pages/Parking/Card/ParkingBasicData.vue
rename to src/pages/Shelving/Parking/Card/ParkingBasicData.vue
diff --git a/src/pages/Parking/Card/ParkingCard.vue b/src/pages/Shelving/Parking/Card/ParkingCard.vue
similarity index 100%
rename from src/pages/Parking/Card/ParkingCard.vue
rename to src/pages/Shelving/Parking/Card/ParkingCard.vue
diff --git a/src/pages/Parking/Card/ParkingDescriptor.vue b/src/pages/Shelving/Parking/Card/ParkingDescriptor.vue
similarity index 100%
rename from src/pages/Parking/Card/ParkingDescriptor.vue
rename to src/pages/Shelving/Parking/Card/ParkingDescriptor.vue
diff --git a/src/pages/Parking/Card/ParkingFilter.js b/src/pages/Shelving/Parking/Card/ParkingFilter.js
similarity index 100%
rename from src/pages/Parking/Card/ParkingFilter.js
rename to src/pages/Shelving/Parking/Card/ParkingFilter.js
diff --git a/src/pages/Parking/Card/ParkingLog.vue b/src/pages/Shelving/Parking/Card/ParkingLog.vue
similarity index 100%
rename from src/pages/Parking/Card/ParkingLog.vue
rename to src/pages/Shelving/Parking/Card/ParkingLog.vue
diff --git a/src/pages/Parking/Card/ParkingSummary.vue b/src/pages/Shelving/Parking/Card/ParkingSummary.vue
similarity index 100%
rename from src/pages/Parking/Card/ParkingSummary.vue
rename to src/pages/Shelving/Parking/Card/ParkingSummary.vue
diff --git a/src/pages/Parking/ParkingExprBuilder.js b/src/pages/Shelving/Parking/ParkingExprBuilder.js
similarity index 100%
rename from src/pages/Parking/ParkingExprBuilder.js
rename to src/pages/Shelving/Parking/ParkingExprBuilder.js
diff --git a/src/pages/Parking/ParkingFilter.vue b/src/pages/Shelving/Parking/ParkingFilter.vue
similarity index 100%
rename from src/pages/Parking/ParkingFilter.vue
rename to src/pages/Shelving/Parking/ParkingFilter.vue
diff --git a/src/pages/Parking/ParkingList.vue b/src/pages/Shelving/Parking/ParkingList.vue
similarity index 100%
rename from src/pages/Parking/ParkingList.vue
rename to src/pages/Shelving/Parking/ParkingList.vue
diff --git a/src/pages/Parking/locale/en.yml b/src/pages/Shelving/Parking/locale/en.yml
similarity index 100%
rename from src/pages/Parking/locale/en.yml
rename to src/pages/Shelving/Parking/locale/en.yml
diff --git a/src/pages/Parking/locale/es.yml b/src/pages/Shelving/Parking/locale/es.yml
similarity index 100%
rename from src/pages/Parking/locale/es.yml
rename to src/pages/Shelving/Parking/locale/es.yml
diff --git a/src/pages/Worker/Card/WorkerDescriptor.vue b/src/pages/Worker/Card/WorkerDescriptor.vue
index 4a71ae898..0828c2ba6 100644
--- a/src/pages/Worker/Card/WorkerDescriptor.vue
+++ b/src/pages/Worker/Card/WorkerDescriptor.vue
@@ -10,7 +10,7 @@ import axios from 'axios';
import VnImg from 'src/components/ui/VnImg.vue';
import EditPictureForm from 'components/EditPictureForm.vue';
import WorkerDescriptorMenu from './WorkerDescriptorMenu.vue';
-import DepartmentDescriptorProxy from 'src/pages/Department/Card/DepartmentDescriptorProxy.vue';
+import DepartmentDescriptorProxy from 'src/pages/Worker/Department/Card/DepartmentDescriptorProxy.vue';
const $props = defineProps({
id: {
diff --git a/src/pages/Worker/Card/WorkerSummary.vue b/src/pages/Worker/Card/WorkerSummary.vue
index 992f6ec71..78c5dfd82 100644
--- a/src/pages/Worker/Card/WorkerSummary.vue
+++ b/src/pages/Worker/Card/WorkerSummary.vue
@@ -9,7 +9,7 @@ import CardSummary from 'components/ui/CardSummary.vue';
import VnUserLink from 'src/components/ui/VnUserLink.vue';
import VnTitle from 'src/components/common/VnTitle.vue';
import RoleDescriptorProxy from 'src/pages/Account/Role/Card/RoleDescriptorProxy.vue';
-import DepartmentDescriptorProxy from 'src/pages/Department/Card/DepartmentDescriptorProxy.vue';
+import DepartmentDescriptorProxy from 'src/pages/Worker/Department/Card/DepartmentDescriptorProxy.vue';
import { useAdvancedSummary } from 'src/composables/useAdvancedSummary';
import WorkerDescriptorMenu from './WorkerDescriptorMenu.vue';
diff --git a/src/pages/Department/Card/DepartmentBasicData.vue b/src/pages/Worker/Department/Card/DepartmentBasicData.vue
similarity index 100%
rename from src/pages/Department/Card/DepartmentBasicData.vue
rename to src/pages/Worker/Department/Card/DepartmentBasicData.vue
diff --git a/src/pages/Department/Card/DepartmentCard.vue b/src/pages/Worker/Department/Card/DepartmentCard.vue
similarity index 77%
rename from src/pages/Department/Card/DepartmentCard.vue
rename to src/pages/Worker/Department/Card/DepartmentCard.vue
index 64ea24d42..2e3f11521 100644
--- a/src/pages/Department/Card/DepartmentCard.vue
+++ b/src/pages/Worker/Department/Card/DepartmentCard.vue
@@ -1,6 +1,6 @@
import('src/pages/Parking/Card/ParkingCard.vue'),
+ component: () => import('src/pages/Shelving/Parking/Card/ParkingCard.vue'),
redirect: { name: 'ParkingSummary' },
meta: {
menu: ['ParkingBasicData', 'ParkingLog'],
@@ -16,7 +16,7 @@ const parkingCard = {
title: 'summary',
icon: 'launch',
},
- component: () => import('src/pages/Parking/Card/ParkingSummary.vue'),
+ component: () => import('src/pages/Shelving/Parking/Card/ParkingSummary.vue'),
},
{
path: 'basic-data',
@@ -25,7 +25,8 @@ const parkingCard = {
title: 'basicData',
icon: 'vn:settings',
},
- component: () => import('src/pages/Parking/Card/ParkingBasicData.vue'),
+ component: () =>
+ import('src/pages/Shelving/Parking/Card/ParkingBasicData.vue'),
},
{
path: 'log',
@@ -34,7 +35,7 @@ const parkingCard = {
title: 'log',
icon: 'history',
},
- component: () => import('src/pages/Parking/Card/ParkingLog.vue'),
+ component: () => import('src/pages/Shelving/Parking/Card/ParkingLog.vue'),
},
],
};
@@ -127,7 +128,7 @@ export default {
title: 'parkingList',
icon: 'view_list',
},
- component: () => import('src/pages/Parking/ParkingList.vue'),
+ component: () => import('src/pages/Shelving/Parking/ParkingList.vue'),
children: [
{
path: 'list',
diff --git a/src/router/modules/worker.js b/src/router/modules/worker.js
index faaa23fc8..3eb95a96e 100644
--- a/src/router/modules/worker.js
+++ b/src/router/modules/worker.js
@@ -201,7 +201,7 @@ const workerCard = {
const departmentCard = {
name: 'DepartmentCard',
path: ':id',
- component: () => import('src/pages/Department/Card/DepartmentCard.vue'),
+ component: () => import('src/pages/Worker/Department/Card/DepartmentCard.vue'),
redirect: { name: 'DepartmentSummary' },
meta: {
moduleName: 'Department',
@@ -215,7 +215,8 @@ const departmentCard = {
title: 'summary',
icon: 'launch',
},
- component: () => import('src/pages/Department/Card/DepartmentSummary.vue'),
+ component: () =>
+ import('src/pages/Worker/Department/Card/DepartmentSummary.vue'),
},
{
path: 'basic-data',
@@ -224,7 +225,8 @@ const departmentCard = {
title: 'basicData',
icon: 'vn:settings',
},
- component: () => import('src/pages/Department/Card/DepartmentBasicData.vue'),
+ component: () =>
+ import('src/pages/Worker/Department/Card/DepartmentBasicData.vue'),
},
],
};