From a15c4b068b65b57779943028e69393d79de99343 Mon Sep 17 00:00:00 2001
From: smallchill <smallchill@163.com>
Date: Thu, 2 Apr 2020 16:28:29 +0800
Subject: [PATCH] =?UTF-8?q?:heavy=5Fplus=5Fsign:=20=E5=A2=9E=E5=8A=A0?=
 =?UTF-8?q?=E5=B2=97=E4=BD=8D=E7=AE=A1=E7=90=86?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/api/system/post.js    |  60 ++++++
 src/views/system/post.vue | 270 ++++++++++++++++++++++++++
 src/views/system/user.vue | 397 +++++++++++++++++++++++---------------
 3 files changed, 571 insertions(+), 156 deletions(-)
 create mode 100644 src/api/system/post.js
 create mode 100644 src/views/system/post.vue

diff --git a/src/api/system/post.js b/src/api/system/post.js
new file mode 100644
index 0000000..614b8fc
--- /dev/null
+++ b/src/api/system/post.js
@@ -0,0 +1,60 @@
+import request from '@/router/axios';
+
+export const getList = (current, size, params) => {
+  return request({
+    url: '/api/blade-system/post/list',
+    method: 'get',
+    params: {
+      ...params,
+      current,
+      size,
+    }
+  })
+}
+
+export const getPostList = (tenantId) => {
+  return request({
+    url: '/api/blade-system/post/select',
+    method: 'get',
+    params: {
+      tenantId
+    }
+  })
+}
+
+export const getDetail = (id) => {
+  return request({
+    url: '/api/blade-system/post/detail',
+    method: 'get',
+    params: {
+      id
+    }
+  })
+}
+
+export const remove = (ids) => {
+  return request({
+    url: '/api/blade-system/post/remove',
+    method: 'post',
+    params: {
+      ids,
+    }
+  })
+}
+
+export const add = (row) => {
+  return request({
+    url: '/api/blade-system/post/submit',
+    method: 'post',
+    data: row
+  })
+}
+
+export const update = (row) => {
+  return request({
+    url: '/api/blade-system/post/submit',
+    method: 'post',
+    data: row
+  })
+}
+
diff --git a/src/views/system/post.vue b/src/views/system/post.vue
new file mode 100644
index 0000000..a7f83cb
--- /dev/null
+++ b/src/views/system/post.vue
@@ -0,0 +1,270 @@
+<template>
+  <basic-container>
+    <avue-crud :option="option"
+               :table-loading="loading"
+               :data="data"
+               :page="page"
+               :permission="permissionList"
+               :before-open="beforeOpen"
+               v-model="form"
+               ref="crud"
+               @row-update="rowUpdate"
+               @row-save="rowSave"
+               @row-del="rowDel"
+               @search-change="searchChange"
+               @search-reset="searchReset"
+               @selection-change="selectionChange"
+               @current-change="currentChange"
+               @size-change="sizeChange"
+               @refresh-change="refreshChange"
+               @on-load="onLoad">
+      <template slot="menuLeft">
+        <el-button type="danger"
+                   size="small"
+                   icon="el-icon-delete"
+                   plain
+                   v-if="permission.post_delete"
+                   @click="handleDelete">删 除
+        </el-button>
+      </template>
+      <template slot-scope="{row}"
+                slot="tenantName">
+        <el-tag>{{row.tenantName}}</el-tag>
+      </template>
+      <template slot-scope="{row}"
+                slot="category">
+        <el-tag>{{row.categoryName}}</el-tag>
+      </template>
+    </avue-crud>
+  </basic-container>
+</template>
+
+<script>
+  import {getList, getDetail, add, update, remove} from "@/api/system/post";
+  import {mapGetters} from "vuex";
+
+  export default {
+    data() {
+      return {
+        form: {},
+        query: {},
+        loading: true,
+        page: {
+          pageSize: 10,
+          currentPage: 1,
+          total: 0
+        },
+        selectionList: [],
+        option: {
+          height: 'auto',
+          calcHeight: 30,
+          tip: false,
+          searchShow: true,
+          searchMenuSpan: 6,
+          border: true,
+          index: true,
+          viewBtn: true,
+          selection: true,
+          dialogClickModal: false,
+          column: [
+            {
+              label: "所属租户",
+              prop: "tenantName",
+              slot: true,
+              display: false
+            },
+            {
+              label: "岗位类型",
+              prop: "category",
+              type: "select",
+              dicUrl: "/api/blade-system/dict/dictionary?code=post",
+              props: {
+                label: "dictValue",
+                value: "dictKey"
+              },
+              dataType: "number",
+              slot: true,
+              search: true,
+              rules: [{
+                required: true,
+                message: "请选择岗位类型",
+                trigger: "blur"
+              }]
+            },
+            {
+              label: "岗位编号",
+              prop: "postCode",
+              search: true,
+              rules: [{
+                required: true,
+                message: "请输入岗位编号",
+                trigger: "blur"
+              }]
+            },
+            {
+              label: "岗位名称",
+              prop: "postName",
+              search: true,
+              rules: [{
+                required: true,
+                message: "请输入岗位名称",
+                trigger: "blur"
+              }]
+            },
+            {
+              label: "岗位排序",
+              prop: "sort",
+              type: "number",
+              rules: [{
+                required: true,
+                message: "请输入岗位排序",
+                trigger: "blur"
+              }]
+            },
+            {
+              label: "岗位描述",
+              prop: "remark",
+              type: "textarea",
+              span: 24,
+              minRows: 6,
+              hide: true,
+            },
+          ]
+        },
+        data: []
+      };
+    },
+    computed: {
+      ...mapGetters(["permission"]),
+      permissionList() {
+        return {
+          addBtn: this.vaildData(this.permission.post_add, false),
+          viewBtn: this.vaildData(this.permission.post_view, false),
+          delBtn: this.vaildData(this.permission.post_delete, false),
+          editBtn: this.vaildData(this.permission.post_edit, false)
+        };
+      },
+      ids() {
+        let ids = [];
+        this.selectionList.forEach(ele => {
+          ids.push(ele.id);
+        });
+        return ids.join(",");
+      }
+    },
+    methods: {
+      rowSave(row, loading, done) {
+        add(row).then(() => {
+          loading();
+          this.onLoad(this.page);
+          this.$message({
+            type: "success",
+            message: "操作成功!"
+          });
+        }, error => {
+          done();
+          window.console.log(error);
+        });
+      },
+      rowUpdate(row, index, loading, done) {
+        update(row).then(() => {
+          loading();
+          this.onLoad(this.page);
+          this.$message({
+            type: "success",
+            message: "操作成功!"
+          });
+        }, error => {
+          done();
+          console.log(error);
+        });
+      },
+      rowDel(row) {
+        this.$confirm("确定将选择数据删除?", {
+          confirmButtonText: "确定",
+          cancelButtonText: "取消",
+          type: "warning"
+        })
+          .then(() => {
+            return remove(row.id);
+          })
+          .then(() => {
+            this.onLoad(this.page);
+            this.$message({
+              type: "success",
+              message: "操作成功!"
+            });
+          });
+      },
+      handleDelete() {
+        if (this.selectionList.length === 0) {
+          this.$message.warning("请选择至少一条数据");
+          return;
+        }
+        this.$confirm("确定将选择数据删除?", {
+          confirmButtonText: "确定",
+          cancelButtonText: "取消",
+          type: "warning"
+        })
+          .then(() => {
+            return remove(this.ids);
+          })
+          .then(() => {
+            this.onLoad(this.page);
+            this.$message({
+              type: "success",
+              message: "操作成功!"
+            });
+            this.$refs.crud.toggleSelection();
+          });
+      },
+      beforeOpen(done, type) {
+        if (["edit", "view"].includes(type)) {
+          getDetail(this.form.id).then(res => {
+            this.form = res.data.data;
+          });
+        }
+        done();
+      },
+      searchReset() {
+        this.query = {};
+        this.onLoad(this.page);
+      },
+      searchChange(params, done) {
+        this.query = params;
+        this.page.currentPage = 1;
+        this.onLoad(this.page, params);
+        done();
+      },
+      selectionChange(list) {
+        this.selectionList = list;
+      },
+      selectionClear() {
+        this.selectionList = [];
+        this.$refs.crud.toggleSelection();
+      },
+      currentChange(currentPage) {
+        this.page.currentPage = currentPage;
+      },
+      sizeChange(pageSize) {
+        this.page.pageSize = pageSize;
+      },
+      refreshChange() {
+        this.onLoad(this.page, this.query);
+      },
+      onLoad(page, params = {}) {
+        this.loading = true;
+        getList(page.currentPage, page.pageSize, Object.assign(params, this.query)).then(res => {
+          const data = res.data.data;
+          this.page.total = data.total;
+          this.data = data.records;
+          this.loading = false;
+          this.selectionClear();
+        });
+      }
+    }
+  };
+</script>
+
+<style>
+</style>
diff --git a/src/views/system/user.vue b/src/views/system/user.vue
index c75b89d..8f79720 100644
--- a/src/views/system/user.vue
+++ b/src/views/system/user.vue
@@ -28,25 +28,49 @@
           <template slot="menuLeft">
             <el-button type="danger"
                        size="small"
