src/components/common/VnSection.vue

@@ -98,11 +98,14 @@ function checkIsMain() {
         />
         <div :id="searchbarId"></div>
     </slot>
-    <RightAdvancedMenu :is-main-section="isMainSection">
-        <template #advanced-menu v-if="$slots[advancedMenuSlot] || rightFilter">
+    <RightAdvancedMenu
+        :is-main-section="isMainSection"
+        v-if="$slots[advancedMenuSlot] || rightFilter"
+    >
+        <template #advanced-menu>
             <slot :name="advancedMenuSlot">
                 <VnTableFilter
-                    v-if="rightFilter && columns"
+                    v-if="columns"
                     :data-key="dataKey"
                     :array-data="arrayData"
                     :columns="columns"

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';
 

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: {

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';
 

src/pages/Worker/Department/Card/DepartmentCard.vue

@@ -1,6 +1,6 @@
 <script setup>
 import VnCardBeta from 'components/common/VnCardBeta.vue';
-import DepartmentDescriptor from 'pages/Department/Card/DepartmentDescriptor.vue';
+import DepartmentDescriptor from 'pages/Worker/Department/Card/DepartmentDescriptor.vue';
 </script>
 <template>
     <VnCardBeta

src/pages/Worker/WorkerDepartment.vue

@@ -4,7 +4,7 @@ import WorkerDepartmentTree from './WorkerDepartmentTree.vue';
 </script>
 
 <template>
-    <VnSection data-key="WorkerDepartment" :search-bar="false">
+    <VnSection data-key="WorkerDepartmentList" :search-bar="false" :right-filter="false">
         <template #body>
             <div class="flex flex-center q-pa-md">
                 <WorkerDepartmentTree />

src/pages/Worker/WorkerDepartmentTree.vue

@@ -3,7 +3,7 @@ import { onMounted, ref } from 'vue';
 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 DepartmentDescriptorProxy from 'src/pages/Worker/Department/Card/DepartmentDescriptorProxy.vue';
 import CreateDepartmentChild from './CreateDepartmentChild.vue';
 import axios from 'axios';
 import { useRouter } from 'vue-router';

src/router/modules/worker.js

@@ -191,7 +191,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: {
         menu: ['DepartmentBasicData'],
@@ -204,7 +204,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',
@@ -213,7 +214,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'),
         },
     ],
 };
@@ -256,14 +258,14 @@ export default {
                 },
                 {
                     path: 'department',
-                    name: 'Department',
-                    redirect: { name: 'WorkerDepartment' },
+                    name: 'WorkerDepartment',
+                    redirect: { name: 'WorkerDepartmentList' },
+                    meta: { title: 'department', icon: 'vn:greuge' },
                     component: () => import('src/pages/Worker/WorkerDepartment.vue'),
                     children: [
                         {
-                            name: 'WorkerDepartment',
+                            name: 'WorkerDepartmentList',
                             path: 'list',
-                            meta: { title: 'department', icon: 'vn:greuge' },
                         },
                         departmentCard,
                     ],

src/stores/useNavigationStore.js

@@ -55,8 +55,8 @@ export const useNavigationStore = defineStore('navigationStore', () => {
 
     function addMenuItem(module, route, parent) {
         const { meta } = route;
-        let { menuChildren = null } = meta;
-        if (meta.hidden) return;
+        if (meta?.hidden) return;
+        const menuChildren = meta?.menuChildren;
         if (menuChildren)
             menuChildren = menuChildren.map(({ name, title, icon }) => ({
                 name,