Browse Source

修改BUG

admin 3 years ago
parent
commit
e4f9f3a41d

+ 109 - 91
src/api/manager/contractinfo.js

@@ -1,130 +1,148 @@
 import request from '@/router/axios';
 
 export const submitContractInfo = (contractInfo) => {
-  return request({
-    url: '/api/blade-manager/contractInfo/submit',
-    method: 'post',
-    data: contractInfo
-  })
+    return request({
+        url: '/api/blade-manager/contractInfo/submit',
+        method: 'post',
+        data: contractInfo
+    })
 }
 export const findContractByProjectId = (pid) => {
-  return request({
-    url: '/api/blade-manager/contractInfo/findContractInfoByPid',
-    method: 'get',
-    params: {
-      pid
-    }
-  })
+    return request({
+        url: '/api/blade-manager/contractInfo/findContractInfoByPid',
+        method: 'get',
+        params: {
+            pid
+        }
+    })
 }
 export const getContractInfo = (id) => {
-  return request({
-    url: '/api/blade-manager/contractInfo/detail',
-    method: 'get',
-    params: {
-      id
-    }
-  })
+    return request({
+        url: '/api/blade-manager/contractInfo/detail',
+        method: 'get',
+        params: {
+            id
+        }
+    })
 }
 export const delFileFromUrl = (url) => {
-  return request({
-    url: '/api/blade-manager/contractInfo/deleteFile',
-    method: 'get',
-    params: {
-      url
-    }
-  })
+    return request({
+        url: '/api/blade-manager/contractInfo/deleteFile',
+        method: 'get',
+        params: {
+            url
+        }
+    })
 }
 
 export const saveUserInfoByProject = (list) => {
-  return request({
-    url: '/api/blade-manager/contractInfo/saveUserInfoByProject',
-    method: 'post',
-    data: list
-  })
+    return request({
+        url: '/api/blade-manager/contractInfo/saveUserInfoByProject',
+        method: 'post',
+        data: list
+    })
 }
 
 export const findAllUserByCondition = (info) => {
-  return request({
-    url: '/api/blade-manager/contractInfo/findAllUserByCondition',
-    method: 'post',
-    data: info
-  })
+    return request({
+        url: '/api/blade-manager/contractInfo/findAllUserByCondition',
+        method: 'post',
+        data: info
+    })
 }
 export const findUserListByCondition = (info) => {
-  return request({
-    url: '/api/blade-manager/contractInfo/findUserListByCondition',
-    method: 'post',
-    data: info
-  })
+    return request({
+        url: '/api/blade-manager/contractInfo/findUserListByCondition',
+        method: 'post',
+        data: info
+    })
 }
 
 export const findUserByName = (name) => {
-  return request({
-    url: '/api/blade-manager/contractInfo/findUserByName',
-    method: 'get',
-    params: {
-      name
-    }
-  })
+    return request({
+        url: '/api/blade-manager/contractInfo/findUserByName',
+        method: 'get',
+        params: {
+            name
+        }
+    })
 }
 
 export const removeUsersByIds = (ids) => {
-  return request({
-    url: '/api/blade-manager/contractInfo/removeUsersByIds',
-    method: 'post',
-    params: {
-      ids
-    }
-  })
+    return request({
+        url: '/api/blade-manager/contractInfo/removeUsersByIds',
+        method: 'post',
+        params: {
+            ids
+        }
+    })
 }
 
 export const removeContractInfo = (ids) => {
-  return request({
-    url: '/api/blade-manager/contractInfo/remove',
-    method: 'post',
-    params: {
-      ids
-    }
-  })
+    return request({
+        url: '/api/blade-manager/contractInfo/remove',
+        method: 'post',
+        params: {
+            ids
+        }
+    })
 }
 
 export const findJobByRoleId = (id) => {
-  return request({
-    url: '/api/blade-manager/contractInfo/findJobByRoleId',
-    method: 'get',
-    params: {
-      id
-    }
-  })
+    return request({
+        url: '/api/blade-manager/contractInfo/findJobByRoleId',
+        method: 'get',
+        params: {
+            id
+        }
+    })
 }
 
 export const resetPasswordByUserId = (userId) => {
-  return request({
-    url: '/api/blade-manager/contractInfo/resetPasswordByUserId',
-    method: 'post',
-    params: {
-      userId
-    }
-  })
+    return request({
+        url: '/api/blade-manager/contractInfo/resetPasswordByUserId',
+        method: 'post',
+        params: {
+            userId
+        }
+    })
 }
 
 export const submitWbsTreeInContract = (obj) => {
-  return request({
-    url: '/api/blade-manager/contractInfo/submitWbsTreeInContract',
-    method: 'post',
-    data: obj
-  })
+    return request({
+        url: '/api/blade-manager/contractInfo/submitWbsTreeInContract',
+        method: 'post',
+        data: obj
+    })
 }
 
-export const getContractInfoTree = (wbsId,projectId,contractId) => {
-  return request({
-    url: '/api/blade-manager/contractInfo/tree',
-    method: 'get',
-    params: {
-      wbsId,
-      projectId,
-      contractId,
-    }
-  })
+export const getContractInfoTree = (wbsId, projectId, contractId) => {
+    return request({
+        url: '/api/blade-manager/contractInfo/tree',
+        method: 'get',
+        params: {
+            wbsId,
+            projectId,
+            contractId,
+        }
+    })
 }
 
+//新 通过角色方获取岗位
+export const findPostByType = (id) => {
+        return request({
+            url: '/api/blade-system/post/findPostByType',
+            method: 'get',
+            params: {
+                category: id
+            }
+        })
+    }
+    //
+export const saveUserInfoByProjectTow = (list) => {
+    return request({
+        url: '/api/blade-manager/contractInfo/saveUserInfoByProjectTow',
+        method: 'post',
+        data: list
+    })
+}

+ 63 - 63
src/api/system/role.js

@@ -1,89 +1,89 @@
 import request from '@/router/axios';
 
 export const getList = (current, size, params) => {
-  return request({
-    url: '/api/blade-system/role/list',
-    method: 'get',
-    params: {
-      ...params,
-      current,
-      size,
-    }
-  })
+    return request({
+        url: '/api/blade-system/role/list',
+        method: 'get',
+        params: {
+            ...params,
+            current,
+            size,
+        }
+    })
 }
 export const grantTree = () => {
-  return request({
-    url: '/api/blade-system/menu/grant-tree',
-    method: 'get',
-  })
+    return request({
+        url: '/api/blade-system/menu/grant-tree',
+        method: 'get',
+    })
 }
 
 export const grant = (roleIds, menuIds, dataScopeIds, apiScopeIds) => {
-  return request({
-    url: '/api/blade-system/role/grant',
-    method: 'post',
-    data: {
-      roleIds,
-      menuIds,
-      dataScopeIds,
-      apiScopeIds
-    }
-  })
+    return request({
+        url: '/api/blade-system/role/grant',
+        method: 'post',
+        data: {
+            roleIds,
+            menuIds,
+            dataScopeIds,
+            apiScopeIds
+        }
+    })
 }
 
 export const remove = (ids) => {
-  return request({
-    url: '/api/blade-system/role/remove',
-    method: 'post',
-    params: {
-      ids,
-    }
-  })
+    return request({
+        url: '/api/blade-system/role/remove',
+        method: 'post',
+        params: {
+            ids,
+        }
+    })
 }
 
 export const add = (row) => {
-  return request({
-    url: '/api/blade-system/role/submit',
-    method: 'post',
-    data: row
-  })
+    return request({
+        url: '/api/blade-system/role/submit',
+        method: 'post',
+        data: row
+    })
 }
 
 export const update = (row) => {
-  return request({
-    url: '/api/blade-system/role/submit',
-    method: 'post',
-    data: row
-  })
+    return request({
+        url: '/api/blade-system/role/submit',
+        method: 'post',
+        data: row
+    })
 }
 
 
 export const getRole = (roleIds) => {
-  return request({
-    url: '/api/blade-system/menu/role-tree-keys',
-    method: 'get',
-    params: {
-      roleIds,
-    }
-  })
+    return request({
+        url: '/api/blade-system/menu/role-tree-keys',
+        method: 'get',
+        params: {
+            roleIds,
+        }
+    })
 }
 
-export const getRoleTree = (tenantId) => {
-  return request({
-    url: '/api/blade-system/role/tree',
-    method: 'get',
-    params: {
-      tenantId,
-    }
-  })
+export const getRoleTree = () => {
+    return request({
+        url: '/api/blade-system/dict-biz/dictionary',
+        method: 'get',
+        params: {
+            code: 'maintainer_role',
+        }
+    })
 }
 
 export const getRoleTreeById = (roleId) => {
-  return request({
-    url: '/api/blade-system/role/tree-by-id',
-    method: 'get',
-    params: {
-      roleId,
-    }
-  })
-}
+    return request({
+        url: '/api/blade-system/role/tree-by-id',
+        method: 'get',
+        params: {
+            roleId,
+        }
+    })
+}

+ 25 - 1
src/styles/xiaoyu.scss

@@ -3,7 +3,7 @@
     justify-content: flex-start;
 }
 