-                       icon="el-icon-delete"
                        plain
+                       icon="el-icon-delete"
                        v-if="permission.user_delete"
                        @click="handleDelete">删 除
             </el-button>
-            <el-button type="primary"
+            <el-button type="info"
                        size="small"
+                       plain
+                       v-if="userInfo.role_name.includes('admin')"
+                       icon="el-icon-user"
+                       @click="handleGrant">角色分配
+            </el-button>
+            <el-button size="small"
                        plain
                        v-if="permission.user_reset"
                        icon="el-icon-refresh"
                        @click="handleReset">密码重置
             </el-button>
+            <el-button type="success"
+                       size="small"
+                       plain
+                       v-if="userInfo.role_name.includes('admin')"
+                       icon="el-icon-upload2"
+                       @click="handleImport">导入
+            </el-button>
+            <el-button type="warning"
+                       size="small"
+                       plain
+                       v-if="userInfo.role_name.includes('admin')"
+                       icon="el-icon-download"
+                       @click="handleExport">导出
+            </el-button>
+          </template>
+          <template slot-scope="{row}"
+                    slot="tenantName">
+            <el-tag>{{row.tenantName}}</el-tag>
           </template>
           <template slot-scope="{row}"
-                    slot="roleId">
+                    slot="roleName">
             <el-tag>{{row.roleName}}</el-tag>
           </template>
           <template slot-scope="{row}"
