- 后端：重构 system 模块

admin-web/src/models/admin/roleList.js

@@ -65,12 +65,12 @@ export default {
     *query({ payload }, { call, put }) {
       const response = yield call(queryRole, payload);
       message.info('查询成功!');
-      const { count, roles } = response.data;
+      const { total, list } = response.data;
       yield put({
         type: 'querySuccess',
         payload: {
-          list: roles,
-          count,
+          list: list,
+          count: total,
         },
       });
     },

admin-web/src/pages/Admin/AdminList.js

@@ -65,13 +65,29 @@ function List ({ dataSource, loading, pagination, searchParams, dispatch,
 
   const columns = [
     {
-      title: '用户名',
+      title: '账号',
       dataIndex: 'username'
     },
     {
-      title: '昵称',
+      title: '员工姓名',
       dataIndex: 'nickname',
     },
+    {
+      title: '角色',
+      dataIndex: 'roles',
+      render(roles) {
+        let text = '';
+        if (roles) {
+          for (let i in roles) {
+            if (i > 0) {
+              text += '  ';
+            }
+            text += roles[i].name;
+          }
+        }
+        return (<span>{text}</span>);
+      }
+    },
     {
       title: '状态',
       dataIndex: 'status',
@@ -174,7 +190,7 @@ const SearchForm = Form.create()(props => {
     <Form onSubmit={handleSubmit} layout="inline">
       <Row gutter={{ md: 8, lg: 24, xl: 48 }}>
         <Col md={8} sm={24}>
-          <FormItem label="昵称">
+          <FormItem label="员工姓名">
             {getFieldDecorator('nickname')(<Input placeholder="请输入" />)}
           </FormItem>
         </Col>
@@ -251,18 +267,18 @@ const AddOrUpdateForm = Form.create()(props => {
       okText='保存'
       onCancel={() => handleModalVisible()}
     >
-      <FormItem labelCol={{ span: 5 }} wrapperCol={{ span: 15 }} label="用户名">
+      <FormItem labelCol={{ span: 5 }} wrapperCol={{ span: 15 }} label="账号">
         {form.getFieldDecorator('username', {
-          rules: [{ required: true, message: '请输入用户名！'},
+          rules: [{ required: true, message: '请输入账号！'},
             {max: 16, min:6, message: '长度为 6-16 位'},
             { validator: (rule, value, callback) => checkTypeWithEnglishAndNumbers(rule, value, callback, '数字以及字母')}
           ],
           initialValue: formVals.username,
         })(<Input placeholder="请输入" />)}
       </FormItem>
-      <FormItem labelCol={{ span: 5 }} wrapperCol={{ span: 15 }} label="昵称">
+      <FormItem labelCol={{ span: 5 }} wrapperCol={{ span: 15 }} label="员工姓名">
         {form.getFieldDecorator('nickname', {
-          rules: [{ required: true, message: '请输入昵称！'},
+          rules: [{ required: true, message: '请输入员工姓名！'},
             {max: 10, message: '姓名最大长度为 10'}],
           initialValue: formVals.nickname,
         })(<Input placeholder="请输入" />)}

admin-web/src/pages/Admin/RoleList.js

@@ -143,7 +143,7 @@ class RoleList extends PureComponent {
       type: 'roleList/query',
       payload: {
         name: '',
-        pageNo: 0,
+        pageNo: 1,
         pageSize: 10,
       },
     });
@@ -277,11 +277,11 @@ class RoleList extends PureComponent {
     };
 
     const columns = [
-      {
-        title: 'id',
-        dataIndex: 'id',
-        render: text => <strong>{text}</strong>,
-      },
+      // {
+      //   title: 'id',
+      //   dataIndex: 'id',
+      //   render: text => <strong>{text}</strong>,
+      // },
       {
         title: '名称',
         dataIndex: 'name',
@@ -289,7 +289,7 @@ class RoleList extends PureComponent {
       {
         title: '创建时间',
         dataIndex: 'createTime',
-        sorter: true,
+        // sorter: true,
         render: val => <span>{moment(val).format('YYYY-MM-DD')}</span>,
       },
       {
@@ -325,7 +325,7 @@ class RoleList extends PureComponent {
                 type="primary"
                 onClick={() => this.handleModalVisible(true, 'add', {})}
               >
-                新建
+                新建角色
               </Button>
             </div>
           </div>