-.flexEnd {
+.· {
     display: flex;
     justify-content: flex-end;
 }
@@ -90,4 +90,28 @@
 
 .marright30 {
     margin-right: 30px;
+}
+
+.marleft5 {
+    margin-left: 5px;
+}
+
+.marleft10 {
+    margin-left: 10px;
+}
+
+.marleft15 {
+    margin-left: 15px;
+}
+
+.marleft20 {
+    margin-left: 20px;
+}
+
+.marleft25 {
+    margin-left: 25px;
+}
+
+.marleft30 {
+    margin-left: 30px;
 }

+ 367 - 349
src/views/authority/role.vue

@@ -1,402 +1,420 @@
 <template>
   <basic-container>
-    <avue-crud :option="option"
-               :table-loading="loading"
-               :data="data"
-               ref="crud"
-               v-model="form"
-               :permission="permissionList"
-               :before-open="beforeOpen"
-               @row-del="rowDel"
-               @row-update="rowUpdate"
-               @row-save="rowSave"
-               @search-change="searchChange"
-               @search-reset="searchReset"
-               @selection-change="selectionChange"
-               @current-change="currentChange"
-               @size-change="sizeChange"
-               @refresh-change="refreshChange"
-               @on-load="onLoad">
+    <avue-crud
+      :option="option"
+      :table-loading="loading"
+      :data="data"
+      ref="crud"
+      v-model="form"
+      :permission="permissionList"
+      :before-open="beforeOpen"
+      @row-del="rowDel"
+      @row-update="rowUpdate"
+      @row-save="rowSave"
+      @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"
-                   v-if="permission.role_delete"
-                   plain
-                   @click="handleDelete">删 除
+        <el-button
+          type="danger"
+          size="small"
+          icon="el-icon-delete"
+          v-if="permission.role_delete"
+          plain
+          @click="handleDelete"
+        >删 除
         </el-button>
-        <el-button size="small"
-                   icon="el-icon-setting"
-                   @click="handleRole"
-                   v-if="userInfo.role_name.includes('admin')"
-                   plain>权限设置
+        <el-button
+          size="small"
+          icon="el-icon-setting"
+          @click="handleRole"
+          v-if="userInfo.role_name.includes('admin')"
+          plain
+        >权限设置
         </el-button>
       </template>
     </avue-crud>
-    <el-dialog title="角色权限配置"
-               append-to-body
-               :visible.sync="box"
-               width="345px">
+    <el-dialog
+      title="角色权限配置"
+      append-to-body
+      :visible.sync="box"
+      width="345px"
+    >
       <el-tabs type="border-card">
         <el-tab-pane label="菜单权限">
-          <el-tree :data="menuGrantList"
-                   show-checkbox
-                   node-key="id"
-                   ref="treeMenu"
-                   :default-checked-keys="menuTreeObj"
-                   :props="props">
+          <el-tree
+            :data="menuGrantList"
+            show-checkbox
+            node-key="id"
+            ref="treeMenu"
+            :default-checked-keys="menuTreeObj"
+            :props="props"
+          >
           </el-tree>
         </el-tab-pane>
         <el-tab-pane label="数据权限">
-          <el-tree :data="dataScopeGrantList"
-                   show-checkbox
-                   node-key="id"
-                   ref="treeDataScope"
-                   :default-checked-keys="dataScopeTreeObj"
-                   :props="props">
+          <el-tree
+            :data="dataScopeGrantList"
+            show-checkbox
+            node-key="id"
+            ref="treeDataScope"
+            :default-checked-keys="dataScopeTreeObj"
+            :props="props"
+          >
           </el-tree>
         </el-tab-pane>
         <el-tab-pane label="接口权限">
-          <el-tree :data="apiScopeGrantList"
-                   show-checkbox
-                   node-key="id"
-                   ref="treeApiScope"
-                   :default-checked-keys="apiScopeTreeObj"
-                   :props="props">
+          <el-tree
+            :data="apiScopeGrantList"
+            show-checkbox
+            node-key="id"
+            ref="treeApiScope"
+            :default-checked-keys="apiScopeTreeObj"
+            :props="props"
+          >
           </el-tree>
         </el-tab-pane>
       </el-tabs>
 
-      <span slot="footer"
-            class="dialog-footer">
+      <span
+        slot="footer"
+        class="dialog-footer"
+      >
         <el-button @click="box = false">取 消</el-button>
-        <el-button type="primary"
-                   @click="submit">确 定</el-button>
+        <el-button
+          type="primary"
+          @click="submit"
+        >确 定</el-button>
       </span>
     </el-dialog>
   </basic-container>
 </template>
 
 <script>
-  import {add, getList, getRole, getRoleTreeById, grant, grantTree, remove, update} from "@/api/system/role";
-  import {getPostList} from "@/api/system/post";
-  import {mapGetters} from "vuex";
-  import website from '@/config/website';
+import { add, getList, getRole, getRoleTreeById, grant, grantTree, remove, update } from "@/api/system/role";
+import { getPostList } from "@/api/system/post";
+import { mapGetters } from "vuex";
+import website from '@/config/website';
 
-  export default {
-    data() {
-      return {
-        form: {},
-        box: false,
-        props: {
-          label: "title",
-          value: "key"
-        },
-        menuGrantList: [],
-        dataScopeGrantList: [],
-        apiScopeGrantList: [],
-        apiGrantList: [],
-        menuTreeObj: [],
-        dataScopeTreeObj: [],
-        apiScopeTreeObj: [],
-        selectionList: [],
-        query: {},
-        loading: true,
-        page: {
-          pageSize: 10,
-          currentPage: 1,
-          total: 0
-        },
-        option: {
-          tip: false,
-          simplePage: true,
-          searchShow: true,
-          searchMenuSpan: 6,
-          tree: true,
-          border: true,
-          index: true,
-          selection: true,
-          viewBtn: true,
-          dialogWidth: 900,
-          dialogClickModal: false,
-          column: [
-            {
-              label: "角色名称",
-              prop: "roleName",
-              search: true,
-              span: 24,
-              rules: [
-                {
-                  required: true,
-                  message: "请输入角色名称",
-                  trigger: "blur"
-                }
-              ]
-            },
-            {
-              label: "所属租户",
-              prop: "tenantId",
-              type: "tree",
-              dicUrl: "/api/blade-system/tenant/select",
-              addDisplay: false,
-              editDisplay: false,
-              viewDisplay: website.tenantMode,
-              span: 24,
-              props: {
-                label: "tenantName",
-                value: "tenantId"
-              },
-              hide: !website.tenantMode,
-              search: website.tenantMode,
-              rules: [{
+export default {
+  data () {
+    return {
+      form: {},
+      box: false,
+      props: {
+        label: "title",
+        value: "key"
+      },
+      menuGrantList: [],
+      dataScopeGrantList: [],
+      apiScopeGrantList: [],
+      apiGrantList: [],
+      menuTreeObj: [],
+      dataScopeTreeObj: [],
+      apiScopeTreeObj: [],
+      selectionList: [],
+      query: {},
+      loading: true,
+      page: {
+        pageSize: 10,
+        currentPage: 1,
+        total: 0
+      },
+      option: {
+        tip: false,
+        simplePage: true,
+        searchShow: true,
+        searchMenuSpan: 6,
+        tree: true,
+        border: true,
+        index: true,
+        selection: true,
+        viewBtn: true,
+        dialogWidth: 900,
+        dialogClickModal: false,
+        column: [
+          {
+            label: "角色名称",
+            prop: "roleName",
+            search: true,
+            span: 24,
+            rules: [
+              {
                 required: true,
-                message: "请输入所属租户",
-                trigger: "click"
-              }]
+                message: "请输入角色名称",
+                trigger: "blur"
+              }
+            ]
+          },
+          {
+            label: "所属租户",
+            prop: "tenantId",
+            type: "tree",
+            dicUrl: "/api/blade-system/tenant/select",
+            addDisplay: false,
+            editDisplay: false,
+            viewDisplay: website.tenantMode,
+            span: 24,
+            props: {
+              label: "tenantName",
+              value: "tenantId"
             },
-            {
-              label: "角色别名",
-              prop: "roleAlias",
-              search: true,
-              span: 24,
-              rules: [
-                {
-                  required: true,
-                  message: "请输入角色别名",
-                  trigger: "blur"
-                }
-              ]
-            },
-            {
-              label: "所属岗位",
-              prop: "pId",
-              type: "tree",
-              hide: true,
-              dicData: [],
-              props: {
-                label: "postName",
-                value: "id"
-              },
-              rules: [{
+            hide: !website.tenantMode,
+            search: website.tenantMode,
+            rules: [{
+              required: true,
+              message: "请输入所属租户",
+              trigger: "click"
+            }]
+          },
+          {
+            label: "角色别名",
+            prop: "roleAlias",
+            search: true,
+            span: 24,
+            rules: [
+              {
                 required: true,
-                message: "请选择所属岗位",
-                trigger: "click"
-              }],
-            },
-            {
-              label: "上级角色",
-              prop: "parentId",
-              dicData: [],
-              type: "tree",
-              hide: true,
-              span: 24,
-              props: {
-                label: "title"
-              },
-              rules: [
-                {
-                  required: false,
-                  message: "请选择上级角色",
-                  trigger: "click"
-                }
-              ]
+                message: "请输入角色别名",
+                trigger: "blur"
+              }
+            ]
+          },
+          // {
+          //   label: "所属岗位",
+          //   prop: "pId",
+          //   type: "tree",
+          //   hide: true,
+          //   dicData: [],
+          //   props: {
+          //     label: "postName",
+          //     value: "id"
+          //   },
+          //   rules: [{
+          //     required: true,
+          //     message: "请选择所属岗位",
+          //     trigger: "click"
+          //   }],
+          // },
+          {
+            label: "上级角色",
+            prop: "parentId",
+            dicData: [],
+            type: "tree",
+            hide: true,
+            span: 24,
+            props: {
+              label: "title"
             },
-            {
-              label: "角色排序",
-              prop: "sort",
-              type: "number",
-              span: 24,
-              rules: [
-                {
-                  required: true,
-                  message: "请输入角色排序",
-                  trigger: "blur"
-                }
-              ]
-            }
-          ]
-        },
-        data: []
+            rules: [
+              {
+                required: false,
+                message: "请选择上级角色",
+                trigger: "click"
+              }
+            ]
+          },
+          {
+            label: "角色排序",
+            prop: "sort",
+            type: "number",
+            span: 24,
+            rules: [
+              {
+                required: true,
+                message: "请输入角色排序",
+                trigger: "blur"
+              }
+            ]
+          }
+        ]
+      },
+      data: []
+    };
+  },
+  computed: {
+    ...mapGetters(["userInfo", "permission"]),
+    permissionList () {
+      return {
+        addBtn: this.vaildData(this.permission.role_add, false),
+        viewBtn: this.vaildData(this.permission.role_view, false),
+        delBtn: this.vaildData(this.permission.role_delete, false),
+        editBtn: this.vaildData(this.permission.role_edit, false)
       };
     },
-    computed: {
-      ...mapGetters(["userInfo", "permission"]),
-      permissionList() {
-        return {
-          addBtn: this.vaildData(this.permission.role_add, false),
-          viewBtn: this.vaildData(this.permission.role_view, false),
-          delBtn: this.vaildData(this.permission.role_delete, false),
-          editBtn: this.vaildData(this.permission.role_edit, false)
-        };
-      },
-      ids() {
-        let ids = [];
-        this.selectionList.forEach(ele => {
-          ids.push(ele.id);
+    ids () {
+      let ids = [];
+      this.selectionList.forEach(ele => {
+        ids.push(ele.id);
 
+      });
+      return ids.join(",");
+    },
+    idsArray () {
+      let ids = [];
+      this.selectionList.forEach(ele => {
+        ids.push(ele.id);
+      });
+      return ids;
+    }
+  },
+  methods: {
+    initData (roleId) {
+      getRoleTreeById(roleId).then(res => {
+        const column = this.findObject(this.option.column, "parentId");
+        column.dicData = res.data.data;
+      });
+      let tenantId = website.tenantId;
+      getPostList(tenantId).then(res => {
+        const column = this.findObject(this.option.column, "pId");
+        column.dicData = res.data.data;
+      });
+    },
+    submit () {
+      const menuList = this.$refs.treeMenu.getCheckedKeys();
+      const dataScopeList = this.$refs.treeDataScope.getCheckedKeys();
+      const apiScopeList = this.$refs.treeApiScope.getCheckedKeys();
+      grant(this.idsArray, menuList, dataScopeList, apiScopeList).then(() => {
+        this.box = false;
+        this.$message({
+          type: "success",
+          message: "操作成功!"
         });
-        return ids.join(",");
-      },
-      idsArray() {
-        let ids = [];
-        this.selectionList.forEach(ele => {
-          ids.push(ele.id);
-        });
-        return ids;
-      }
+        this.onLoad(this.page);
+      });
     },
-    methods: {
-      initData(roleId){
-        getRoleTreeById(roleId).then(res => {
-          const column = this.findObject(this.option.column, "parentId");
-          column.dicData = res.data.data;
+    rowSave (row, done, loading) {
+      add(row).then(() => {
+        this.onLoad(this.page);
+        this.$message({
+          type: "success",
+          message: "操作成功!"
         });
-        let tenantId = website.tenantId;
-        getPostList(tenantId).then(res => {
-          const column = this.findObject(this.option.column, "pId");
-          column.dicData = res.data.data;
+        done();
+      }, error => {
+        window.console.log(error);
+        loading();
+      });
+    },
+    rowUpdate (row, index, done, loading) {
+      update(row).then(() => {
+        this.onLoad(this.page);
+        this.$message({
+          type: "success",
+          message: "操作成功!"
         });
-      },
-      submit() {
-        const menuList = this.$refs.treeMenu.getCheckedKeys();
-        const dataScopeList = this.$refs.treeDataScope.getCheckedKeys();
-        const apiScopeList = this.$refs.treeApiScope.getCheckedKeys();
-        grant(this.idsArray, menuList, dataScopeList, apiScopeList).then(() => {
-          this.box = false;
+        done();
+      }, error => {
+        window.console.log(error);
+        loading();
+      });
+    },
+    rowDel (row) {
+      this.$confirm("确定将选择数据删除?", {
+        confirmButtonText: "确定",
+        cancelButtonText: "取消",
+        type: "warning"
+      })
+        .then(() => {
+          return remove(row.id);
+        })
+        .then(() => {
+          this.onLoad(this.page);
           this.$message({
             type: "success",
             message: "操作成功!"
           });
-          this.onLoad(this.page);
         });
-      },
-      rowSave(row, done, loading) {
-        add(row).then(() => {
-          this.onLoad(this.page);
-          this.$message({
-            type: "success",
-            message: "操作成功!"
+    },
+
+    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();
+    },
+    beforeOpen (done, type) {
+      if (["add", "edit"].includes(type)) {
+        this.initData(this.form.id);
+      }
+      done();
+    },
+    handleRole () {
+      if (this.selectionList.length !== 1) {
+        this.$message.warning("只能选择一条数据");
+        return;
+      }
+      this.menuTreeObj = [];
+      this.dataScopeTreeObj = [];
+      this.apiScopeTreeObj = [];
+      grantTree()
+        .then(res => {
+          this.menuGrantList = res.data.data.menu;
+          this.dataScopeGrantList = res.data.data.dataScope;
+          this.apiScopeGrantList = res.data.data.apiScope;
+          getRole(this.ids).then(res => {
+            this.menuTreeObj = res.data.data.menu;
+            this.dataScopeTreeObj = res.data.data.dataScope;
+            this.apiScopeTreeObj = res.data.data.apiScope;
+            this.box = true;
           });
-          done();
-        }, error => {
-          window.console.log(error);
-          loading();
         });
-      },
-      rowUpdate(row, index, done, loading) {
-        update(row).then(() => {
+    },
+    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: "操作成功!"
           });
-          done();
-        }, error => {
-          window.console.log(error);
-          loading();
+          this.$refs.crud.toggleSelection();
         });
-      },
-      rowDel(row) {
-        this.$confirm("确定将选择数据删除?", {
-          confirmButtonText: "确定",
-          cancelButtonText: "取消",
-          type: "warning"
-        })
-          .then(() => {
-            return remove(row.id);
-          })
-          .then(() => {
-            this.onLoad(this.page);
-            this.$message({
-              type: "success",
-              message: "操作成功!"
-            });
-          });
-      },
-
-      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();
-      },
-      beforeOpen(done, type) {
-        if (["add", "edit"].includes(type)) {
-          this.initData(this.form.id);
-        }
-        done();
-      },
-      handleRole() {
-        if (this.selectionList.length !== 1) {
-          this.$message.warning("只能选择一条数据");
-          return;
-        }
-        this.menuTreeObj = [];
-        this.dataScopeTreeObj = [];
-        this.apiScopeTreeObj = [];
-        grantTree()
-          .then(res => {
-            this.menuGrantList = res.data.data.menu;
-            this.dataScopeGrantList = res.data.data.dataScope;
-            this.apiScopeGrantList = res.data.data.apiScope;
-            getRole(this.ids).then(res => {
-              this.menuTreeObj = res.data.data.menu;
-              this.dataScopeTreeObj = res.data.data.dataScope;
-              this.apiScopeTreeObj = res.data.data.apiScope;
-              this.box = true;
-            });
-          });
-      },
-      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();
-          });
-      },
-      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 => {
-          this.data = res.data.data;
-          this.loading = false;
-          this.selectionClear();
-        });
-      }
+    },
+    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 => {
+        this.data = res.data.data;
+        this.loading = false;
+        this.selectionClear();
+      });
     }
-  };
+  }
+};
 </script>

File diff suppressed because it is too large
+ 848 - 609
src/views/manager/contractinfo/detail.vue


File diff suppressed because it is too large
+ 576 - 372
src/views/manager/projectinfo/detail.vue


+ 974 - 920
src/views/system/user.vue

@@ -4,158 +4,212 @@
       <div class="box">
         <el-scrollbar>
           <basic-container>
-            <avue-tree :option="treeOption" :data="treeData" @node-click="nodeClick"/>
+            <avue-tree
+              :option="treeOption"
+              :data="treeData"
+              @node-click="nodeClick"
+            />
           </basic-container>
         </el-scrollbar>
       </div>
     </el-col>
     <el-col :span="19">
       <basic-container>
-        <avue-crud :option="option"
-                   :search.sync="search"
-                   :table-loading="loading"
-                   :data="data"
-                   ref="crud"
-                   v-model="form"
-                   :permission="permissionList"
-                   @row-del="rowDel"
-                   @row-update="rowUpdate"
-                   @row-save="rowSave"
-                   :before-open="beforeOpen"
-                   :page.sync="page"
-                   @search-change="searchChange"
-                   @search-reset="searchReset"
-                   @selection-change="selectionChange"
-                   @current-change="currentChange"
-                   @size-change="sizeChange"
-                   @refresh-change="refreshChange"
-                   @on-load="onLoad">
+        <avue-crud
+          :option="option"
+          :search.sync="search"
+          :table-loading="loading"
+          :data="data"
+          ref="crud"
+          v-model="form"
+          :permission="permissionList"
+          @row-del="rowDel"
+          @row-update="rowUpdate"
+          @row-save="rowSave"
+          :before-open="beforeOpen"
+          :page.sync="page"
+          @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"
-                       plain
-                       icon="el-icon-delete"
-                       v-if="permission.user_delete"
-                       @click="handleDelete">删 除
+            <el-button
+              type="danger"
+              size="small"
+              plain
+              icon="el-icon-delete"
+              v-if="permission.user_delete"
+              @click="handleDelete"
+            >删 除
             </el-button>
-            <el-button type="info"
-                       size="small"
-                       plain
-                       v-if="permission.user_role"
-                       icon="el-icon-user"
-                       @click="handleGrant">角色配置
+            <el-button
+              type="info"
+              size="small"
+              plain
+              v-if="permission.user_role"
+              icon="el-icon-user"
+              @click="handleGrant"
+            >角色配置
             </el-button>
-            <el-button type="info"
-                       size="small"
-                       plain
-                       v-if="permission.user_reset"
-                       icon="el-icon-refresh"
-                       @click="handleReset">密码重置
+            <el-button
+              type="info"
+              size="small"
+              plain
+              v-if="permission.user_reset"
+              icon="el-icon-refresh"
+              @click="handleReset"
+            >密码重置
             </el-button>
-            <el-button type="info"
-                       size="small"
-                       plain
-                       v-if="userInfo.role_name.includes('admin')"
-                       icon="el-icon-setting"
-                       @click="handlePlatform">平台配置
+            <el-button
+              type="info"
+              size="small"
+              plain
+              v-if="userInfo.role_name.includes('admin')"
+              icon="el-icon-setting"
+              @click="handlePlatform"
+            >平台配置
             </el-button>
-            <el-button type="info"
-                       size="small"
-                       plain
-                       v-if="userInfo.role_name.includes('admin')"
-                       icon="el-icon-coordinate"
-                       @click="handleLock">账号解封
+            <el-button
+              type="info"
+              size="small"
+              plain
+              v-if="userInfo.role_name.includes('admin')"
+              icon="el-icon-coordinate"
+              @click="handleLock"
+            >账号解封
             </el-button>
-            <el-button type="success"
-                       size="small"
-                       plain
-                       v-if="userInfo.role_name.includes('admin')"
-                       icon="el-icon-upload2"
-                       @click="handleImport">导入
+            <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
+              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">
+          <template
+            slot-scope="{row}"
+            slot="tenantName"
+          >
             <el-tag>{{row.tenantName}}</el-tag>
           </template>
-          <template slot-scope="{row}"
-                    slot="roleName">
+          <template
+            slot-scope="{row}"
+            slot="roleName"
+          >
             <el-tag>{{row.roleName}}</el-tag>
           </template>
-          <template slot-scope="{row}"
-                    slot="deptName">
+          <template
+            slot-scope="{row}"
+            slot="deptName"
+          >
             <el-tag>{{row.deptName}}</el-tag>
           </template>
-          <template slot-scope="{row}"
-                    slot="userTypeName">
+          <template
+            slot-scope="{row}"
+            slot="userTypeName"
+          >
             <el-tag>{{row.userTypeName}}</el-tag>
           </template>
         </avue-crud>
-        <el-dialog title="用户角色配置"
-                   append-to-body
-                   :visible.sync="roleBox"
-                   width="345px">
+        <el-dialog
+          title="用户角色配置"
+          append-to-body
+          :visible.sync="roleBox"
+          width="345px"
+        >
 
-          <el-tree :data="roleGrantList"
-                   show-checkbox
-                   check-strictly
-                   default-expand-all
-                   node-key="id"
-                   ref="treeRole"
-                   :default-checked-keys="roleTreeObj"
-                   :props="props">
+          <el-tree
+            :data="roleGrantList"
+            show-checkbox
+            check-strictly
+            default-expand-all
+            node-key="id"
+            ref="treeRole"
+            :default-checked-keys="roleTreeObj"
+            :props="props"
+          >
           </el-tree>
 
-          <span slot="footer" class="dialog-footer">
+          <span
+            slot="footer"
+            class="dialog-footer"
+          >
             <el-button @click="roleBox = false">取 消</el-button>
-            <el-button type="primary"
-                       @click="submitRole">确 定</el-button>
+            <el-button
+              type="primary"
+              @click="submitRole"
+            >确 定</el-button>
           </span>
         </el-dialog>
-        <el-dialog title="用户数据导入"
-                   append-to-body
-                   :visible.sync="excelBox"
-                   width="555px">
-          <avue-form :option="excelOption" v-model="excelForm" :upload-after="uploadAfter">
+        <el-dialog
+          title="用户数据导入"
+          append-to-body
+          :visible.sync="excelBox"
+          width="555px"
+        >
+          <avue-form
+            :option="excelOption"
+            v-model="excelForm"
+            :upload-after="uploadAfter"
+          >
             <template slot="excelTemplate">
-              <el-button type="primary" @click="handleTemplate">
+              <el-button
+                type="primary"
+                @click="handleTemplate"
+              >
                 点击下载<i class="el-icon-download el-icon--right"></i>
               </el-button>
             </template>
           </avue-form>
         </el-dialog>
-        <el-dialog title="用户平台配置"
-                   append-to-body
-                   :visible.sync="platformBox">
-          <avue-crud :option="platformOption"
-                     :table-loading="platformLoading"
-                     :data="platformData"
-                     ref="platformCrud"
-                     v-model="platformForm"
-                     :before-open="platformBeforeOpen"
-                     :page.sync="platformPage"
-                     :permission="platformPermissionList"
-                     @row-update="platformRowUpdate"
-                     @search-change="platformSearchChange"
-                     @search-reset="platformSearchReset"
-                     @selection-change="platformSelectionChange"
-                     @current-change="platformCurrentChange"
-                     @size-change="platformSizeChange"
-                     @refresh-change="platformRefreshChange"
-                     @on-load="platformOnLoad">
-            <template slot-scope="{row}"
-                      slot="tenantName">
+        <el-dialog
+          title="用户平台配置"
+          append-to-body
+          :visible.sync="platformBox"
+        >
+          <avue-crud
+            :option="platformOption"
+            :table-loading="platformLoading"
+            :data="platformData"
+            ref="platformCrud"
+            v-model="platformForm"
+            :before-open="platformBeforeOpen"
+            :page.sync="platformPage"
+            :permission="platformPermissionList"
+            @row-update="platformRowUpdate"
+            @search-change="platformSearchChange"
+            @search-reset="platformSearchReset"
+            @selection-change="platformSelectionChange"
+            @current-change="platformCurrentChange"
+            @size-change="platformSizeChange"
+            @refresh-change="platformRefreshChange"
+            @on-load="platformOnLoad"
+          >
+            <template
+              slot-scope="{row}"
+              slot="tenantName"
+            >
               <el-tag>{{row.tenantName}}</el-tag>
             </template>
-            <template slot-scope="{row}"
-                      slot="userTypeName">
+            <template
+              slot-scope="{row}"
+              slot="userTypeName"
+            >
               <el-tag>{{row.userTypeName}}</el-tag>
             </template>
           </avue-crud>
@@ -166,867 +220,867 @@
 </template>
 
 <script>
-  import {
-    getList,
-    getUser,
-    getUserPlatform,
-    remove,
-    update,
-    updatePlatform,
-    add,
-    grant,
-    resetPassword, unlock
-  } from "@/api/system/user";
-  import {exportBlob} from "@/api/common";
-  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';
-  import {getToken} from '@/util/auth';
-  import {downloadXls} from "@/util/util";
-  import {dateNow} from "@/util/date";
-  import NProgress from 'nprogress';
-  import 'nprogress/nprogress.css';
+import {
+  getList,
+  getUser,
+  getUserPlatform,
+  remove,
+  update,
+  updatePlatform,
+  add,
+  grant,
+  resetPassword, unlock
+} from "@/api/system/user";
+import { exportBlob } from "@/api/common";
+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';
+import { getToken } from '@/util/auth';
+import { downloadXls } from "@/util/util";
+import { dateNow } from "@/util/date";
+import NProgress from 'nprogress';
+import 'nprogress/nprogress.css';
 
-  export default {
-    data() {
-      const validatePass = (rule, value, callback) => {
-        if (value === '') {
-          callback(new Error('请输入密码'));
-        } else {
-          callback();
-        }
-      };
-      const validatePass2 = (rule, value, callback) => {
-        if (value === '') {
-          callback(new Error('请再次输入密码'));
-        } else if (value !== this.form.password) {
-          callback(new Error('两次输入密码不一致!'));
-        } else {
-          callback();
-        }
-      };
-      return {
-        form: {},
-        search:{},
-        roleBox: false,
-        excelBox: false,
-        platformBox: false,
-        initFlag: true,
-        selectionList: [],
-        query: {},
-        loading: true,
-        platformLoading: false,
-        page: {
-          pageSize: 10,
-          currentPage: 1,
-          total: 0
-        },
-        platformPage: {
-          pageSize: 10,
-          currentPage: 1,
-          total: 0
-        },
-        init: {
-          roleTree: [],
-          deptTree: [],
+export default {
+  data () {
+    const validatePass = (rule, value, callback) => {
+      if (value === '') {
+        callback(new Error('请输入密码'));
+      } else {
+        callback();
+      }
+    };
+    const validatePass2 = (rule, value, callback) => {
+      if (value === '') {
+        callback(new Error('请再次输入密码'));
+      } else if (value !== this.form.password) {
+        callback(new Error('两次输入密码不一致!'));
+      } else {
+        callback();
+      }
+    };
+    return {
+      form: {},
+      search: {},
+      roleBox: false,
+      excelBox: false,
+      platformBox: false,
+      initFlag: true,
+      selectionList: [],
+      query: {},
+      loading: true,
+      platformLoading: false,
+      page: {
+        pageSize: 10,
+        currentPage: 1,
+        total: 0
+      },
+      platformPage: {
+        pageSize: 10,
+        currentPage: 1,
+        total: 0
+      },
+      init: {
+        roleTree: [],
+        deptTree: [],
+      },
+      props: {
+        label: "title",
+        value: "key"
+      },
+      roleGrantList: [],
+      roleTreeObj: [],
+      treeDeptId: '',
+      treeData: [],
+      treeOption: {
+        nodeKey: 'id',
+        lazy: true,
+        treeLoad: function (node, resolve) {
+          const parentId = (node.level === 0) ? 0 : node.data.id;
+          getDeptLazyTree(parentId).then(res => {
+            resolve(res.data.data.map(item => {
+              return {
+                ...item,
+                leaf: !item.hasChildren
+              }
+            }))
+          });
         },
+        addBtn: false,
+        menu: false,
+        size: 'small',
         props: {
-          label: "title",
-          value: "key"
-        },
-        roleGrantList: [],
-        roleTreeObj: [],
-        treeDeptId: '',
-        treeData: [],
-        treeOption: {
-          nodeKey: 'id',
-          lazy: true,
-          treeLoad: function (node, resolve) {
-            const parentId = (node.level === 0) ? 0 : node.data.id;
-            getDeptLazyTree(parentId).then(res => {
-              resolve(res.data.data.map(item => {
-                return {
-                  ...item,
-                  leaf: !item.hasChildren
-                }
-              }))
-            });
+          labelText: '标题',
+          label: 'title',
+          value: 'value',
+          children: 'children'
+        }
+      },
+      option: {
+        height: 'auto',
+        calcHeight: 80,
+        tip: false,
+        searchShow: true,
+        searchMenuSpan: 6,
+        border: true,
+        index: true,
+        selection: true,
+        viewBtn: true,
+        dialogType: 'drawer',
+        dialogClickModal: false,
+        column: [
+          {
+            label: "登录账号",
+            prop: "account",
+            search: true,
+            display: false
           },
-          addBtn: false,
-          menu: false,
-          size: 'small',
-          props: {
-            labelText: '标题',
-            label: 'title',
-            value: 'value',
-            children: 'children'
-          }
-        },
-        option: {
-          height: 'auto',
-          calcHeight: 80,
-          tip: false,
-          searchShow: true,
-          searchMenuSpan: 6,
-          border: true,
-          index: true,
-          selection: true,
-          viewBtn: true,
-          dialogType: 'drawer',
-          dialogClickModal: false,
-          column: [
-            {
-              label: "登录账号",
-              prop: "account",
-              search: true,
-              display: false
-            },
-            {
-              label: "所属租户",
-              prop: "tenantName",
-              slot: true,
-              display: false
-            },
-            {
-              label: "用户姓名",
-              prop: "realName",
-              search: true,
-              display: false
-            },
-            {
-              label: "所属角色",
-              prop: "roleName",
-              slot: true,
-              display: false
-            },
-            {
-              label: "所属部门",
-              prop: "deptName",
-              slot: true,
-              display: false
-            },
-            {
-              label: "用户平台",
-              prop: "userTypeName",
-              slot: true,
-              display: false
-            },
-            {
-              label: "用户平台",
-              type: "select",
-              dicUrl: "/api/blade-system/dict/dictionary?code=user_type",
-              props: {
-                label: "dictValue",
-                value: "dictKey"
-              },
-              dataType: "number",
-              search: true,
-              hide: true,
-              display: false,
-              prop: "userType",
-              rules: [{
-                required: true,
-                message: "请选择用户平台",
-                trigger: "blur"
-              }]
+          {
+            label: "所属租户",
+            prop: "tenantName",
+            slot: true,
+            display: false
+          },
+          {
+            label: "用户姓名",
+            prop: "realName",
+            search: true,
+            display: false
+          },
+          {
+            label: "所属角色",
+            prop: "roleName",
+            slot: true,
+            display: false
+          },
+          {
+            label: "所属部门",
+            prop: "deptName",
+            slot: true,
+            display: false
+          },
+          {
+            label: "用户平台",
+            prop: "userTypeName",
+            slot: true,
+            display: false
+          },
+          {
+            label: "用户平台",
+            type: "select",
+            dicUrl: "/api/blade-system/dict/dictionary?code=user_type",
+            props: {
+              label: "dictValue",
+              value: "dictKey"
             },
-          ],
-          group: [
-            {
-              label: '基础信息',
-              prop: 'baseInfo',
-              icon: 'el-icon-user-solid',
-              column: [
-                {
-                  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,
-                  rules: [{
-                    required: true,
-                    message: "请输入所属租户",
-                    trigger: "click"
-                  }],
-                  span: 24,
+            dataType: "number",
+            search: true,
+            hide: true,
+            display: false,
+            prop: "userType",
+            rules: [{
+              required: true,
+              message: "请选择用户平台",
+              trigger: "blur"
+            }]
+          },
+        ],
+        group: [
+          {
+            label: '基础信息',
+            prop: 'baseInfo',
+            icon: 'el-icon-user-solid',
+            column: [
+              {
+                label: "所属租户",
+                prop: "tenantId",
+                type: "tree",
+                dicUrl: "/api/blade-system/tenant/select",
+                props: {
+                  label: "tenantName",
+                  value: "tenantId"
                 },
-                {
-                  label: "登录账号",
-                  prop: "account",
-                  rules: [{
-                    required: true,
-                    message: "请输入登录账号",
-                    trigger: "blur"
-                  }],
+                hide: !website.tenantMode,
+                addDisplay: website.tenantMode,
+                editDisplay: website.tenantMode,
+                viewDisplay: website.tenantMode,
+                rules: [{
+                  required: true,
+                  message: "请输入所属租户",
+                  trigger: "click"
+                }],
+                span: 24,
+              },
+              {
+                label: "登录账号",
+                prop: "account",
+                rules: [{
+                  required: true,
+                  message: "请输入登录账号",
+                  trigger: "blur"
+                }],
+              },
+              {
+                label: "用户平台",
+                type: "select",
+                dicUrl: "/api/blade-system/dict/dictionary?code=user_type",
+                props: {
+                  label: "dictValue",
+                  value: "dictKey"
                 },
-                {
-                  label: "用户平台",
-                  type: "select",
-                  dicUrl: "/api/blade-system/dict/dictionary?code=user_type",
-                  props: {
-                    label: "dictValue",
-                    value: "dictKey"
+                dataType: "number",
+                slot: true,
+                prop: "userType",
+                rules: [{
+                  required: true,
+                  message: "请选择用户平台",
+                  trigger: "blur"
+                }]
+              },
+              {
+                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: 'detailInfo',
+            icon: 'el-icon-s-order',
+            column: [
+              {
+                label: "用户昵称",
+                prop: "name",
+                hide: true,
+                rules: [{
+                  required: true,
+                  message: "请输入用户昵称",
+                  trigger: "blur"
+                }]
+              },
+              {
+                label: "用户姓名",
+                prop: "realName",
+                rules: [{
+                  required: true,
+                  message: "请输入用户姓名",
+                  trigger: "blur"
+                }, {
+                  min: 2,
+                  max: 5,
+                  message: '姓名长度在2到5个字符'
+                }]
+              },
+              {
+                label: "手机号码",
+                prop: "phone",
+                overHidden: true
+              },
+              {
+                label: "电子邮箱",
+                prop: "email",
+                hide: true,
+                overHidden: true
+              },
+              {
+                label: "用户性别",
+                prop: "sex",
+                type: "select",
+                dicData: [
+                  {
+                    label: "男",
+                    value: 1
                   },
-                  dataType: "number",
-                  slot: true,
-                  prop: "userType",
-                  rules: [{
-                    required: true,
-                    message: "请选择用户平台",
-                    trigger: "blur"
-                  }]
-                },
-                {
-                  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: 'detailInfo',
-              icon: 'el-icon-s-order',
-              column: [
-                {
-                  label: "用户昵称",
-                  prop: "name",
-                  hide: true,
-                  rules: [{
-                    required: true,
-                    message: "请输入用户昵称",
-                    trigger: "blur"
-                  }]
-                },
-                {
-                  label: "用户姓名",
-                  prop: "realName",
-                  rules: [{
-                    required: true,
-                    message: "请输入用户姓名",
-                    trigger: "blur"
-                  }, {
-                    min: 2,
-                    max: 5,
-                    message: '姓名长度在2到5个字符'
-                  }]
-                },
-                {
-                  label: "手机号码",
-                  prop: "phone",
-                  overHidden: true
-                },
-                {
-                  label: "电子邮箱",
-                  prop: "email",
-                  hide: true,
-                  overHidden: true
-                },
-                {
-                  label: "用户性别",
-                  prop: "sex",
-                  type: "select",
-                  dicData: [
-                    {
-                      label: "男",
-                      value: 1
-                    },
-                    {
-                      label: "女",
-                      value: 2
-                    },
-                    {
-                      label: "未知",
-                      value: 3
-                    }
-                  ],
-                  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: "statusName",
-                  hide: true,
-                  display: false
-                }
-              ]
-            },
-            {
-              label: '职责信息',
-              prop: 'dutyInfo',
-              icon: 'el-icon-s-custom',
-              column: [
-                {
-                  label: "用户编号",
-                  prop: "code",
-                },
-                {
-                  label: "所属角色",
-                  prop: "roleId",
-                  multiple: true,
-                  type: "tree",
-                  dicData: [],
-                  props: {
-                    label: "title"
+                  {
+                    label: "女",
+                    value: 2
                   },
-                  checkStrictly: true,
-                  slot: true,
-                  rules: [{
-                    required: true,
-                    message: "请选择所属角色",
-                    trigger: "click"
-                  }]
+                  {
+                    label: "未知",
+                    value: 3
+                  }
+                ],
+                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: "statusName",
+                hide: true,
+                display: false
+              }
+            ]
+          },
+          {
+            label: '职责信息',
+            prop: 'dutyInfo',
+            icon: 'el-icon-s-custom',
+            column: [
+              {
+                label: "用户编号",
+                prop: "code",
+              },
+              {
+                label: "所属角色",
+                prop: "roleId",
+                multiple: true,
+                type: "tree",
+                dicData: [],
+                props: {
+                  label: "title"
                 },
-                {
-                  label: "所属部门",
-                  prop: "deptId",
-                  type: "tree",
-                  multiple: true,
-                  dicData: [],
-                  props: {
-                    label: "title"
-                  },
-                  checkStrictly: true,
-                  slot: true,
-                  rules: [{
-                    required: true,
-                    message: "请选择所属部门",
-                    trigger: "click"
-                  }]
+                checkStrictly: true,
+                slot: true,
+                rules: [{
+                  required: true,
+                  message: "请选择所属角色",
+                  trigger: "click"
+                }]
+              },
+              {
+                label: "所属部门",
+                prop: "deptId",
+                type: "tree",
+                multiple: true,
+                dicData: [],
+                props: {
+                  label: "title"
                 },
-                {
-                  label: "所属岗位",
-                  prop: "postId",
-                  type: "tree",
-                  multiple: true,
-                  dicData: [],
-                  props: {
-                    label: "postName",
-                    value: "id"
-                  },
-                  rules: [{
-                    required: true,
-                    message: "请选择所属岗位",
-                    trigger: "click"
-                  }],
+                checkStrictly: true,
+                slot: true,
+                rules: [{
+                  required: true,
+                  message: "请选择所属部门",
+                  trigger: "click"
+                }]
+              },
+              {
+                label: "所属岗位",
+                prop: "postId",
+                type: "tree",
+                multiple: true,
+                dicData: [],
+                props: {
+                  label: "postName",
+                  value: "id"
                 },
-              ]
-            },
-          ]
-        },
-        data: [],
-        platformQuery: {},
-        platformSelectionList: [],
-        platformData: [],
-        platformForm: {},
-        platformOption: {
-          tip: false,
-          searchShow: true,
-          searchMenuSpan: 6,
-          border: true,
-          index: true,
-          selection: true,
-          viewBtn: true,
-          dialogClickModal: false,
-          menuWidth: 120,
-          editBtnText: '配置',
-          column: [
-            {
-              label: "登录账号",
-              prop: "account",
-              search: true,
-              display: false
-            },
-            {
-              label: "所属租户",
-              prop: "tenantName",
-              slot: true,
-              display: false
-            },
-            {
-              label: "用户姓名",
-              prop: "realName",
-              search: true,
-              display: false
+                rules: [{
+                  required: true,
+                  message: "请选择所属岗位",
+                  trigger: "click"
+                }],
+              },
+            ]
+          },
+        ]
+      },
+      data: [],
+      platformQuery: {},
+      platformSelectionList: [],
+      platformData: [],
+      platformForm: {},
+      platformOption: {
+        tip: false,
+        searchShow: true,
+        searchMenuSpan: 6,
+        border: true,
+        index: true,
+        selection: true,
+        viewBtn: true,
+        dialogClickModal: false,
+        menuWidth: 120,
+        editBtnText: '配置',
+        column: [
+          {
+            label: "登录账号",
+            prop: "account",
+            search: true,
+            display: false
+          },
+          {
+            label: "所属租户",
+            prop: "tenantName",
+            slot: true,
+            display: false
+          },
+          {
+            label: "用户姓名",
+            prop: "realName",
+            search: true,
+            display: false
+          },
+          {
+            label: "用户平台",
+            prop: "userTypeName",
+            slot: true,
+            display: false
+          },
+          {
+            label: "用户平台",
+            type: "select",
+            dicUrl: "/api/blade-system/dict/dictionary?code=user_type",
+            props: {
+              label: "dictValue",
+              value: "dictKey"
             },
-            {
-              label: "用户平台",
-              prop: "userTypeName",
-              slot: true,
-              display: false
+            dataType: "number",
+            search: true,
+            hide: true,
+            display: false,
+            prop: "userType",
+            rules: [{
+              required: true,
+              message: "请选择用户平台",
+              trigger: "blur"
+            }]
+          },
+          {
+            label: "用户拓展",
+            prop: "userExt",
+            type: "textarea",
+            minRows: 8,
+            span: 24,
+            overHidden: true,
+            row: true,
+            hide: true,
+          },
+        ],
+      },
+      excelForm: {},
+      excelOption: {
+        submitBtn: false,
+        emptyBtn: false,
+        column: [
+          {
+            label: '模板上传',
+            prop: 'excelFile',
+            type: 'upload',
+            drag: true,
+            loadText: '模板上传中,请稍等',
+            span: 24,
+            propsHttp: {
+              res: 'data'
             },
-            {
-              label: "用户平台",
-              type: "select",
-              dicUrl: "/api/blade-system/dict/dictionary?code=user_type",
-              props: {
-                label: "dictValue",
-                value: "dictKey"
+            tip: '请上传 .xls,.xlsx 标准格式文件',
+            action: "/api/blade-user/import-user"
+          },
+          {
+            label: "数据覆盖",
+            prop: "isCovered",
+            type: "switch",
+            align: "center",
+            width: 80,
+            dicData: [
+              {
+                label: "否",
+                value: 0
               },
-              dataType: "number",
-              search: true,
-              hide: true,
-              display: false,
-              prop: "userType",
-              rules: [{
+              {
+                label: "是",
+                value: 1
+              }
+            ],
+            value: 0,
+            slot: true,
+            rules: [
+              {
                 required: true,
-                message: "请选择用户平台",
+                message: "请选择是否覆盖",
                 trigger: "blur"
-              }]
-            },
-            {
-              label: "用户拓展",
-              prop: "userExt",
-              type: "textarea",
-              minRows: 8,
-              span: 24,
-              overHidden: true,
-              row: true,
-              hide: true,
-            },
-          ],
-        },
-        excelForm: {},
-        excelOption: {
-          submitBtn: false,
-          emptyBtn: false,
-          column: [
-            {
-              label: '模板上传',
-              prop: 'excelFile',
-              type: 'upload',
-              drag: true,
-              loadText: '模板上传中,请稍等',
-              span: 24,
-              propsHttp: {
-                res: 'data'
-              },
-              tip: '请上传 .xls,.xlsx 标准格式文件',
-              action: "/api/blade-user/import-user"
-            },
-            {
-              label: "数据覆盖",
-              prop: "isCovered",
-              type: "switch",
-              align: "center",
-              width: 80,
-              dicData: [
-                {
-                  label: "否",
-                  value: 0
-                },
-                {
-                  label: "是",
-                  value: 1
-                }
-              ],
-              value: 0,
-              slot: true,
-              rules: [
-                {
-                  required: true,
-                  message: "请选择是否覆盖",
-                  trigger: "blur"
-                }
-              ]
-            },
-            {
-              label: '模板下载',
-              prop: 'excelTemplate',
-              formslot: true,
-              span: 24,
-            }
-          ]
-        }
-      };
+              }
+            ]
+          },
+          {
+            label: '模板下载',
+            prop: 'excelTemplate',
+            formslot: true,
+            span: 24,
+          }
+        ]
+      }
+    };
+  },
+  watch: {
+    'form.tenantId' () {
+      if (this.form.tenantId !== '' && this.initFlag) {
+        this.initData(this.form.tenantId);
+      }
     },
-    watch: {
-      'form.tenantId'() {
-        if (this.form.tenantId !== '' && this.initFlag) {
-          this.initData(this.form.tenantId);
-        }
-      },
-      'excelForm.isCovered'() {
-        if (this.excelForm.isCovered !== '') {
-          const column = this.findObject(this.excelOption.column, "excelFile");
-          column.action = `/api/blade-user/import-user?isCovered=${this.excelForm.isCovered}`;
-        }
+    'excelForm.isCovered' () {
+      if (this.excelForm.isCovered !== '') {
+        const column = this.findObject(this.excelOption.column, "excelFile");
+        column.action = `/api/blade-user/import-user?isCovered=${this.excelForm.isCovered}`;
       }
+    }
+  },
+  computed: {
+    ...mapGetters(["userInfo", "permission"]),
+    permissionList () {
+      return {
+        addBtn: this.vaildData(this.permission.user_add, false),
+        viewBtn: this.vaildData(this.permission.user_view, false),
+        delBtn: this.vaildData(this.permission.user_delete, false),
+        editBtn: this.vaildData(this.permission.user_edit, false)
+      };
     },
-    computed: {
-      ...mapGetters(["userInfo", "permission"]),
-      permissionList() {
-        return {
-          addBtn: this.vaildData(this.permission.user_add, false),
-          viewBtn: this.vaildData(this.permission.user_view, false),
-          delBtn: this.vaildData(this.permission.user_delete, false),
-          editBtn: this.vaildData(this.permission.user_edit, false)
-        };
-      },
-      platformPermissionList() {
-        return {
-          addBtn: false,
-          viewBtn: false,
-          delBtn: false,
-          editBtn: this.vaildData(this.permission.user_edit, false)
-        };
-      },
-      ids() {
-        let ids = [];
-        this.selectionList.forEach(ele => {
-          ids.push(ele.id);
-        });
-        return ids.join(",");
-      },
+    platformPermissionList () {
+      return {
+        addBtn: false,
+        viewBtn: false,
+        delBtn: false,
+        editBtn: this.vaildData(this.permission.user_edit, false)
+      };
     },
-    mounted() {
-      // 非租户模式默认加载管理组数据
-      if (!website.tenantMode) {
-        this.initData(website.tenantId);
-      }
+    ids () {
+      let ids = [];
+      this.selectionList.forEach(ele => {
+        ids.push(ele.id);
+      });
+      return ids.join(",");
     },
-    methods: {
-      nodeClick(data) {
-        this.treeDeptId = data.id;
-        this.page.currentPage = 1;
-        this.onLoad(this.page);
-      },
-      initData(tenantId) {
-        getRoleTree(tenantId).then(res => {
-          const column = this.findObject(this.option.group, "roleId");
-          column.dicData = res.data.data;
+  },
+  mounted () {
+    // 非租户模式默认加载管理组数据
+    if (!website.tenantMode) {
+      this.initData(website.tenantId);
+    }
+  },
+  methods: {
+    nodeClick (data) {
+      this.treeDeptId = data.id;
+      this.page.currentPage = 1;
+      this.onLoad(this.page);
+    },
+    initData (tenantId) {
+      getRoleTree(tenantId).then(res => {
+        const column = this.findObject(this.option.group, "roleId");
+        column.dicData = res.data.data;
+      });
+      getDeptTree(tenantId).then(res => {
+        const column = this.findObject(this.option.group, "deptId");
+        column.dicData = res.data.data;
+      });
+      getPostList(tenantId).then(res => {
+        const column = this.findObject(this.option.group, "postId");
+        column.dicData = res.data.data;
+      });
+    },
+    submitRole () {
+      const roleList = this.$refs.treeRole.getCheckedKeys().join(",");
+      grant(this.ids, roleList).then(() => {
+        this.roleBox = false;
+        this.$message({
+          type: "success",
+          message: "操作成功!"
         });
-        getDeptTree(tenantId).then(res => {
-          const column = this.findObject(this.option.group, "deptId");
-          column.dicData = res.data.data;
+        this.onLoad(this.page);
+      });
+    },
+    rowSave (row, done, loading) {
+      row.deptId = row.deptId.join(",");
+      row.roleId = row.roleId.join(",");
+      row.postId = row.postId.join(",");
+      add(row).then(() => {
+        this.initFlag = false;
+        this.onLoad(this.page);
+        this.$message({
+          type: "success",
+          message: "操作成功!"
         });
-        getPostList(tenantId).then(res => {
-          const column = this.findObject(this.option.group, "postId");
-          column.dicData = res.data.data;
+        done();
+      }, error => {
+        window.console.log(error);
+        loading();
+      });
+    },
+    rowUpdate (row, index, done, loading) {
+      row.deptId = row.deptId.join(",");
+      row.roleId = row.roleId.join(",");
+      row.postId = row.postId.join(",");
+      update(row).then(() => {
+        this.initFlag = false;
+        this.onLoad(this.page);
+        this.$message({
+          type: "success",
+          message: "操作成功!"
         });
-      },
-      submitRole() {
-        const roleList = this.$refs.treeRole.getCheckedKeys().join(",");
-        grant(this.ids, roleList).then(() => {
-          this.roleBox = false;
+        done();
+      }, error => {
+        window.console.log(error);
+        loading();
+      });
+    },
+    rowDel (row) {
+      this.$confirm("确定将选择数据删除?", {
+        confirmButtonText: "确定",
+        cancelButtonText: "取消",
+        type: "warning"
+      })
+        .then(() => {
+          return remove(row.id);
+        })
+        .then(() => {
+          this.onLoad(this.page);
           this.$message({
             type: "success",
             message: "操作成功!"
           });
-          this.onLoad(this.page);
         });
-      },
-      rowSave(row, done, loading) {
-        row.deptId = row.deptId.join(",");
-        row.roleId = row.roleId.join(",");
-        row.postId = row.postId.join(",");
-        add(row).then(() => {
-          this.initFlag = false;
+    },
+    searchReset () {
+      this.query = {};
+      this.treeDeptId = '';
+      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();
+    },
+    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: "操作成功!"
           });
-          done();
-        }, error => {
-          window.console.log(error);
-          loading();
+          this.$refs.crud.toggleSelection();
         });
-      },
-      rowUpdate(row, index, done, loading) {
-        row.deptId = row.deptId.join(",");
-        row.roleId = row.roleId.join(",");
-        row.postId = row.postId.join(",");
-        update(row).then(() => {
-          this.initFlag = false;
-          this.onLoad(this.page);
+    },
+    handleReset () {
+      if (this.selectionList.length === 0) {
+        this.$message.warning("请选择至少一条数据");
+        return;
+      }
+      this.$confirm("确定将选择账号密码重置为123456?", {
+        confirmButtonText: "确定",
+        cancelButtonText: "取消",
+        type: "warning"
+      })
+        .then(() => {
+          return resetPassword(this.ids);
+        })
+        .then(() => {
           this.$message({
             type: "success",
             message: "操作成功!"
           });
-          done();
-        }, error => {
-          window.console.log(error);
-          loading();
-        });
-      },
-      rowDel(row) {
-        this.$confirm("确定将选择数据删除?", {
-          confirmButtonText: "确定",
-          cancelButtonText: "取消",
-          type: "warning"
-        })
-          .then(() => {
-            return remove(row.id);
-          })
-          .then(() => {
-            this.onLoad(this.page);
-            this.$message({
-              type: "success",
-              message: "操作成功!"
-            });
-          });
-      },
-      searchReset() {
-        this.query = {};
-        this.treeDeptId = '';
-        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();
-      },
-      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();
-          });
-      },
-      handleReset() {
-        if (this.selectionList.length === 0) {
-          this.$message.warning("请选择至少一条数据");
-          return;
-        }
-        this.$confirm("确定将选择账号密码重置为123456?", {
-          confirmButtonText: "确定",
-          cancelButtonText: "取消",
-          type: "warning"
-        })
-          .then(() => {
-            return resetPassword(this.ids);
-          })
-          .then(() => {
-            this.$message({
-              type: "success",
-              message: "操作成功!"
-            });
-            this.$refs.crud.toggleSelection();
-          });
-      },
-      handleGrant() {
-        if (this.selectionList.length === 0) {
-          this.$message.warning("请选择至少一条数据");
-          return;
-        }
-        this.roleTreeObj = [];
-        if (this.selectionList.length === 1) {
-          this.roleTreeObj = this.selectionList[0].roleId.split(",");
-        }
-        getRoleTree().then(res => {
-          this.roleGrantList = res.data.data;
-          this.roleBox = true;
-        });
-      },
-      handlePlatform() {
-        this.platformBox = true;
-      },
-      handleLock() {
-        if (this.selectionList.length === 0) {
-          this.$message.warning("请选择至少一条数据");
-          return;
-        }
-        this.$confirm("确定将选择账号解封?", {
-          confirmButtonText: "确定",
-          cancelButtonText: "取消",
-          type: "warning"
-        })
-          .then(() => {
-            return unlock(this.ids);
-          })
-          .then(() => {
-            this.$message({
-              type: "success",
-              message: "操作成功!"
-            });
-          });
-      },
-      handleImport() {
-        this.excelBox = true;
-      },
-      uploadAfter(res, done, loading, column) {
-        window.console.log(column);
-        this.excelBox = false;
-        this.refreshChange();
-        done();
-      },
-      handleExport() {
-        this.$confirm("是否导出用户数据?", "提示", {
-          confirmButtonText: "确定",
-          cancelButtonText: "取消",
-          type: "warning"
-        }).then(() => {
-          NProgress.start();
-          exportBlob(`/api/blade-user/export-user?${this.website.tokenHeader}=${getToken()}&account=${this.search.account}&realName=${this.search.realName}`).then(res => {
-            downloadXls(res.data, `用户数据表${dateNow()}.xlsx`);
-            NProgress.done();
-          })
+          this.$refs.crud.toggleSelection();
         });
-      },
-      handleTemplate() {
-        exportBlob(`/api/blade-user/export-template?${this.website.tokenHeader}=${getToken()}`).then(res => {
-          downloadXls(res.data, "用户数据模板.xlsx");
+    },
+    handleGrant () {
+      if (this.selectionList.length === 0) {
+        this.$message.warning("请选择至少一条数据");
+        return;
+      }
+      this.roleTreeObj = [];
+      if (this.selectionList.length === 1) {
+        this.roleTreeObj = this.selectionList[0].roleId.split(",");
+      }
+      getRoleTree().then(res => {
+        this.roleGrantList = res.data.data;
+        this.roleBox = true;
+      });
+    },
+    handlePlatform () {
+      this.platformBox = true;
+    },
+    handleLock () {
+      if (this.selectionList.length === 0) {
+        this.$message.warning("请选择至少一条数据");
+        return;
+      }
+      this.$confirm("确定将选择账号解封?", {
+        confirmButtonText: "确定",
+        cancelButtonText: "取消",
+        type: "warning"
+      })
+        .then(() => {
+          return unlock(this.ids);
         })
-      },
-      beforeOpen(done, type) {
-        if (["edit", "view"].includes(type)) {
-          getUser(this.form.id).then(res => {
-            this.form = res.data.data;
-            if(this.form.hasOwnProperty("deptId")){
-              this.form.deptId = this.form.deptId.split(",");
-            }
-            if(this.form.hasOwnProperty("roleId")){
-              this.form.roleId = this.form.roleId.split(",");
-            }
-            if(this.form.hasOwnProperty("postId")){
-              this.form.postId = this.form.postId.split(",");
-            }
-          });
-        }
-        this.initFlag = true;
-        done();
-      },
-      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), this.treeDeptId).then(res => {
-          const data = res.data.data;
-          this.page.total = data.total;
-          this.data = data.records;
-          this.loading = false;
-          this.selectionClear();
-        });
-      },
-      platformRowUpdate(row, index, done, loading) {
-        updatePlatform(row.id, row.userType, row.userExt).then(() => {
-          this.platformOnLoad(this.platformPage);
+        .then(() => {
           this.$message({
             type: "success",
             message: "操作成功!"
           });
-          done();
-        }, error => {
-          window.console.log(error);
-          loading();
         });
-      },
-      platformBeforeOpen(done, type) {
-        if (["edit", "view"].includes(type)) {
-          getUserPlatform(this.platformForm.id).then(res => {
-            this.platformForm = res.data.data;
-          });
-        }
-        done();
-      },
-      platformSearchReset() {
-        this.platformQuery = {};
+    },
+    handleImport () {
+      this.excelBox = true;
+    },
+    uploadAfter (res, done, loading, column) {
+      window.console.log(column);
+      this.excelBox = false;
+      this.refreshChange();
+      done();
+    },
+    handleExport () {
+      this.$confirm("是否导出用户数据?", "提示", {
+        confirmButtonText: "确定",
+        cancelButtonText: "取消",
+        type: "warning"
+      }).then(() => {
+        NProgress.start();
+        exportBlob(`/api/blade-user/export-user?${this.website.tokenHeader}=${getToken()}&account=${this.search.account}&realName=${this.search.realName}`).then(res => {
+          downloadXls(res.data, `用户数据表${dateNow()}.xlsx`);
+          NProgress.done();
+        })
+      });
+    },
+    handleTemplate () {
+      exportBlob(`/api/blade-user/export-template?${this.website.tokenHeader}=${getToken()}`).then(res => {
+        downloadXls(res.data, "用户数据模板.xlsx");
+      })
+    },
+    beforeOpen (done, type) {
+      if (["edit", "view"].includes(type)) {
+        getUser(this.form.id).then(res => {
+          this.form = res.data.data;
+          if (this.form.hasOwnProperty("deptId")) {
+            this.form.deptId = this.form.deptId.split(",");
+          }
+          if (this.form.hasOwnProperty("roleId")) {
+            this.form.roleId = this.form.roleId.split(",");
+          }
+          if (this.form.hasOwnProperty("postId")) {
+            this.form.postId = this.form.postId.split(",");
+          }
+        });
+      }
+      this.initFlag = true;
+      done();
+    },
+    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), this.treeDeptId).then(res => {
+        const data = res.data.data;
+        this.page.total = data.total;
+        this.data = data.records;
+        this.loading = false;
+        this.selectionClear();
+      });
+    },
+    platformRowUpdate (row, index, done, loading) {
+      updatePlatform(row.id, row.userType, row.userExt).then(() => {
         this.platformOnLoad(this.platformPage);
-      },
-      platformSearchChange(params, done) {
-        this.platformQuery = params;
-        this.platformPage.currentPage = 1;
-        this.platformOnLoad(this.platformPage, params);
+        this.$message({
+          type: "success",
+          message: "操作成功!"
+        });
         done();
-      },
-      platformSelectionChange(list) {
-        this.platformSelectionList = list;
-      },
-      platformSelectionClear() {
-        this.platformSelectionList = [];
-        this.$refs.platformCrud.toggleSelection();
-      },
-      platformCurrentChange(currentPage) {
-        this.platformPage.currentPage = currentPage;
-      },
-      platformSizeChange(pageSize) {
-        this.platformPage.pageSize = pageSize;
-      },
-      platformRefreshChange() {
-        this.platformOnLoad(this.platformPage, this.platformQuery);
-      },
-      platformOnLoad(page, params = {}) {
-        this.platformLoading = true;
-        getList(page.currentPage, page.pageSize, Object.assign(params, this.query), this.treeDeptId).then(res => {
-          const data = res.data.data;
-          this.platformPage.total = data.total;
-          this.platformData = data.records;
-          this.platformLoading = false;
-          this.selectionClear();
+      }, error => {
+        window.console.log(error);
+        loading();
+      });
+    },
+    platformBeforeOpen (done, type) {
+      if (["edit", "view"].includes(type)) {
+        getUserPlatform(this.platformForm.id).then(res => {
+          this.platformForm = res.data.data;
         });
       }
+      done();
+    },
+    platformSearchReset () {
+      this.platformQuery = {};
+      this.platformOnLoad(this.platformPage);
+    },
+    platformSearchChange (params, done) {
+      this.platformQuery = params;
+      this.platformPage.currentPage = 1;
+      this.platformOnLoad(this.platformPage, params);
+      done();
+    },
+    platformSelectionChange (list) {
+      this.platformSelectionList = list;
+    },
+    platformSelectionClear () {
+      this.platformSelectionList = [];
+      this.$refs.platformCrud.toggleSelection();
+    },
+    platformCurrentChange (currentPage) {
+      this.platformPage.currentPage = currentPage;
+    },
+    platformSizeChange (pageSize) {
+      this.platformPage.pageSize = pageSize;
+    },
+    platformRefreshChange () {
+      this.platformOnLoad(this.platformPage, this.platformQuery);
+    },
+    platformOnLoad (page, params = {}) {
+      this.platformLoading = true;
+      getList(page.currentPage, page.pageSize, Object.assign(params, this.query), this.treeDeptId).then(res => {
+        const data = res.data.data;
+        this.platformPage.total = data.total;
+        this.platformData = data.records;
+        this.platformLoading = false;
+        this.selectionClear();
+      });
     }
-  };
+  }
+};
 </script>
 
 <style>
-  .box {
-    height: 800px;
-  }
+.box {
+  height: 800px;
+}
 
-  .el-scrollbar {
-    height: 100%;
-  }
+.el-scrollbar {
+  height: 100%;
+}
 
-  .box .el-scrollbar__wrap {
-    overflow: scroll;
-  }
+.box .el-scrollbar__wrap {
+  overflow: scroll;
+}
 </style>

+ 2 - 5
vue.config.js

@@ -26,11 +26,8 @@ module.exports = {
         proxy: {
             '/api': {
                 //本地服务接口地址
-                // target: 'http://192.168.3.64',
-                // target: 'http://192.168.31.96',
-                // target: 'http://192.168.31.121',
-                target: 'http://192.168.3.13',
-                // target: 'http://192.168.31.96',
+                target: 'http://192.168.3.64', //
+                // target: 'http://192.168.3.13', //
                 //远程演示服务地址,可用于直接启动项目
                 //target: 'https://saber.bladex.vip/api',
                 ws: true,

Some files were not shown because too many files changed in this diff