-                    slot="deptId">
+                    slot="deptName">
             <el-tag>{{row.deptName}}</el-tag>
           </template>
         </avue-crud>
@@ -58,7 +82,6 @@
 <script>
   import {
     getList,
-    getUser,
     remove,
     update,
     add,
@@ -66,6 +89,7 @@
   } from "@/api/system/user";
   import {getDeptTree, getDeptLazyTree} from "@/api/system/dept";
   import {getRoleTree} from "@/api/system/role";
+  import {getPostList} from "@/api/system/post";
   import {mapGetters} from "vuex";
   import website from '@/config/website';
 
@@ -144,152 +168,225 @@
               label: "登录账号",
               prop: "account",
               search: true,
-              rules: [{
-                required: true,
-                message: "请输入登录账号",
-                trigger: "blur"
-              }],
-              span: website.tenantMode ? 12 : 24,
+              display: false
             },
             {
               label: "所属租户",
-              prop: "tenantId",
-              type: "tree",
-              dicUrl: "/api/blade-system/tenant/select",
-              props: {
-                label: "tenantName",
-                value: "tenantId"
-              },
-              hide: !website.tenantMode,
-              addDisplay: website.tenantMode,
-              editDisplay: website.tenantMode,
-              viewDisplay: website.tenantMode,
-              search: website.tenantMode,
-              rules: [{
-                required: true,
-                message: "请输入所属租户",
-                trigger: "click"
-              }]
-            },
-            {
-              label: '密码',
-              prop: 'password',
-              hide: true,
-              editDisplay: false,
-              viewDisplay: false,
-              rules: [{required: true, validator: validatePass, trigger: 'blur'}]
-            },
-            {
-              label: '确认密码',
-              prop: 'password2',
-              hide: true,
-              editDisplay: false,
-              viewDisplay: false,
-              rules: [{required: true, validator: validatePass2, trigger: 'blur'}]
-            },
-            {
-              label: "用户昵称",
-              prop: "name",
-              hide: true,
-              rules: [{
-                required: true,
-                message: "请输入用户昵称",
-                trigger: "blur"
-              }]
+              prop: "tenantName",
+              slot: true,
+              display: false
             },
             {
               label: "用户姓名",
               prop: "realName",
               search: true,
-              rules: [{
-                required: true,
-                message: "请输入用户姓名",
-                trigger: "blur"
-              }, {
-                min: 2,
-                max: 5,
-                message: '姓名长度在2到5个字符'
-              }]
+              display: false
             },
             {
               label: "所属角色",
-              prop: "roleId",
-              multiple: true,
-              type: "tree",
-              dicData: [],
-              props: {
-                label: "title"
-              },
-              checkStrictly: true,
+              prop: "roleName",
               slot: true,
-              rules: [{
-                required: true,
-                message: "请选择所属角色",
-                trigger: "click"
-              }]
+              display: false
             },
             {
               label: "所属部门",
-              prop: "deptId",
-              type: "tree",
-              multiple: true,
-              dicData: [],
-              props: {
-                label: "title"
-              },
-              checkStrictly: true,
+              prop: "deptName",
               slot: true,
-              rules: [{
-                required: true,
-                message: "请选择所属部门",
-                trigger: "click"
-              }]
-            },
-            {
-              label: "手机号码",
-              prop: "phone",
-              overHidden: true
+              display: false
             },
