部门列表页

admin-web/config/router.config.js

@@ -51,6 +51,11 @@ export default [
             name: 'role-list',
             component: './Admin/RoleList',
           },
+          {
+            path: '/admin/dept-list',
+            name: 'deptment-list',
+            component: './Admin/DeptmentList',
+          },
           {
             path: '/admin/dictionary-list',
             name: 'dictionary-list',

admin-web/package.json

@@ -118,7 +118,7 @@
       "node ./scripts/lint-prettier.js",
       "git add"
     ],
-    "**/*.{js,jsx}": "npm run lint-staged:js",
+    "**/*.{js}": "npm run lint-staged:js",
     "**/*.less": "stylelint --syntax less"
   },
   "engines": {

admin-web/src/locales/zh-CN/menu.js

@@ -44,6 +44,7 @@ export default {
   'menu.admin.resource-list': '权限列表',
   'menu.admin.role-list': '角色列表',
   'menu.admin.dictionary-list': '数据字典',
+  'menu.admin.deptment-list': '部门列表',
   // 商品相关
   'menu.product': '商品管理',
   'menu.product.product-spu-list': '商品管理',

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

@@ -0,0 +1,61 @@
+import { message } from 'antd';
+import { deptTreePage } from '../../services/admin';
+
+export default {
+  namespace: 'deptmentList',
+
+  state: {
+    list: [],
+    selectTree: [],
+    deptmentData: {
+      list: [],
+    },
+  },
+
+  effects: {
+    *getDeptmentList({ payload }, { call, put }) {
+      const result = yield call(deptTreePage, payload);
+      let deptmentData = {};
+      if (result.code === 0) {
+        deptmentData = result.data;
+      }
+      yield put({
+        type: 'save',
+        payload: {
+          deptmentData,
+        },
+      });
+    },
+  },
+
+  reducers: {
+    save(state, action) {
+      return {
+        ...state,
+        ...action.payload,
+      };
+    },
+
+    treeSuccess(state, { payload }) {
+      const resultData = payload;
+      const treeData = buildSelectTree(resultData);
+
+      // value 要保护 displayName 不然，搜索会失效
+      const rootNode = [
+        {
+          title: '根节点',
+          value: `根节点-0`,
+          key: 0,
+          children: [],
+        },
+      ];
+
+      const selectTree = rootNode.concat(treeData);
+      return {
+        ...state,
+        list: resultData,
+        selectTree,
+      };
+    },
+  },
+};

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

@@ -0,0 +1,86 @@
+import React, { PureComponent, Fragment } from 'react';
+import { Button, Card, Table, Form, Divider } from 'antd';
+import PageHeaderWrapper from '@/components/PageHeaderWrapper';
+import { connect } from 'dva';
+import styles from './DeptmentList.less';
+import PaginationHelper from '../../../helpers/PaginationHelper';
+import moment from 'moment';
+
+@connect(({ deptmentList, loading }) => ({
+  deptmentList,
+  deptmentData: deptmentList.deptmentData,
+  loading: loading.models.deptmentList,
+}))
+@Form.create()
+export default class DepetmentList extends PureComponent {
+  componentDidMount() {
+    const { dispatch } = this.props;
+    dispatch({
+      type: 'deptmentList/getDeptmentList',
+      payload: {
+        ...PaginationHelper.defaultPayload,
+      },
+    });
+  }
+
+  render() {
+    const { deptmentData, deptmentList } = this.props;
+    const columns = [
+      {
+        title: '部门名称',
+        dataIndex: 'name',
+      },
+      {
+        title: '排序',
+        dataIndex: 'sort',
+      },
+      {
+        title: '创建时间',
+        dataIndex: 'createTime',
+        sorter: true,
+        render: val => <span>{moment(val).format('YYYY-MM-DD')}</span>,
+      },
+      {
+        title: '操作',
+        render: (text, record) => (
+          <Fragment>
+            <a onClick={() => this.handleModalVisible(true, 'update', record)}>编辑</a>
+            <Divider type="vertical" />
+            <a className={styles.tableDelete} onClick={() => this.handleDelete(record)}>
+              删除
+            </a>
+          </Fragment>
+        ),
+      },
+    ];
+
+    // const {
+    // 	deptmentList: {deptmentData},
+    // 	loading,
+    // } = this.props;
+
+    return (
+      <PageHeaderWrapper>
+        <Card bordered={false}>
+          <div className={styles.tableList}>
+            <div className={styles.tableListOperator}>
+              <Button
+                icon="plus"
+                type="primary"
+                onClick={() => this.handleModalVisible(true, 'add', {})}
+              >
+                新建部门
+              </Button>
+            </div>
+          </div>
+          <Table
+            defaultExpandAllRows={true}
+            columns={columns}
+            dataSource={deptmentData.list ? deptmentData.list : []}
+            rowKey="id"
+          />
+        </Card>
+      </PageHeaderWrapper>
+    );
+  }
+}

admin-web/src/pages/Admin/DeptmentList.less

@@ -0,0 +1,11 @@
+@import '~antd/lib/style/themes/default.less';
+@import '~@/utils/utils.less';
+
+.tableList {
+  .tableListOperator {
+    margin-bottom: 16px;
+    button {
+      margin-right: 8px;
+    }
+  }
+}

admin-web/src/services/admin.js

@@ -55,6 +55,13 @@ export async function adminRoleAssign(params) {
   });
 }
 
+// deptment
+export async function deptTreePage(params) {
+  return request(`/admin-api/admins/dept/tree/page?${stringify(params)}`, {
+    method: 'GET',
+  });
+}
+
 // resource
 
 export async function addResource(params) {

system/system-application/src/main/java/cn/iocoder/mall/admin/application/controller/admins/DeptmentController.java

@@ -16,8 +16,10 @@ import io.swagger.annotations.Api;
 import io.swagger.annotations.ApiImplicitParam;
 import io.swagger.annotations.ApiOperation;
 import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.validation.annotation.Validated;
 import org.springframework.web.bind.annotation.*;
 
+import javax.validation.Valid;
 import java.util.ArrayList;
 import java.util.List;
 import java.util.Map;
@@ -42,7 +44,7 @@ public class DeptmentController {
 
     @GetMapping("tree/page")
     @ApiOperation(value = "根部门分页的部门树")
-    public CommonResult<PageResult<DeptmentVO>> treePage(DeptmentPageDTO deptmentPageDTO){
+    public CommonResult<PageResult<DeptmentVO>> treePage(@Validated DeptmentPageDTO deptmentPageDTO){
         PageResult<DeptmentBO> pageResult = deptmentService.getPageRootDeptment(deptmentPageDTO);
         PageResult<DeptmentVO> voPageResult = DeptmentConvert.INSTANCE.convert(pageResult);
         List<DeptmentBO> list = deptmentService.getAllDeptments();

system/system-service-api/src/main/java/cn/iocoder/mall/admin/api/dto/depetment/DeptmentPageDTO.java

@@ -1,8 +1,10 @@
 package cn.iocoder.mall.admin.api.dto.depetment;
 
 import cn.iocoder.common.framework.vo.PageParam;
+import io.swagger.annotations.ApiModel;
 import io.swagger.annotations.ApiModelProperty;
 import lombok.Data;
+import lombok.experimental.Accessors;
 
 
 /**
@@ -12,7 +14,9 @@ import lombok.Data;
  * @date: 2019-06-21
  * @time: 00:22
  */
+@ApiModel(value = "部门分页 DTO")
 @Data
+@Accessors(chain = true)
 public class DeptmentPageDTO extends PageParam {
     @ApiModelProperty(value = "根部门名字", example = "研发部")
     private String name;