feat(api): dept part1

src/api/system/system.ts

@@ -26,8 +26,8 @@ enum Api {
   deleteMenu = '/zfb-api/zfb/shop/sys/menu/delete',
   RolePageList = '/zfb-api/zfb/shop/sys/role/list',
   GetAllRoleList = '/basic-api/system/getAllRoleList',
-  DeptList = '/zfb-api/zfb/shop/sys/dept/list',
-  DeptTree = '',
+  DeptList = '/zfb-api/zfb/shop/sys/company/list',
+  // DeptTree = 'sys/dept/list',
 }
 
 export const getAccountList = (params: AccountParams) =>
@@ -61,3 +61,6 @@ export const setRoleStatus = (id: number, status: string) =>
 
 export const isAccountExist = (account: string) =>
   defHttp.post({ url: Api.IsAccountExist, params: { account } }, { errorMessageMode: 'none' });
+
+export const deptListApi = (params?: RolePageParams) =>
+  defHttp.post<RolePageListGetResultModel>({ url: Api.DeptList, params });

src/locales/lang/zh-CN/routes/demo.ts

@@ -161,10 +161,10 @@ export default {
   },
   system: {
     moduleName: '系统管理',
-    account: '账号管理',
+    account: '管理员列表',
     account_detail: '账号详情',
     password: '修改密码',
-    dept: '部门管理',
+    dept: '公司管理',
     menu: '菜单管理',
     role: '角色管理',
   },

src/router/routes/modules/system.ts

@@ -46,22 +46,22 @@ const system: AppRouteModule = {
     },
 
     {
-      path: 'menu',
-      name: 'MenuManagement',
+      path: 'dept',
+      name: 'DeptManagement',
       meta: {
-        title: t('routes.demo.system.menu'),
+        title: t('routes.demo.system.dept'),
         ignoreKeepAlive: true,
       },
-      component: () => import('/@/views/dashboard/system/menu/index.vue'),
+      component: () => import('/@/views/dashboard/system/dept/index.vue'),
     },
     {
-      path: 'dept',
-      name: 'DeptManagement',
+      path: 'menu',
+      name: 'MenuManagement',
       meta: {
-        title: t('routes.demo.system.dept'),
+        title: t('routes.demo.system.menu'),
         ignoreKeepAlive: true,
       },
-      component: () => import('/@/views/dashboard/system/dept/index.vue'),
+      component: () => import('/@/views/dashboard/system/menu/index.vue'),
     },
     // {
     //   path: 'changePassword',

src/views/dashboard/member/list.vue

@@ -34,7 +34,7 @@ weixinOpenid: "oeADe5U9uLeMYsNigq98zdu8J96A"
       </template>
 
       <template #birthday="{ record }">
-        <Time :value="record.birthday" mode="datetime" />
+        <Time v-if="record.birthday" :value="record.birthday" mode="datetime" />
       </template>
 
       <template #lastLoginTime="{ record }">

src/views/dashboard/system/role/RoleDrawer.vue

@@ -21,7 +21,7 @@
       <template #dept="{ model, field }">
         <BasicTree
           v-model:value="model[field]"
-          :treeData="treeData"
+          :treeData="deptTreeData"
           :fieldNames="{ title: 'name', key: 'menuId' }"
           :checkable="true"
           toolbar
@@ -36,9 +36,10 @@
   import { BasicForm, useForm } from '/@/components/Form/index';
   import { formSchema } from './role.data';
   import { BasicDrawer, useDrawerInner } from '/@/components/Drawer';
-  import { BasicTree, TreeItem } from '/@/components/Tree';
+  // TreeItem
+  import { BasicTree } from '/@/components/Tree';
   import { makeMenuTree, TreeMenuNode } from '/@/utils/treeUtils';
-  import { getMenuList } from '/@/api/system/system';
+  import { getMenuList, deptListApi } from '/@/api/system/system';
 
   export default defineComponent({
     name: 'RoleDrawer',
@@ -46,7 +47,8 @@
     emits: ['success', 'register'],
     setup(_, { emit }) {
       const isUpdate = ref(true);
-      const treeData = ref<TreeItem[]>([]);
+      const treeData = ref<TreeMenuNode[]>([]);
+      const deptTreeData = ref<TreeMenuNode[]>([]);
 
       const [registerForm, { resetFields, setFieldsValue, validate }] = useForm({
         labelWidth: 90,
@@ -60,7 +62,10 @@
         // 需要在setFieldsValue之前先填充treeData，否则Tree组件可能会报key not exist警告
         if (unref(treeData).length === 0) {
           const tData = (await getMenuList()) as any as TreeMenuNode[];
+          const dData = (await deptListApi()) as any as TreeMenuNode[];
+
           treeData.value = makeMenuTree(tData);
+          deptTreeData.value = makeMenuTree(dData);
         }
         isUpdate.value = !!data?.isUpdate;
 
@@ -92,6 +97,7 @@
         getTitle,
         handleSubmit,
         treeData,
+        deptTreeData,
       };
     },
   });