+          ],
+          group: [
             {
-              label: "电子邮箱",
-              prop: "email",
-              hide: true,
-              overHidden: true
+              label: '基础信息',
+              prop: 'baseInfo',
+              icon: 'el-icon-user-solid',
+              column: [
+                {
+                  label: "登录账号",
+                  prop: "account",
+                  search: true,
+                  rules: [{
+                    required: true,
+                    message: "请输入登录账号",
+                    trigger: "blur"
+                  }],
+                  span: website.tenantMode ? 12 : 24,
+                },
+                {
+                  label: "所属租户",
+                  prop: "tenantId",
+                  type: "tree",
+                  dicUrl: "/api/blade-system/tenant/select",
+                  props: {
+                    label: "tenantName",
+                    value: "tenantId"
+                  },
+                  hide: !website.tenantMode,
+                  addDisplay: website.tenantMode,
+                  editDisplay: website.tenantMode,
+                  viewDisplay: website.tenantMode,
+                  search: website.tenantMode,
+                  rules: [{
+                    required: true,
+                    message: "请输入所属租户",
+                    trigger: "click"
+                  }]
+                },
+                {
+                  label: '密码',
+                  prop: 'password',
+                  hide: true,
+                  editDisplay: false,
+                  viewDisplay: false,
+                  rules: [{required: true, validator: validatePass, trigger: 'blur'}]
+                },
+                {
+                  label: '确认密码',
+                  prop: 'password2',
+                  hide: true,
+                  editDisplay: false,
+                  viewDisplay: false,
+                  rules: [{required: true, validator: validatePass2, trigger: 'blur'}]
+                },
+              ]
             },
             {
-              label: "用户性别",
-              prop: "sex",
-              type: "select",
-              dicData: [
+              label: '详细信息',
+              prop: 'detailInfo',
+              icon: 'el-icon-s-order',
+              column: [
+                {
+                  label: "用户昵称",
+                  prop: "name",
+                  hide: true,
+                  rules: [{
+                    required: true,
+                    message: "请输入用户昵称",
+                    trigger: "blur"
+                  }]
+                },
+                {
+                  label: "用户姓名",
+                  prop: "realName",
+                  search: true,
+                  rules: [{
+                    required: true,
+                    message: "请输入用户姓名",
+                    trigger: "blur"
+                  }, {
+                    min: 2,
+                    max: 5,
+                    message: '姓名长度在2到5个字符'
+                  }]
+                },
+                {
+                  label: "手机号码",
+                  prop: "phone",
+                  overHidden: true
+                },
                 {
-                  label: "男",
-                  value: 1
+                  label: "电子邮箱",
+                  prop: "email",
+                  hide: true,
+                  overHidden: true
                 },
                 {
-                  label: "女",
-                  value: 2
+                  label: "用户性别",
+                  prop: "sex",
+                  type: "select",
+                  dicData: [
+                    {
+                      label: "男",
+                      value: 1
+                    },
+                    {
+                      label: "女",
+                      value: 2
+                    },
+                    {
+                      label: "未知",
+                      value: 3
+                    }
+                  ],
+                  hide: true
                 },
                 {
-                  label: "未知",
-                  value: 3
+                  label: "用户生日",
+                  type: "date",
+                  prop: "birthday",
+                  format: "yyyy-MM-dd hh:mm:ss",
+                  valueFormat: "yyyy-MM-dd hh:mm:ss",
+                  hide: true
+                },
+                {
+                  label: "账号状态",
+                  prop: "statusName",
+                  hide: true,
+                  display: false
                 }
-              ],
-              hide: true
+              ]
             },
             {
-              label: "用户生日",
-              type: "date",
-              prop: "birthday",
-              format: "yyyy-MM-dd hh:mm:ss",
-              valueFormat: "yyyy-MM-dd hh:mm:ss",
-              hide: true
+              label: '职责信息',
+              prop: 'dutyInfo',
+              icon: 'el-icon-s-custom',
+              column: [
+                {
+                  label: "用户编号",
+                  prop: "code",
+                },
+                {
+                  label: "所属角色",
+                  prop: "roleId",
+                  multiple: true,
+                  type: "tree",
+                  dicData: [],
+                  props: {
+                    label: "title"
+                  },
+                  checkStrictly: true,
+                  slot: true,
+                  rules: [{
+                    required: true,
+                    message: "请选择所属角色",
+                    trigger: "click"
+                  }]
+                },
+                {
+                  label: "所属部门",
+                  prop: "deptId",
+                  type: "tree",
+                  multiple: true,
+                  dicData: [],
+                  props: {
+                    label: "title"
+                  },
+                  checkStrictly: true,
+                  slot: true,
+                  rules: [{
+                    required: true,
+                    message: "请选择所属部门",
+                    trigger: "click"
+                  }]
+                },
+                {
+                  label: "所属岗位",
+                  prop: "postId",
+                  type: "tree",
+                  multiple: true,
+                  dicData: [],
+                  props: {
+                    label: "postName",
+                    value: "id"
+                  },
+                  rules: [{
+                    required: true,
+                    message: "请选择所属岗位",
+                    trigger: "click"
+                  }],
+                },
+              ]
             },
-            {
-              label: "账号状态",
-              prop: "statusName",
-              hide: true,
-              display: false
-            }
           ]
         },
         data: []
