修改

src/api/system/tenant.js

@@ -1,5 +1,12 @@
 import request from '@/utils/request'
 
+//获取当前租户信息
+export function tenantInfo() {
+  return request({
+    url: '/system/tenant/getTenant',
+    method: 'get'
+  })
+}
 
 // 获取我加入的租户列表
 export function getOwnJoinTenants() {

src/layout/components/Homebar.vue

@@ -159,19 +159,19 @@ export default {
               "alwaysShow": true,
               "children": null
             },
-            {
-              "id": 102,
-              "parentId": 1,
-              "name": "菜单管理",
-              "path": "menu",
-              "component": "system/menu/index",
-              "componentName": "SystemMenu",
-              "icon": "tree-table",
-              "visible": true,
-              "keepAlive": true,
-              "alwaysShow": true,
-              "children": null
-            },
+            // {
+            //   "id": 102,
+            //   "parentId": 1,
+            //   "name": "菜单管理",
+            //   "path": "menu",
+            //   "component": "system/menu/index",
+            //   "componentName": "SystemMenu",
+            //   "icon": "tree-table",
+            //   "visible": true,
+            //   "keepAlive": true,
+            //   "alwaysShow": true,
+            //   "children": null
+            // },
             {
               "id": 103,
               "parentId": 1,

src/layout/components/Navbar.vue

@@ -49,7 +49,7 @@
           <router-link to="/user/profile">
             <el-dropdown-item>个人中心</el-dropdown-item>
           </router-link>
-          <el-dropdown-item @click.native="setting = true">
+          <el-dropdown-item @click.native="companySetting('/system/companyInfo')">
             <span>企业管理</span>
           </el-dropdown-item>
           <el-dropdown-item divided @click.native="logout">
@@ -120,6 +120,113 @@ export default {
     toggleSideBar() {
       this.$store.dispatch('app/toggleSideBar')
     },
+    async companySetting(item){
+      let key = item;
+      const menus = [
+        {
+          "id": 1,
+          "parentId": 0,
+          "name": "企业管理",
+          "path": "/system",
+          "component": null,
+          "componentName": null,
+          "icon": "system",
+          "visible": true,
+          "keepAlive": true,
+          "alwaysShow": true,
+          "children": [
+          {
+              "id": 109,
+              "parentId": 1,
+              "name": "企业信息",
+              "path": "companyInfo",
+              "component": "system/companyInfo/index",
+              "componentName": "SystemCompanyInfo",
+              "icon": "tree-table",
+              "visible": true,
+              "keepAlive": true,
+              "alwaysShow": true,
+              "children": null
+            },
+            // {
+            //   "id": 102,
+            //   "parentId": 1,
+            //   "name": "菜单管理",
+            //   "path": "menu",
+            //   "component": "system/menu/index",
+            //   "componentName": "SystemMenu",
+            //   "icon": "tree-table",
+            //   "visible": true,
+            //   "keepAlive": true,
+            //   "alwaysShow": true,
+            //   "children": null
+            // },
+            {
+              "id": 103,
+              "parentId": 1,
+              "name": "部门管理",
+              "path": "dept",
+              "component": "system/dept/index",
+              "componentName": "SystemDept",
+              "icon": "tree",
+              "visible": true,
+              "keepAlive": true,
+              "alwaysShow": true,
+              "children": null
+            },
+            {
+              "id": 100,
+              "parentId": 1,
+              "name": "用户管理",
+              "path": "user",
+              "component": "system/user/index",
+              "componentName": "SystemUser",
+              "icon": "user",
+              "visible": true,
+              "keepAlive": true,
+              "alwaysShow": true,
+              "children": null
+            },
+            {
+              "id": 101,
+              "parentId": 1,
+              "name": "角色管理",
+              "path": "role",
+              "component": "system/role/index",
+              "componentName": "SystemRole",
+              "icon": "peoples",
+              "visible": true,
+              "keepAlive": true,
+              "alwaysShow": true,
+              "children": null
+            },
+
+            {
+              "id": 105,
+              "parentId": 1,
+              "name": "字典管理",
+              "path": "dict",
+              "component": "system/dict/index",
+              "componentName": "SystemDictType",
+              "icon": "dict",
+              "visible": true,
+              "keepAlive": true,
+              "alwaysShow": true,
+              "children": null
+            }
+          ]
+        }
+      ]
+      localStorage.setItem("menus", JSON.stringify(menus))
+      this.$store.dispatch('GenerateRoutes', menus).then(accessRoutes => {
+          console.log(accessRoutes);
+          // 根据 roles 权限生成可访问的路由表
+          router.addRoutes(accessRoutes) // 动态添加可访问路由表
+        })
+        setTimeout(() => {
+          this.$router.push({ path: key });
+        }, 200);
+    },
     async logout() {
       this.$modal.confirm('确定注销并退出系统吗？', '提示').then(() => {
         this.$store.dispatch('LogOut').then(() => {

src/layout/components/Userbar.vue

@@ -1,313 +0,0 @@
-<template>
-  <div class="navbar">
-    <div class="left-menu">
-        <!-- <el-popover
-          popper-class="down-popover"
-          placement="bottom"
-          width="360"
-          :visible-arrow="false"
-          trigger="click">
-          <div class="corp-switch">
-            <div class="current-corp">sunny</div>
-            <el-button type="text" style="color: #00B899;" @click="showProcessInstance()">
-              <i class="el-icon-s-operation"></i>
-              切换企业/团队
-            </el-button>
-           
-          </div>
-          <i class="el-icon-s-grid icon-menu" slot="reference"></i>
-        </el-popover>
-        <div class="divider"></div> -->
-        <a class="text" href="/">
-          <img :src="logo" class="menu-icon dashboard" />
-          <!-- <div class="menu-icon dashboard" style="background-image: url(&quot;https://g.jdycdn.com/app/pc/311a8e2b1ed9.png&quot;);"></div> -->
-          工作台
-        </a>
-    </div>
-    
-    
-    
-
-    <div class="right-menu">
-      <template v-if="device!=='mobile'">
-        <el-tooltip content="文档地址" effect="dark" placement="bottom">
-          <ruo-yi-doc id="ruoyi-doc" class="right-menu-item hover-effect" />
-        </el-tooltip>
-
-        <!-- <el-tooltip content="联系我们" effect="dark" placement="bottom">
-          <div class="right-menu-item hover-effect">
-            <i class="el-icon-service" @click="childMethod()"></i>
-          </div>
-
-        </el-tooltip> -->
-      </template>
-      <el-dropdown class="avatar-container right-menu-item hover-effect" trigger="click">
-        <div class="avatar-wrapper">
-          <img :src="avatar" class="user-avatar">
-          <span v-if="nickname" class="user-nickname">{{ nickname }}</span>
-          <!-- <i class="el-icon-caret-bottom" /> -->
-        </div>
-        <el-dropdown-menu slot="dropdown">
-          <router-link to="/user/profile">
-            <el-dropdown-item>个人中心</el-dropdown-item>
-          </router-link>
-          <el-dropdown-item @click.native="setting = true">
-            <span>企业管理</span>
-          </el-dropdown-item>
-          <el-dropdown-item divided @click.native="logout">
-            <span>退出登录</span>
-          </el-dropdown-item>
-        </el-dropdown-menu>
-      </el-dropdown>
-    </div>
-   
-  </div>
-</template>
-
-<script>
-import { mapGetters } from 'vuex'
-import Breadcrumb from '@/components/Breadcrumb'
-import TopNav from '@/components/TopNav'
-import Hamburger from '@/components/Hamburger'
-import Screenfull from '@/components/Screenfull'
-import SizeSelect from '@/components/SizeSelect'
-import Search from '@/components/HeaderSearch'
-import RuoYiGit from '@/components/RuoYi/Git'
-import RuoYiDoc from '@/components/RuoYi/Doc'
-import NotifyMessage from '@/layout/components/Message'
-import {getPath} from "@/utils/ruoyi";
-import logoImg from '@/assets/logo/work.png'
-export default {
-  data() {
-    return {
-      logo: logoImg
-    }
-  },
-  components: {
-    Breadcrumb,
-    TopNav,
-    Hamburger,
-    Screenfull,
-    SizeSelect,
-    Search,
-    RuoYiGit,
-    RuoYiDoc,
-    NotifyMessage
-  },
-  computed: {
-    ...mapGetters([
-      'sidebar',
-      'avatar',
-      'nickname',
-      'device'
-    ]),
-    setting: {
-      get() {
-        return this.$store.state.settings.showSettings
-      },
-      set(val) {
-        this.$store.dispatch('settings/changeSetting', {
-          key: 'showSettings',
-          value: val
-        })
-      }
-    },
-    topNav: {
-      get() {
-        return this.$store.state.settings.topNav
-      }
-    }
-  },
-  methods: {
-    showProcessInstance() {
-      this.$parent.showTeamWork();
-    },
-    childMethod() {
-        this.$parent.fatherMethod();
-    },
-    toggleSideBar() {
-      this.$store.dispatch('app/toggleSideBar')
-    },
-    async logout() {
-      this.$modal.confirm('确定注销并退出系统吗？', '提示').then(() => {
-        this.$store.dispatch('LogOut').then(() => {
-          location.href = getPath('/index');
-        })
-      }).catch(() => {});
-    }
-  }
-}
-</script>
-<style lang="scss">
-.down-popover {
-  top: 60px !important;
-}
-</style>
-<style lang="scss" scoped>
-a {
-  outline: none;
-  text-decoration: none;
-}
-.corp-switch{
-  align-items: center;
-  display: flex;
-  height: 65px;
-  justify-content: space-between;
-  padding-left: 20px;
-  .current-corp {
-      color: #141e31;
-      font-size: 18px;
-      line-height: 32px;
-      overflow: hidden;
-      text-overflow: ellipsis;
-      white-space: nowrap;
-      width: 240px;
-  }      
-}
-.navbar {
-  height: 60px;
-  overflow: hidden;
-  position: relative;
-  background: #fff;
-  box-shadow: 0 1px 4px rgba(0,21,41,.08);
-
-  .hamburger-container {
-    line-height: 46px;
-    height: 100%;
-    float: left;
-    cursor: pointer;
-    transition: background .3s;
-    -webkit-tap-highlight-color:transparent;
-
-    &:hover {
-      background: rgba(0, 0, 0, .025)
-    }
-  }
-
-  .breadcrumb-container {
-    float: left;
-  }
-
-  .topmenu-container {
-    position: absolute;
-    left: 50px;
-  }
-
-  .errLog-container {
-    display: inline-block;
-    vertical-align: top;
-  }
-  
-  .left-menu {
-    font-size: 16px;
-    padding: 0px 15px;
-    float: left;
-    height: 100%;
-    // line-height: 60px;
-    display: flex;
-    justify-content: center;
-    align-items: center;
-    cursor: pointer;
-    .icon-menu:hover {
-        background: #e6e8ed;
-        border-radius: 3px;
-    }
-    .icon-menu{
-      color: #525967;
-      cursor: pointer;
-      display: inline-block;
-      font-size: 20px;
-      height: 30px;
-      line-height: 30px;
-      text-align: center;
-      width: 30px;
-    }
-    .divider{
-      height: 20px;
-      margin: 0 5px;
-      border: solid #EBECEE;
-      border-width: 0 0 0 1px;
-      display: inline-block;
-      height: .9em;
-      // margin: 0 15px;
-      vertical-align: middle;
-    }
-    .text:hover {
-        background: #e6e8ed;
-    }
-    .text{
-      height: 30px;
-      align-items: center;
-      border-radius: 4px;
-      color: #141e31;
-      display: flex;
-      padding: 0 5px;
-      transition: background .2s ease;
-      .menu-icon{
-        background-size: 100px 20px;
-        height: 20px;
-        margin-right: 5px;
-        width: 20px;
-      }
-    }
-  }
-  
-  .right-menu {
-    float: right;
-    height: 100%;
-    line-height: 60px;
-
-    &:focus {
-      outline: none;
-    }
-
-    .right-menu-item {
-      display: inline-block;
-      padding: 0 8px;
-      height: 100%;
-      font-size: 18px;
-      color: #5a5e66;
-      vertical-align: text-bottom;
-
-      &.hover-effect {
-        cursor: pointer;
-        transition: background .3s;
-
-        &:hover {
-          background: rgba(0, 0, 0, .025)
-        }
-      }
-    }
-
-    .avatar-container {
-      margin-right: 20px;
-
-      .avatar-wrapper {
-        display: flex;
-        justify-content: center;
-        align-items: center;
-        position: relative;
-
-        .user-avatar {
-          cursor: pointer;
-          width: 35px;
-          height: 35px;
-          border-radius: 50%;
-        }
-        .user-nickname{
-          margin-left: 5px;
-          font-size: 14px;
-        }
-
-        .el-icon-caret-bottom {
-          cursor: pointer;
-          position: absolute;
-          right: -20px;
-          top: 25px;
-          font-size: 12px;
-        }
-      }
-    }
-  }
-}
-</style>

src/store/getters.js

@@ -11,6 +11,7 @@ const getters = {
   nickname: state => state.user.nickname,
   tenantId: state => state.user.tenantId,
   tenantName: state => state.user.tenantName,
+  corpId: state => state.user.corpId,
   introduction: state => state.user.introduction,
   roles: state => state.user.roles,
   permissions: state => state.user.permissions,

src/store/modules/user.js

@@ -11,6 +11,7 @@ const user = {
     permissions: [],
     tenantId: 0,
     tenantName:'',
+    corpId:'',
   },
 
   mutations: {
@@ -32,6 +33,10 @@ const user = {
     SET_TENANTNAME: (state, tenantName) => {
       state.tenantName = tenantName
     },
+    SET_CORPID: (state, corpId) => {
+      state.corpId = corpId
+    },
+    
     SET_ROLES: (state, roles) => {
       state.roles = roles
     },
@@ -154,6 +159,7 @@ const user = {
                   nickname: '',
                   tenantId:0,
                   tenantName:'',
+                  corpId:'',
                 }
               }
             }
@@ -174,6 +180,7 @@ const user = {
           commit('SET_AVATAR', avatar)
           commit('SET_TENANTID', user.tenantId)
           commit('SET_TENANTNAME', user.tenantName)
+          commit('SET_CORPID', user.corpId)
           resolve(res)
         }).catch(error => {
           reject(error)

src/views/system/companyInfo/index.vue

@@ -12,7 +12,7 @@
           <div class="fx-row-info-panel">
             <div class="label">企业名称</div>
             <div class="content" v-if="!showComp">
-              <span class="team-name-wrapper">{{ companyName }}</span>
+              <span class="team-name-wrapper">{{ tenantData.name }}</span>
               <el-button type="text" style="padding: 0 16px;" @click="editComp()">
                 <span>修改</span>
               </el-button>
@@ -34,7 +34,7 @@
                 <div class="account-mode-header">
                   <div class="fx-corp-mode-tag">
                     <div class="x-tag mode-tag single-line is-rounded-rec has-border" title="公共模式">
-                      <div class="text-wrapper">公共模式</div>
+                      <div class="text-wrapper">{{ tenantData.accountMode==1 ? '公共模式' : '集成模式' }}</div>
                     </div>
                   </div>
                 </div>
@@ -42,7 +42,7 @@
                   <div class="info-item">
                     <span class="item-name">CorpID</span>
                     <span class="item-value">
-                      <span>{{ codeStr }}</span>
+                      <span>{{ tenantData.corpId }}</span>
                       <i class="el-icon-document-copy copy-btn" style="cursor: pointer;
     font-size: 16px;
     margin-left: 16px;"></i>
@@ -60,43 +60,21 @@
 </template>
 
 <script>
-import { getAreaByIp, getAreaTree } from "@/api/system/area";
-import { updateTenant } from "@/api/system/tenant";
+import { updateTenant,tenantInfo } from "@/api/system/tenant";
 import ClipboardJS from 'clipboard'
 export default {
   components: {
   },
   data() {
     return {
-      codeStr:'667936e871255a463e3e9186',
-      showComp: false,
-      companyName: 'sunny',
-      newCompanyName: '',
-      // 遮罩层
-      loading: true,
-      // 显示搜索条件
-      showSearch: true,
-      // 地区列表
-      list: [],
-      // 弹出层标题
-      title: "",
-      // 是否显示弹出层
-      open: false,
-      // 重新渲染表格状态
-      refreshTable: true,
-      // 表单参数
-      form: {
-        ip: undefined,
-        result: undefined,
-      },
-      // 表单校验
-      rules: {
-        ip: [{ required: true, message: "IP 地址不能为控", trigger: "blur" }],
-      }
+      // 租户信息
+      showComp:false,
+      newCompanyName:'',
+      tenantData: {},
     };
   },
   created() {
-    this.getList();
+    this.getTenantInfo();
   },
   mounted() {
     const clipboard = new ClipboardJS('.copy-btn', {
@@ -105,7 +83,7 @@ export default {
           message: '复制成功',
           type: 'success'
         });
-        return this.codeStr;
+        return this.tenantData.corpId;
       }
     })
     clipboard.on('error', e => {
@@ -115,53 +93,22 @@ export default {
   methods: {
     editComp() {
       this.showComp = true;
-      this.newCompanyName = this.companyName;
+      this.newCompanyName = this.tenantData.name;
     },
     saveComp() {
-      updateTenant({name:this.newCompanyName}).then(response => {
+      updateTenant({name:this.newCompanyName,status:0}).then(response => {
         this.showComp = false;
-        this.companyName = this.newCompanyName;
         this.$modal.msgSuccess("修改成功");
+        this.getTenantInfo();
       });
     },
-    /** 查询列表 */
-    getList() {
-      this.loading = true;
-      getAreaTree().then(response => {
-        this.list = response.data;
-        this.loading = false;
+    /** 当前租户信息 */
+    getTenantInfo() {
+      tenantInfo().then(response => {
+        this.tenantData = response.data;
+        console.log(this.tenantData);
       })
     },
-    /** 取消按钮 */
-    cancel() {
-      this.open = false;
-      this.reset();
-    },
-    /** 表单重置 */
-    reset() {
-      this.form = {
-        ip: undefined,
-        result: undefined,
-      };
-      this.resetForm("form");
-    },
-    /** 新增按钮操作 */
-    handleAdd() {
-      this.reset();
-      this.open = true;
-    },
-    /** 提交按钮 */
-    submitForm() {
-      this.$refs["form"].validate(valid => {
-        if (!valid) {
-          return;
-        }
-        getAreaByIp(this.form.ip).then(response => {
-          this.$modal.msgSuccess("查询成功");
-          this.form.result = response.data
-        });
-      });
-    }
   }
 };
 </script>

src/views/system/menu/index.vue

@@ -1,7 +1,5 @@
 <template>
   <div class="app-container">
-    <doc-alert title="功能权限" url="https://doc.iocoder.cn/resource-permission" />
-    <doc-alert title="菜单路由" url="https://doc.iocoder.cn/vue2/route/" />
     <!-- 搜索工作栏 -->
     <el-form :model="queryParams" ref="queryForm" size="small" :inline="true" v-show="showSearch">
       <el-form-item label="菜单名称" prop="name">

src/views/system/role/index.vue

@@ -1,7 +1,5 @@
 <template>
   <div class="app-container">
-    <doc-alert title="功能权限" url="https://doc.iocoder.cn/resource-permission" />
-    <doc-alert title="数据权限" url="https://doc.iocoder.cn/data-permission" />
     <el-form :model="queryParams" ref="queryForm" v-show="showSearch" :inline="true">
       <el-form-item label="角色名称" prop="name">
         <el-input v-model="queryParams.name" placeholder="请输入角色名称" clearable size="small" style="width: 240px"

src/views/system/user/index.vue

@@ -1,39 +1,41 @@
 <template>
   <div class="app-container">
-    <doc-alert title="用户体系" url="https://doc.iocoder.cn/user-center/" />
-    <doc-alert title="三方登陆" url="https://doc.iocoder.cn/social-user/" />
-    <doc-alert title="Excel 导入导出" url="https://doc.iocoder.cn/excel-import-and-export/" />
     <!-- 搜索工作栏 -->
     <el-row :gutter="20">
       <!--部门数据-->
       <el-col :span="4" :xs="24">
         <div class="head-container">
-          <el-input v-model="deptName" placeholder="请输入部门名称" clearable size="small" prefix-icon="el-icon-search" style="margin-bottom: 20px"/>
+          <el-input v-model="deptName" placeholder="请输入部门名称" clearable size="small" prefix-icon="el-icon-search"
+            style="margin-bottom: 20px" />
         </div>
         <div class="head-container">
-          <el-tree :data="deptOptions" :props="defaultProps" :expand-on-click-node="false" :filter-node-method="filterNode"
-                   ref="tree" default-expand-all highlight-current @node-click="handleNodeClick"/>
+          <el-tree :data="deptOptions" :props="defaultProps" :expand-on-click-node="false"
+            :filter-node-method="filterNode" ref="tree" default-expand-all highlight-current
+            @node-click="handleNodeClick" />
         </div>
       </el-col>
       <!--用户数据-->
       <el-col :span="20" :xs="24">
-        <el-form :model="queryParams" ref="queryForm" size="small" :inline="true" v-show="showSearch" label-width="68px">
+        <el-form :model="queryParams" ref="queryForm" size="small" :inline="true" v-show="showSearch"
+          label-width="68px">
           <el-form-item label="用户名称" prop="username">
             <el-input v-model="queryParams.username" placeholder="请输入用户名称" clearable style="width: 240px"
-                      @keyup.enter.native="handleQuery"/>
+              @keyup.enter.native="handleQuery" />
           </el-form-item>
           <el-form-item label="手机号码" prop="mobile">
             <el-input v-model="queryParams.mobile" placeholder="请输入手机号码" clearable style="width: 240px"
-                      @keyup.enter.native="handleQuery"/>
+              @keyup.enter.native="handleQuery" />
           </el-form-item>
           <el-form-item label="状态" prop="status">
             <el-select v-model="queryParams.status" placeholder="用户状态" clearable style="width: 240px">
-              <el-option v-for="dict in statusDictDatas" :key="parseInt(dict.value)" :label="dict.label" :value="parseInt(dict.value)"/>
+              <el-option v-for="dict in statusDictDatas" :key="parseInt(dict.value)" :label="dict.label"
+                :value="parseInt(dict.value)" />
             </el-select>
           </el-form-item>
           <el-form-item label="创建时间" prop="createTime">
-            <el-date-picker v-model="queryParams.createTime" style="width: 240px" value-format="yyyy-MM-dd HH:mm:ss" type="daterange"
-              range-separator="-" start-placeholder="开始日期" end-placeholder="结束日期" :default-time="['00:00:00', '23:59:59']" />
+            <el-date-picker v-model="queryParams.createTime" style="width: 240px" value-format="yyyy-MM-dd HH:mm:ss"
+              type="daterange" range-separator="-" start-placeholder="开始日期" end-placeholder="结束日期"
+              :default-time="['00:00:00', '23:59:59']" />
           </el-form-item>
           <el-form-item>
             <el-button type="primary" icon="el-icon-search" @click="handleQuery">搜索</el-button>
@@ -44,28 +46,37 @@
         <el-row :gutter="10" class="mb8">
           <el-col :span="1.5">
             <el-button type="primary" plain icon="el-icon-plus" size="mini" @click="handleAdd"
-                       v-hasPermi="['system:user:create']">新增</el-button>
+              v-hasPermi="['system:user:create']">新增</el-button>
           </el-col>
           <el-col :span="1.5">
             <el-button type="info" icon="el-icon-upload2" size="mini" @click="handleImport"
-                       v-hasPermi="['system:user:import']">导入</el-button>
+              v-hasPermi="['system:user:import']">导入</el-button>
           </el-col>
           <el-col :span="1.5">
             <el-button type="warning" icon="el-icon-download" size="mini" @click="handleExport" :loading="exportLoading"
-                       v-hasPermi="['system:user:export']">导出</el-button>
+              v-hasPermi="['system:user:export']">导出</el-button>
+          </el-col>
+          <el-col :span="1.5">
+            <el-button type="primary" size="mini" @click="dialogVisible = true"
+              v-hasPermi="['system:user:invite']">邀请成员</el-button>
           </el-col>
           <right-toolbar :showSearch.sync="showSearch" @queryTable="getList" :columns="columns"></right-toolbar>
         </el-row>
 
         <el-table v-loading="loading" :data="userList">
           <el-table-column label="用户编号" align="center" key="id" prop="id" v-if="columns[0].visible" />
-          <el-table-column label="用户名称" align="center" key="username" prop="username" v-if="columns[1].visible" :show-overflow-tooltip="true" />
-          <el-table-column label="用户昵称" align="center" key="nickname" prop="nickname" v-if="columns[2].visible" :show-overflow-tooltip="true" />
-          <el-table-column label="部门" align="center" key="deptName" prop="dept.name" v-if="columns[3].visible" :show-overflow-tooltip="true" />
-          <el-table-column label="手机号码" align="center" key="mobile" prop="mobile" v-if="columns[4].visible" width="120" />
+          <el-table-column label="用户名称" align="center" key="username" prop="username" v-if="columns[1].visible"
+            :show-overflow-tooltip="true" />
+          <el-table-column label="用户昵称" align="center" key="nickname" prop="nickname" v-if="columns[2].visible"
+            :show-overflow-tooltip="true" />
+          <el-table-column label="部门" align="center" key="deptName" prop="dept.name" v-if="columns[3].visible"
+            :show-overflow-tooltip="true" />
+          <el-table-column label="手机号码" align="center" key="mobile" prop="mobile" v-if="columns[4].visible"
+            width="120" />
           <el-table-column label="状态" key="status" v-if="columns[5].visible" align="center">
             <template v-slot="scope">
-              <el-switch v-model="scope.row.status" :active-value="0" :inactive-value="1" @change="handleStatusChange(scope.row)" />
+              <el-switch v-model="scope.row.status" :active-value="0" :inactive-value="1"
+                @change="handleStatusChange(scope.row)" />
             </template>
           </el-table-column>
           <el-table-column label="创建时间" align="center" prop="createTime" v-if="columns[6].visible" width="160">
@@ -76,25 +87,25 @@
           <el-table-column label="操作" align="center" width="160" class-name="small-padding fixed-width">
             <template v-slot="scope">
               <el-button size="mini" type="text" icon="el-icon-edit" @click="handleUpdate(scope.row)"
-                         v-hasPermi="['system:user:update']">修改</el-button>
-              <el-dropdown  @command="(command) => handleCommand(command, scope.$index, scope.row)"
-                            v-hasPermi="['system:user:delete', 'system:user:update-password', 'system:permission:assign-user-role']">
+                v-hasPermi="['system:user:update']">修改</el-button>
+              <el-dropdown @command="(command) => handleCommand(command, scope.$index, scope.row)"
+                v-hasPermi="['system:user:delete', 'system:user:update-password', 'system:permission:assign-user-role']">
                 <el-button size="mini" type="text" icon="el-icon-d-arrow-right">更多</el-button>
                 <el-dropdown-menu slot="dropdown">
-                  <el-dropdown-item command="handleDelete" v-if="scope.row.id !== 1" size="mini" type="text" icon="el-icon-delete"
-                                    v-hasPermi="['system:user:delete']">删除</el-dropdown-item>
+                  <el-dropdown-item command="handleDelete" v-if="scope.row.id !== 1" size="mini" type="text"
+                    icon="el-icon-delete" v-hasPermi="['system:user:delete']">删除</el-dropdown-item>
                   <el-dropdown-item command="handleResetPwd" size="mini" type="text" icon="el-icon-key"
-                                    v-hasPermi="['system:user:update-password']">重置密码</el-dropdown-item>
+                    v-hasPermi="['system:user:update-password']">重置密码</el-dropdown-item>
                   <el-dropdown-item command="handleRole" size="mini" type="text" icon="el-icon-circle-check"
-                                    v-hasPermi="['system:permission:assign-user-role']">分配角色</el-dropdown-item>
+                    v-hasPermi="['system:permission:assign-user-role']">分配角色</el-dropdown-item>
                 </el-dropdown-menu>
               </el-dropdown>
             </template>
           </el-table-column>
         </el-table>
 
-        <pagination v-show="total>0" :total="total" :page.sync="queryParams.pageNo" :limit.sync="queryParams.pageSize"
-                    @pagination="getList"/>
+        <pagination v-show="total > 0" :total="total" :page.sync="queryParams.pageNo" :limit.sync="queryParams.pageSize"
+          @pagination="getList" />
       </el-col>
     </el-row>
 
@@ -110,7 +121,7 @@
           <el-col :span="12">
             <el-form-item label="归属部门" prop="deptId">
               <treeselect v-model="form.deptId" :options="deptOptions" :show-count="true" :clearable="false"
-                          placeholder="请选择归属部门" :normalizer="normalizer"/>
+                placeholder="请选择归属部门" :normalizer="normalizer" />
             </el-form-item>
           </el-col>
         </el-row>
@@ -142,19 +153,15 @@
           <el-col :span="12">
             <el-form-item label="用户性别">
               <el-select v-model="form.sex" placeholder="请选择">
-                <el-option v-for="dict in sexDictDatas" :key="parseInt(dict.value)" :label="dict.label" :value="parseInt(dict.value)"/>
+                <el-option v-for="dict in sexDictDatas" :key="parseInt(dict.value)" :label="dict.label"
+                  :value="parseInt(dict.value)" />
               </el-select>
             </el-form-item>
           </el-col>
           <el-col :span="12">
             <el-form-item label="岗位">
               <el-select v-model="form.postIds" multiple placeholder="请选择">
-                <el-option
-                    v-for="item in postOptions"
-                    :key="item.id"
-                    :label="item.name"
-                    :value="item.id"
-                ></el-option>
+                <el-option v-for="item in postOptions" :key="item.id" :label="item.name" :value="item.id"></el-option>
               </el-select>
             </el-form-item>
           </el-col>
@@ -185,7 +192,8 @@
             <el-checkbox v-model="upload.updateSupport" /> 是否更新已经存在的用户数据
           </div>
           <span>仅允许导入xls、xlsx格式文件。</span>
-          <el-link type="primary" :underline="false" style="font-size:12px;vertical-align: baseline;" @click="importTemplate">下载模板</el-link>
+          <el-link type="primary" :underline="false" style="font-size:12px;vertical-align: baseline;"
+            @click="importTemplate">下载模板</el-link>
         </div>
       </el-upload>
       <div slot="footer" class="dialog-footer">
@@ -205,12 +213,8 @@
         </el-form-item>
         <el-form-item label="角色">
           <el-select v-model="form.roleIds" multiple placeholder="请选择">
-            <el-option
-                v-for="item in roleOptions"
-                :key="parseInt(item.id)"
-                :label="item.name"
-                :value="parseInt(item.id)"
-            ></el-option>
+            <el-option v-for="item in roleOptions" :key="parseInt(item.id)" :label="item.name"
+              :value="parseInt(item.id)"></el-option>
           </el-select>
         </el-form-item>
       </el-form>
@@ -220,10 +224,31 @@
       </div>
     </el-dialog>
 
+    <el-dialog title="邀请成员" :visible.sync="dialogVisible" width="30%">
+      <div class="content">
+        <div class="public-link-operate">
+          <div class="operate-title">
+            邀请码
+            <span class="link-tip">可通过下方邀请码加入你的企业。<span class="link-tip-mark">邀请码永久有效</span></span>
+          </div>
+        </div>
+        <div class="public-link-address">
+          邀请码
+          <div class="link-input">
+            <el-input v-model="corpId" readonly>
+            <el-button slot="append" class="copy-btn">复制</el-button>
+          </el-input>
+          </div>
+          
+        </div>
+      </div>
+    </el-dialog>
+
   </div>
 </template>
 
 <script>
+import { mapGetters } from 'vuex'
 import {
   addUser,
   changeUserStatus,
@@ -238,20 +263,21 @@ import {
 import Treeselect from "@riophae/vue-treeselect";
 import "@riophae/vue-treeselect/dist/vue-treeselect.css";
 
-import {listSimpleDepts} from "@/api/system/dept";
-import {listSimplePosts} from "@/api/system/post";
-
-import {CommonStatusEnum} from "@/utils/constants";
-import {DICT_TYPE, getDictDatas} from "@/utils/dict";
-import {assignUserRole, listUserRoles} from "@/api/system/permission";
-import {listSimpleRoles} from "@/api/system/role";
-import {getBaseHeader} from "@/utils/request";
+import { listSimpleDepts } from "@/api/system/dept";
+import { listSimplePosts } from "@/api/system/post";
 
+import { CommonStatusEnum } from "@/utils/constants";
+import { DICT_TYPE, getDictDatas } from "@/utils/dict";
+import { assignUserRole, listUserRoles } from "@/api/system/permission";
+import { listSimpleRoles } from "@/api/system/role";
+import { getBaseHeader } from "@/utils/request";
+import ClipboardJS from 'clipboard'
 export default {
   name: "SystemUser",
   components: { Treeselect },
   data() {
     return {
+      dialogVisible: false,
       // 遮罩层
       loading: true,
       // 导出遮罩层
@@ -355,6 +381,11 @@ export default {
       sexDictDatas: getDictDatas(DICT_TYPE.SYSTEM_USER_SEX),
     };
   },
+  computed: {
+    ...mapGetters([
+      'corpId',
+    ]),
+  },
   watch: {
     // 根据名称筛选部门树
     deptName(val) {
@@ -368,6 +399,20 @@ export default {
     //   this.initPassword = response.msg;
     // });
   },
+  mounted() {
+    const clipboard = new ClipboardJS('.copy-btn', {
+      text: trigger => {
+        this.$message({
+          message: '复制成功',
+          type: 'success'
+        });
+        return this.corpId;
+      }
+    })
+    clipboard.on('error', e => {
+      this.$message.error('复制失败')
+    })
+  },
   methods: {
     // 更多操作
     handleCommand(command, index, row) {
@@ -392,10 +437,10 @@ export default {
     getList() {
       this.loading = true;
       listUser(this.queryParams).then(response => {
-          this.userList = response.data.list;
-          this.total = response.data.total;
-          this.loading = false;
-        }
+        this.userList = response.data.list;
+        this.total = response.data.total;
+        this.loading = false;
+      }
       );
     },
     /** 查询部门下拉树结构 + 岗位下拉 */
@@ -424,14 +469,14 @@ export default {
     // 用户状态修改
     handleStatusChange(row) {
       let text = row.status === CommonStatusEnum.ENABLE ? "启用" : "停用";
-      this.$modal.confirm('确认要"' + text + '""' + row.username + '"用户吗?').then(function() {
-          return changeUserStatus(row.id, row.status);
-        }).then(() => {
-          this.$modal.msgSuccess(text + "成功");
-        }).catch(function() {
-          row.status = row.status === CommonStatusEnum.ENABLE ? CommonStatusEnum.DISABLE
-              : CommonStatusEnum.ENABLE;
-        });
+      this.$modal.confirm('确认要"' + text + '""' + row.username + '"用户吗?').then(function () {
+        return changeUserStatus(row.id, row.status);
+      }).then(() => {
+        this.$modal.msgSuccess(text + "成功");
+      }).catch(function () {
+        row.status = row.status === CommonStatusEnum.ENABLE ? CommonStatusEnum.DISABLE
+          : CommonStatusEnum.ENABLE;
+      });
     },
     // 取消按钮
     cancel() {
@@ -498,10 +543,10 @@ export default {
         confirmButtonText: "确定",
         cancelButtonText: "取消"
       }).then(({ value }) => {
-          resetUserPwd(row.id, value).then(response => {
-            this.$modal.msgSuccess("修改成功，新密码是：" + value);
-          });
-        }).catch(() => {});
+        resetUserPwd(row.id, value).then(response => {
+          this.$modal.msgSuccess("修改成功，新密码是：" + value);
+        });
+      }).catch(() => { });
     },
     /** 分配用户角色操作 */
     handleRole(row) {
@@ -526,7 +571,7 @@ export default {
       })
     },
     /** 提交按钮 */
-    submitForm: function() {
+    submitForm: function () {
       this.$refs["form"].validate(valid => {
         if (valid) {
           if (this.form.id !== undefined) {
@@ -546,7 +591,7 @@ export default {
       });
     },
     /** 提交按钮（角色权限） */
-    submitRole: function() {
+    submitRole: function () {
       if (this.form.id !== undefined) {
         assignUserRole({
           userId: this.form.id,
@@ -561,26 +606,26 @@ export default {
     /** 删除按钮操作 */
     handleDelete(row) {
       const ids = row.id || this.ids;
-      this.$modal.confirm('是否确认删除用户编号为"' + ids + '"的数据项?').then(function() {
-          return delUser(ids);
-        }).then(() => {
-          this.getList();
-          this.$modal.msgSuccess("删除成功");
-      }).catch(() => {});
+      this.$modal.confirm('是否确认删除用户编号为"' + ids + '"的数据项?').then(function () {
+        return delUser(ids);
+      }).then(() => {
+        this.getList();
+        this.$modal.msgSuccess("删除成功");
+      }).catch(() => { });
     },
     /** 导出按钮操作 */
     handleExport() {
       this.$modal.confirm('是否确认导出所有用户数据项?').then(() => {
-          // 处理查询参数
-          let params = {...this.queryParams};
-          params.pageNo = undefined;
-          params.pageSize = undefined;
-          this.exportLoading = true;
-          return exportUser(params);
-        }).then(response => {
-          this.$download.excel(response, '用户数据.xls');
-          this.exportLoading = false;
-      }).catch(() => {});
+        // 处理查询参数
+        let params = { ...this.queryParams };
+        params.pageNo = undefined;
+        params.pageSize = undefined;
+        this.exportLoading = true;
+        return exportUser(params);
+      }).then(response => {
+        this.$download.excel(response, '用户数据.xls');
+        this.exportLoading = false;
+      }).catch(() => { });
     },
     /** 导入按钮操作 */
     handleImport() {
@@ -638,3 +683,33 @@ export default {
   }
 };
 </script>
+<style lang="scss" scoped>
+.public-link-operate {
+    border-bottom: 1px solid #e1e3e5;
+    padding: 20px 0;
+    .operate-title {
+        color: #141e31;
+        font-size: 14px;
+        font-weight: 500;
+        margin-bottom: 12px;
+.link-tip {
+    color: #838892;
+    font-weight: 400;
+    margin-left: 10px;
+.link-tip-mark {
+    font-weight: 600;
+}
+}
+    }
+}
+.public-link-address {
+    color: #141e31;
+    font-weight: 500;
+    padding: 20px 0;
+.link-input {
+    font-weight: 400;
+    margin-top: 10px;
+    width: 100%;
+}
+}
+</style>

src/views/system/user/profile/index.vue

@@ -59,9 +59,9 @@
             <el-tab-pane label="修改密码" name="resetPwd">
               <resetPwd :user="user" />
             </el-tab-pane>
-            <el-tab-pane label="社交信息" name="userSocial">
+            <!-- <el-tab-pane label="社交信息" name="userSocial">
               <userSocial :user="user" :getUser="getUser" :setActiveTab="setActiveTab" />
-            </el-tab-pane>
+            </el-tab-pane> -->
           </el-tabs>
         </el-card>
       </el-col>
@@ -77,11 +77,10 @@ import userInfo from "./userInfo";
 import resetPwd from "./resetPwd";
 import userSocial from "./userSocial";
 import { getUserProfile } from "@/api/system/user";
-import Userbar from '@/layout/components/Userbar'
 
 export default {
   name: "Profile",
-  components: { userAvatar, userInfo, resetPwd, userSocial,Userbar },
+  components: { userAvatar, userInfo, resetPwd, userSocial },
   data() {
     return {
       user: {},