feat: refs #8316 parking inside shelving

src/pages/Parking/ParkingList.vue

@@ -53,19 +53,22 @@ function exprBuilder(param, value) {
         <template #body>
             <QPage class="column items-center q-pa-md">
                 <div class="vn-card-list">
-                    <VnPaginate
+                    <VnPaginate :data-key="dataKey">
-                        :data-key="dataKey"
-                    >
                         <template #body="{ rows }">
                             <CardList
                                 v-for="row of rows"
                                 :key="row.id"
                                 :id="row.id"
                                 :title="row.code"
-                                @click="push({ path: `/parking/${row.id}` })"
+                                @click="
+                                    push({ path: `/shelving/parking/${row.id}/summary` })
+                                "
                             >
                                 <template #list-items>
-                                    <VnLv label="Sector" :value="row.sector?.description" />
+                                    <VnLv
+                                        label="Sector"
+                                        :value="row.sector?.description"
+                                    />
                                     <VnLv
                                         :label="t('parking.pickingOrder')"
                                         :value="row.pickingOrder"
@@ -85,4 +88,4 @@ function exprBuilder(param, value) {
             </QPage>
         </template>
     </VnSection>
-</template>
+</template>

src/router/modules/index.js

@@ -13,7 +13,6 @@ import Travel from './travel';
 import Order from './order';
 import Entry from './entry';
 import roadmap from './roadmap';
-import Parking from './parking';
 import Agency from './agency';
 import ItemType from './itemType';
 import Zone from './zone';
@@ -36,7 +35,6 @@ export default [
     invoiceIn,
     Entry,
     roadmap,
-    Parking,
     Agency,
     ItemType,
     Zone,

src/router/modules/parking.js

@@ -1,65 +0,0 @@
-import { RouterView } from 'vue-router';
-
-const parkingCard = {
-    name: 'ParkingCard',
-    path: ':id',
-    component: () => import('src/pages/Parking/Card/ParkingCard.vue'),
-    redirect: { name: 'ParkingSummary' },
-    meta: {
-        menu: [
-            'ParkingBasicData', 
-            'ParkingLog'
-        ],
-    },
-    children: [
-        {
-            path: 'summary',
-            name: 'ParkingSummary',
-            meta: {
-                title: 'summary',
-                icon: 'launch',
-            },
-            component: () => import('src/pages/Parking/Card/ParkingSummary.vue'),
-        },
-        {
-            path: 'basic-data',
-            name: 'ParkingBasicData',
-            meta: {
-                title: 'basicData',
-                icon: 'vn:settings',
-            },
-            component: () => import('src/pages/Parking/Card/ParkingBasicData.vue'),
-        },
-        {
-            path: 'log',
-            name: 'ParkingLog',
-            meta: {
-                title: 'log',
-                icon: 'history',
-            },
-            component: () => import('src/pages/Parking/Card/ParkingLog.vue'),
-        },
-    ],
-};
-
-export default {
-    name: 'Parking',    
-    path: '/parking',
-    meta: {
-        title: 'parking',
-        icon: 'garage_home',
-        moduleName: 'Parking',
-        menu: [],
-    },
-    component: RouterView,
-    redirect: { name: 'ParkingMain' },
-    children: [
-        {
-            name: 'ParkingMain',
-            path: '',
-            component: () => import('src/components/common/VnModule.vue'),
-            redirect: { name: 'ParkingIndexMain' },
-            children: [ parkingCard ],
-        },       
-    ],
-};

src/router/modules/shelving.js

@@ -1,5 +1,44 @@
 import { RouterView } from 'vue-router';
 
+const parkingCard = {
+    name: 'ParkingCard',
+    path: ':id',
+    component: () => import('src/pages/Parking/Card/ParkingCard.vue'),
+    redirect: { name: 'ParkingSummary' },
+    meta: {
+        menu: ['ParkingBasicData', 'ParkingLog'],
+    },
+    children: [
+        {
+            path: 'summary',
+            name: 'ParkingSummary',
+            meta: {
+                title: 'summary',
+                icon: 'launch',
+            },
+            component: () => import('src/pages/Parking/Card/ParkingSummary.vue'),
+        },
+        {
+            path: 'basic-data',
+            name: 'ParkingBasicData',
+            meta: {
+                title: 'basicData',
+                icon: 'vn:settings',
+            },
+            component: () => import('src/pages/Parking/Card/ParkingBasicData.vue'),
+        },
+        {
+            path: 'log',
+            name: 'ParkingLog',
+            meta: {
+                title: 'log',
+                icon: 'history',
+            },
+            component: () => import('src/pages/Parking/Card/ParkingLog.vue'),
+        },
+    ],
+};
+
 export default {
     path: '/shelving',
     name: 'Shelving',
@@ -11,7 +50,7 @@ export default {
     component: RouterView,
     redirect: { name: 'ShelvingMain' },
     menus: {
-        main: ['ShelvingList', 'ParkingList'],
+        main: ['ShelvingList', 'ParkingMain'],
         card: ['ShelvingBasicData', 'ShelvingLog'],
     },
     children: [
@@ -40,18 +79,20 @@ export default {
                     component: () => import('src/pages/Shelving/Card/ShelvingForm.vue'),
                 },
                 {
-                    path: '/parking',
+                    path: 'parking',
+                    name: 'ParkingMain',
                     redirect: { name: 'ParkingList' },
+                    meta: {
+                        title: 'parkingList',
+                        icon: 'view_list',
+                    },
+                    component: () => import('src/pages/Parking/ParkingList.vue'),
                     children: [
                         {
                             path: 'list',
                             name: 'ParkingList',
-                            meta: {
-                                title: 'parkingList',
-                                icon: 'view_list',
-                            },
-                            component: () => import('src/pages/Parking/ParkingList.vue'),
                         },
+                        parkingCard,
                     ],
                 },
             ],

src/router/routes.js

@@ -14,7 +14,6 @@ import shelving from 'src/router/modules/shelving';
 import order from 'src/router/modules/order';
 import entry from 'src/router/modules/entry';
 import roadmap from 'src/router/modules/roadmap';
-import parking from 'src/router/modules/parking';
 import agency from 'src/router/modules/agency';
 import zone from 'src/router/modules/zone';
 import account from './modules/account';
@@ -86,7 +85,6 @@ const routes = [
             travel,
             roadmap,
             entry,
-            parking,
             agency,
             ItemType,
             zone,