@@ -298,19 +395,12 @@
     watch: {
       'form.tenantId'() {
         if (this.form.tenantId !== '') {
-          getDeptTree(this.form.tenantId).then(res => {
-            const index = this.$refs.crud.findColumnIndex("deptId");
-            this.option.column[index].dicData = res.data.data;
-          });
-          getRoleTree(this.form.tenantId).then(res => {
-            const index = this.$refs.crud.findColumnIndex("roleId");
-            this.option.column[index].dicData = res.data.data;
-          });
+          this.initData(this.form.tenantId);
         }
       }
     },
     computed: {
-      ...mapGetters(["permission"]),
+      ...mapGetters(["userInfo", "permission"]),
       permissionList() {
         return {
           addBtn: this.vaildData(this.permission.user_add, false),
@@ -327,28 +417,27 @@
         return ids.join(",");
       },
     },
-    created() {
-      this.initData();
-    },
     methods: {
       nodeClick(data) {
         this.treeDeptId = data.id;
         this.page.currentPage = 1;
         this.onLoad(this.page);
       },
-      initData() {
-        getDeptTree(this.form.tenantId).then(res => {
-          const index = this.$refs.crud.findColumnIndex("deptId");
-          this.option.column[index].dicData = res.data.data;
+      initData(tenantId) {
+        getRoleTree(tenantId).then(res => {
+          this.option.group[2].column[1].dicData = res.data.data;
+        });
+        getDeptTree(tenantId).then(res => {
+          this.option.group[2].column[2].dicData = res.data.data;
         });
-        getRoleTree(this.form.tenantId).then(res => {
-          const index = this.$refs.crud.findColumnIndex("roleId");
-          this.option.column[index].dicData = res.data.data;
+        getPostList(tenantId).then(res => {
+          this.option.group[2].column[3].dicData = res.data.data;
         });
       },
       rowSave(row, loading, done) {
         row.deptId = row.deptId.join(",");
         row.roleId = row.roleId.join(",");
+        row.postId = row.postId.join(",");
         add(row).then(() => {
           loading();
           this.onLoad(this.page);
@@ -364,6 +453,7 @@
       rowUpdate(row, index, loading, done) {
         row.deptId = row.deptId.join(",");
         row.roleId = row.roleId.join(",");
+        row.postId = row.postId.join(",");
         update(row).then(() => {
           loading();
           this.onLoad(this.page);
@@ -453,24 +543,19 @@
             });
             this.$refs.crud.toggleSelection();
           });
+      },
+      handleGrant() {
+
+      },
+      handleImport() {
+
+      },
+      handleExport() {
+
       },
       beforeOpen(done, type) {
         if (["edit", "view"].includes(type)) {
-          getUser(this.form.id).then(res => {
-            this.form = res.data;
-            if(this.form.hasOwnProperty("deptId")){
-              this.form.deptId = this.form.deptId.split(",");
-              this.form.deptId.forEach((ele, index) => {
-                this.form.deptId[index] = Number(ele);
-              });
-            }
-            if(this.form.hasOwnProperty("roleId")){
-              this.form.roleId = this.form.roleId.split(",");
-              this.form.roleId.forEach((ele, index) => {
-                this.form.roleId[index] = Number(ele);
-              });
-            }
-          });
+          //预留
         }
         done();
       },