Merge branch 'feature/mockApi' of http://face3d.4dage.com:7005/zhangyupeng/zfb_mp into feature/mockApi

src/api/system/system.ts

@@ -17,17 +17,20 @@ import { defHttp } from '/@/utils/http/axios';
 // sys/menu/queryAll
 // sys/menu/update
 enum Api {
-  AccountList = '/basic-api/system/getAccountList',
-  IsAccountExist = '/basic-api/system/accountExist',
-  setRoleStatus = '/basic-api/system/setRoleStatus',
   MenuList = '/zfb-api/zfb/shop/sys/menu/queryAll',
   saveMenu = '/zfb-api/zfb/shop/sys/menu/save',
   updateMenu = '/zfb-api/zfb/shop/sys/menu/update',
   deleteMenu = '/zfb-api/zfb/shop/sys/menu/delete',
+
+  AccountList = '/zfb-api/zfb/shop/sys/user/list',
+  IsAccountExist = '/basic-api/system/accountExist',
+
   RolePageList = '/zfb-api/zfb/shop/sys/role/list',
+  setRoleStatus = '/basic-api/system/setRoleStatus',
   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 +64,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

@@ -45,6 +45,15 @@ const system: AppRouteModule = {
       component: () => import('/@/views/dashboard/system/role/index.vue'),
     },
 
+    // {
+    //   path: 'dept',
+    //   name: 'DeptManagement',
+    //   meta: {
+    //     title: t('routes.demo.system.dept'),
+    //     ignoreKeepAlive: true,
+    //   },
+    //   component: () => import('/@/views/dashboard/system/dept/index.vue'),
+    // },
     {
       path: 'menu',
       name: 'MenuManagement',
@@ -54,15 +63,6 @@ const system: AppRouteModule = {
       },
       component: () => import('/@/views/dashboard/system/menu/index.vue'),
     },
-    {
-      path: 'dept',
-      name: 'DeptManagement',
-      meta: {
-        title: t('routes.demo.system.dept'),
-        ignoreKeepAlive: true,
-      },
-      component: () => import('/@/views/dashboard/system/dept/index.vue'),
-    },
     // {
     //   path: 'changePassword',
     //   name: '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/scenes/list.vue

@@ -110,7 +110,7 @@
           title: '操作',
           dataIndex: '',
           slots: { customRender: 'action' },
-          width: 140,
+          width: 200,
           fixed: 'right',
         },
       ];

src/views/dashboard/system/account/index.vue

@@ -1,7 +1,7 @@
 <template>
   <PageWrapper dense contentFullHeight fixedHeight contentClass="flex">
-    <DeptTree class="w-1/4 xl:w-1/5" @select="handleSelect" />
-    <BasicTable @register="registerTable" class="w-3/4 xl:w-4/5" :searchInfo="searchInfo">
+    <!-- <DeptTree class="w-1/4 xl:w-1/5" @select="handleSelect" /> -->
+    <BasicTable @register="registerTable" :searchInfo="searchInfo">
       <template #toolbar>
         <a-button type="primary" @click="handleCreate">新增账号</a-button>
       </template>
@@ -40,17 +40,17 @@
   import { BasicTable, useTable, TableAction } from '/@/components/Table';
   import { getAccountList } from '/@/api/system/system';
   import { PageWrapper } from '/@/components/Page';
-  import DeptTree from './DeptTree.vue';
+  // import DeptTree from './DeptTree.vue';
 
   import { useModal } from '/@/components/Modal';
   import AccountModal from './AccountModal.vue';
 
   import { columns, searchFormSchema } from './account.data';
   import { useGo } from '/@/hooks/web/usePage';
-
+  // DeptTree
   export default defineComponent({
     name: 'AccountManagement',
-    components: { BasicTable, PageWrapper, DeptTree, AccountModal, TableAction },
+    components: { BasicTable, PageWrapper, AccountModal, TableAction },
     setup() {
       const go = useGo();
       const [registerModal, { openModal }] = useModal();

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

@@ -18,16 +18,6 @@
           title="菜单分配"
         />
       </template>
-      <template #dept="{ model, field }">
-        <BasicTree
-          v-model:value="model[field]"
-          :treeData="treeData"
-          :fieldNames="{ title: 'name', key: 'menuId' }"
-          :checkable="true"
-          toolbar
-          title="权限分配"
-        />
-      </template>
     </BasicForm>
   </BasicDrawer>
 </template>
@@ -36,7 +26,8 @@
   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';
 
@@ -46,7 +37,7 @@
     emits: ['success', 'register'],
     setup(_, { emit }) {
       const isUpdate = ref(true);
-      const treeData = ref<TreeItem[]>([]);
+      const treeData = ref<TreeMenuNode[]>([]);
 
       const [registerForm, { resetFields, setFieldsValue, validate }] = useForm({
         labelWidth: 90,
@@ -60,6 +51,7 @@
         // 需要在setFieldsValue之前先填充treeData，否则Tree组件可能会报key not exist警告
         if (unref(treeData).length === 0) {
           const tData = (await getMenuList()) as any as TreeMenuNode[];
+
           treeData.value = makeMenuTree(tData);
         }
         isUpdate.value = !!data?.isUpdate;