update

admin-code/src/main.js

@@ -11,6 +11,7 @@ import '@/icons/index';
 import '@/filter/index';
 
 import crud from 'cl-crud';
+
 import ElementUI from 'element-ui';
 import './assets/css/element-variables.scss';
 

admin-code/src/mock/userInfo.js

@@ -7,6 +7,117 @@ let token = {
 		'eyJhbGciOiJIUzI1NiIsInR5cCI6IkpXVCJ9.eyJyb2xlSWRzIjpbIjEiXSwidXNlcklkIjoiMSIsInBhc3N3b3JkVmVyc2lvbiI6MSwiaWF0IjoxNTczOTc4MzYyLCJleHAiOjE1NzQ1ODMxNjJ9.UOfPFd5cbWaRcaCri4TU2aFZ8_t8KVJzfBFBciDYLdQ'
 };
 
+let userList = [
+	{
+		id: '21',
+		name: '测试部门权限2',
+		password: 'e10adc3949ba59abbe56e057f20f883e',
+		passwordV: 1,
+		nickName: '权限2昵称',
+		headImg: null,
+		email: null,
+		remark: null,
+		status: 1,
+		createTime: '2019-11-20 15:48:31',
+		updateTime: '2019-11-20 15:48:31',
+		username: 'testdp2',
+		phone: null,
+		departmentId: '1',
+		roleName: '只有部门2小组2',
+		departmentName: 'COOL-ADMIN'
+	},
+	{
+		id: '20',
+		name: '测试部门权限',
+		password: 'e10adc3949ba59abbe56e057f20f883e',
+		passwordV: 1,
+		nickName: '测试部门权限昵称',
+		headImg: null,
+		email: null,
+		remark: null,
+		status: 1,
+		createTime: '2019-11-20 15:39:28',
+		updateTime: '2019-11-20 15:39:28',
+		username: 'testdep',
+		phone: null,
+		departmentId: '1',
+		roleName: '只有部门1',
+		departmentName: 'COOL-ADMIN'
+	},
+	{
+		id: '19',
+		name: '33',
+		password: 'e10adc3949ba59abbe56e057f20f883e',
+		passwordV: 1,
+		nickName: '333',
+		headImg: null,
+		email: null,
+		remark: null,
+		status: 1,
+		createTime: '2019-11-19 00:02:27',
+		updateTime: '2019-11-19 00:02:27',
+		username: '333',
+		phone: null,
+		departmentId: '17',
+		roleName: '只有部门1',
+		departmentName: '小组1'
+	},
+	{
+		id: '18',
+		name: '阿打算',
+		password: 'e10adc3949ba59abbe56e057f20f883e',
+		passwordV: 1,
+		nickName: '12312',
+		headImg: null,
+		email: null,
+		remark: null,
+		status: 1,
+		createTime: '2019-11-18 18:20:04',
+		updateTime: '2019-11-18 18:20:04',
+		username: '3123',
+		phone: null,
+		departmentId: '13',
+		roleName: 'testRole',
+		departmentName: '部门1'
+	},
+	{
+		id: '17',
+		name: '阿',
+		password: 'e10adc3949ba59abbe56e057f20f883e',
+		passwordV: 1,
+		nickName: '123',
+		headImg: null,
+		email: null,
+		remark: null,
+		status: 1,
+		createTime: '2019-11-18 18:07:57',
+		updateTime: '2019-11-18 18:07:57',
+		username: '123',
+		phone: null,
+		departmentId: '16',
+		roleName: '超管',
+		departmentName: '小组2'
+	},
+	{
+		id: '16',
+		name: 'test',
+		password: 'e10adc3949ba59abbe56e057f20f883e',
+		passwordV: 1,
+		nickName: null,
+		headImg: null,
+		email: null,
+		remark: null,
+		status: 1,
+		createTime: '2019-11-11 10:37:43',
+		updateTime: '2019-11-11 11:17:25',
+		username: '测试',
+		phone: null,
+		departmentId: '14',
+		roleName: '测试,testRole,超管',
+		departmentName: '小组1'
+	}
+];
+
 let userInfo = {
 	createTime: '2019-06-25 10:20:20',
 	email: '123456@qq.com',
@@ -191,17 +302,17 @@ let menu = {
 		// 	viewPath: null,
 		// 	keepAlive: 1
 		// },
-		// {
-		// 	id: '8',
-		// 	parentId: '27',
-		// 	name: '菜单列表',
-		// 	type: 1,
-		// 	icon: 'icon-menu',
-		// 	orderNum: 2,
-		// 	router: '/sys/menu',
-		// 	viewPath: 'views/system/menu/index.vue',
-		// 	keepAlive: 1
-		// },
+		{
+			id: '8',
+			parentId: '27',
+			name: '菜单列表',
+			type: 1,
+			icon: 'icon-menu',
+			orderNum: 2,
+			router: '/sys/menu',
+			viewPath: 'views/system/menu/index.vue',
+			keepAlive: 1
+		},
 		{
 			id: '11',
 			parentId: '8',
@@ -407,3 +518,19 @@ Mock.mock(RegExp('/comm/permmenu' + '.*'), 'get', req => {
 		message: 'success'
 	};
 });
+
+Mock.mock(RegExp('/sys/user/page' + '.*'), 'get', req => {
+	console.table(req);
+	return {
+		code: 1,
+		data: {
+			list: userList,
+			pagination: {
+				page: 1,
+				size: 20,
+				total: 6
+			}
+		},
+		message: 'success'
+	};
+});

admin-code/src/views/system/user/index.vue

@@ -260,6 +260,7 @@ export default {
 						}
 					]
 				})
+				// .set('layout', [['refresh-btn', 'add-btn', 'multi-delete-btn'], ['data-table'], ['data-table']])
 				.on('open', f => {
 					app.setData('upsert.items[prop:password].hidden', !f);
 					app.setData('upsert.items[prop:tips].hidden', f);