diff --git a/src/api/system/select.js b/src/api/system/select.js
new file mode 100644
index 0000000..5bb4b8e
--- /dev/null
+++ b/src/api/system/select.js
@@ -0,0 +1,10 @@
+import request from '@/utils/request'
+
+// 获取班组列表
+export function getTeamList(query) {
+    return request({
+      url: '/system/select/getTeamList',
+      method: 'get',
+      params: query
+    })
+  }
\ No newline at end of file
diff --git a/src/api/system/user.js b/src/api/system/user.js
index cda6526..4c9f9e8 100644
--- a/src/api/system/user.js
+++ b/src/api/system/user.js
@@ -136,3 +136,12 @@ export function deptTreeSelect() {
     method: 'get'
   })
 }
+
+/* 关联用户 */
+export function associationTeam(data) {
+  return request({
+    url: '/system/user/associationTeam',
+    method: 'post',
+    data: data
+  })
+}
\ No newline at end of file
diff --git a/src/views/system/role/index.vue b/src/views/system/role/index.vue
index 57aabf3..0b7e8a7 100644
--- a/src/views/system/role/index.vue
+++ b/src/views/system/role/index.vue
@@ -99,8 +99,13 @@
 
     <el-table v-loading="loading" :data="roleList" @selection-change="handleSelectionChange">
       <el-table-column type="selection" width="55" align="center" />
-      <el-table-column label="角色编号" prop="roleId" width="120" />
+      <el-table-column label="序号" align="center" width="80" type="index">
+        <template scope="scope">
+          <span>{{ (queryParams.pageNum - 1) * queryParams.pageSize + scope.$index + 1 }}</span>
+        </template>
+      </el-table-column>
       <el-table-column label="角色名称" prop="roleName" :show-overflow-tooltip="true" width="150" />
+      <el-table-column label="角色编码" prop="roleCode" width="120" :show-overflow-tooltip="true"/>
       <el-table-column label="权限字符" prop="roleKey" :show-overflow-tooltip="true" width="150" />
       <el-table-column label="显示顺序" prop="roleSort" width="100" />
       <el-table-column label="状态" align="center" width="100">
@@ -161,6 +166,9 @@
         <el-form-item label="角色名称" prop="roleName">
           <el-input v-model="form.roleName" placeholder="请输入角色名称" />
         </el-form-item>
+        <el-form-item label="角色编码" prop="roleCode">
+          <el-input v-model="form.roleCode" placeholder="请输入角色编码" maxlength="32"/>
+        </el-form-item>
         <el-form-item prop="roleKey">
           <span slot="label">
             <el-tooltip content="控制器中定义的权限字符，如：@PreAuthorize(`@ss.hasRole('admin')`)" placement="top">
@@ -332,6 +340,9 @@ export default {
         roleName: [
           { required: true, message: "角色名称不能为空", trigger: "blur" }
         ],
+        roleCode: [
+          { required: true, message: "角色编码不能为空", trigger: "blur" }
+        ],
         roleKey: [
           { required: true, message: "权限字符不能为空", trigger: "blur" }
         ],
@@ -426,6 +437,7 @@ export default {
       this.form = {
         roleId: undefined,
         roleName: undefined,
+        roleCode: undefined,
         roleKey: undefined,
         roleSort: 0,
         status: "0",
diff --git a/src/views/system/user/index.vue b/src/views/system/user/index.vue
index 80eeca9..0ecf4e2 100644
--- a/src/views/system/user/index.vue
+++ b/src/views/system/user/index.vue
@@ -1,10 +1,10 @@
 <template>
   <div class="app-container">
     <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"
+          <el-input v-model="deptName" placeholder="请输入项目部名称" clearable size="small" prefix-icon="el-icon-search"
             style="margin-bottom: 20px" />
         </div>
         <div class="head-container">
@@ -72,11 +72,13 @@
             :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.deptName" v-if="columns[3].visible"
+          <el-table-column label="项目部" align="center" key="deptName" prop="dept.deptName" v-if="columns[3].visible"
             :show-overflow-tooltip="true" />
           <el-table-column label="手机号码" align="center" key="phonenumber" prop="phonenumber" v-if="columns[4].visible"
             width="120" />
-          <el-table-column label="状态" align="center" key="status" v-if="columns[5].visible">
+            <el-table-column label="角色名称" align="center" key="roleName" prop="roleName" v-if="columns[5].visible"
+            width="120" />
+          <el-table-column label="状态" align="center" key="status" v-if="columns[6].visible">
             <template slot-scope="scope">
               <el-switch v-model="scope.row.status" active-value="0" inactive-value="1"
                 @change="handleStatusChange(scope.row)"></el-switch>
@@ -87,12 +89,14 @@
               <span>{{ parseTime(scope.row.createTime) }}</span>
             </template>
           </el-table-column>
-          <el-table-column label="操作" align="center" width="160" class-name="small-padding fixed-width">
+          <el-table-column label="操作" align="center" width="260" class-name="small-padding fixed-width">
             <template slot-scope="scope">
               <el-button size="mini" type="text" icon="el-icon-edit" @click="handleUpdate(scope.row)"
                 v-hasPermi="['system:user:edit']">修改</el-button>
               <el-button size="mini" type="text" icon="el-icon-delete" @click="handleDelete(scope.row)"
                 v-hasPermi="['system:user:remove']">删除</el-button>
+              <el-button size="mini" type="text" icon="el-icon-user" @click="handleAssociation(scope.row)" v-if="scope.row.roleCode === 'team'"
+                v-hasPermi="['system:user:associationTeam']">关联班组</el-button>
               <el-dropdown size="mini" @command="(command) => handleCommand(command, scope.row)"
                 v-hasPermi="['system:user:resetPwd', 'system:user:edit']">
                 <el-button size="mini" type="text" icon="el-icon-d-arrow-right">更多</el-button>
@@ -122,8 +126,8 @@
             </el-form-item>
           </el-col>
           <el-col :span="12">
-            <el-form-item label="归属部门" prop="deptId">
-              <treeselect v-model="form.deptId" :options="deptOptions" :show-count="true" placeholder="请选择归属部门" />
+            <el-form-item label="项目部" prop="deptId">
+              <treeselect v-model="form.deptId" :options="deptOptions" :show-count="true" placeholder="请选择项目部" />
             </el-form-item>
           </el-col>
         </el-row>
@@ -181,8 +185,9 @@
           </el-col>
           <el-col :span="12">
             <el-form-item label="角色" prop="roleIds">
-              <el-select v-model="form.roleIds" multiple :multiple-limit = "multipleLimit" placeholder="请选择角色">
-                <el-option v-for="item in roleOptions" :key="item.roleId" :label="item.roleName" :value="item.roleId"></el-option>
+              <el-select v-model="form.roleIds" multiple :multiple-limit="multipleLimit" placeholder="请选择角色">
+                <el-option v-for="item in roleOptions" :key="item.roleId" :label="item.roleName"
+                  :value="item.roleId"></el-option>
               </el-select>
             </el-form-item>
           </el-col>
@@ -191,7 +196,8 @@
           <el-col :span="12">
             <el-form-item label="登录权限" prop="loginTypeArr">
               <el-checkbox-group v-model="loginTypeArr">
-                <el-checkbox v-for="dict in dict.type.sys_login_type" :key="dict.value" :label="dict.value">{{dict.label}}</el-checkbox>
+                <el-checkbox v-for="dict in dict.type.sys_login_type" :key="dict.value"
+                  :label="dict.value">{{ dict.label }}</el-checkbox>
               </el-checkbox-group>
             </el-form-item>
           </el-col>
@@ -231,19 +237,38 @@
         <el-button @click="upload.open = false">取 消</el-button>
       </div>
     </el-dialog>
+    <!-- 关联班组 -->
+    <el-dialog :title="title" :visible.sync="openAssociation" width="600px" append-to-body>
+      <el-form ref="form2" :model="form2" label-width="80px">
+        <el-row>
+          <el-col :span="24">
+            <el-form-item label="关联班组">
+              <el-select v-model="form2.teamId" clearable placeholder="请选择班组" style="width: 100%;">
+                <el-option v-for="item in teamsArr" :key="item.id" :label="item.name" :value="item.id"></el-option>
+              </el-select>
+            </el-form-item>
+          </el-col>
+        </el-row>
+      </el-form>
+      <div slot="footer" class="dialog-footer">
+        <el-button type="primary" @click="submitForm2">确 定</el-button>
+        <el-button @click="cancel2">取 消</el-button>
+      </div>
+    </el-dialog>
   </div>
 </template>
 
 <script>
-import { listUser, getUser, delUser, addUser, updateUser, resetUserPwd, changeUserStatus, deptTreeSelect } from "@/api/system/user";
+import { listUser, getUser, delUser, addUser, updateUser, resetUserPwd, changeUserStatus, deptTreeSelect, associationTeam } from "@/api/system/user";
 import { getToken } from "@/utils/auth";
 import Treeselect from "@riophae/vue-treeselect";
 import "@riophae/vue-treeselect/dist/vue-treeselect.css";
 import { validPwd } from '@/utils/validate'
+import { getTeamList } from '@/api/system/select'
 
 export default {
   name: "User",
-  dicts: ['sys_normal_disable', 'sys_user_sex','sys_login_type'],
+  dicts: ['sys_normal_disable', 'sys_user_sex', 'sys_login_type'],
   components: { Treeselect },
   data() {
     return {
@@ -267,6 +292,7 @@ export default {
       deptOptions: undefined,
       // 是否显示弹出层
       open: false,
+      openAssociation: false,
       // 部门名称
       deptName: undefined,
       // 默认密码
@@ -278,11 +304,13 @@ export default {
       // 角色选项
       roleOptions: [],
       // 登录权限数组
-      loginTypeArr:[],
+      loginTypeArr: [],
       // 角色下拉多选限制数量
-      multipleLimit:1,
+      multipleLimit: 1,
+      teamsArr: [],
       // 表单参数
       form: {},
+      form2: {},
       defaultProps: {
         children: "children",
         label: "label"
@@ -366,6 +394,7 @@ export default {
   },
   created() {
     this.getList();
+    this.getTeamList();
     this.getDeptTree();
     this.getConfigKey("sys.user.initPassword").then(response => {
       this.initPassword = response.msg;
@@ -398,6 +427,14 @@ export default {
       }
       );
     },
+    /* 获取班组列表 */
+    getTeamList() {
+      getTeamList().then(response => {
+        console.log(response);
+        this.teamsArr = response.data;
+      }
+      );
+    },
     /** 查询部门下拉树结构 */
     getDeptTree() {
       deptTreeSelect().then(response => {
@@ -430,6 +467,10 @@ export default {
       this.open = false;
       this.reset();
     },
+    // 关联班组模态框取消按钮
+    cancel2() {
+      this.openAssociation = false;
+    },
     // 表单重置
     reset() {
       this.form = {
@@ -450,6 +491,15 @@ export default {
       };
       this.resetForm("form");
     },
+    reset2() {
+      this.form2 = {
+        userId: null,
+        teamId: null,
+        nickName: null,
+        userName:null
+      };
+      this.resetForm("form2");
+    },
     /** 搜索按钮操作 */
     handleQuery() {
       this.queryParams.pageNum = 1;
@@ -501,8 +551,8 @@ export default {
       const userId = row.userId || this.ids;
       getUser(userId).then(response => {
         this.form = response.data;
-        const loginType= response.data.loginType;
-        if(loginType){
+        const loginType = response.data.loginType;
+        if (loginType) {
           this.loginTypeArr = loginType.split(',');
         }
         this.postOptions = response.posts;
@@ -514,6 +564,16 @@ export default {
         this.form.password = "";
       });
     },
+    /* 关联班组 */
+    handleAssociation(row) {
+      this.reset2();
+      this.openAssociation = true;
+      this.title = "关联班组";
+      this.$set(this.form2, "userId", row.userId);
+      this.$set(this.form2, "teamId", row.teamId ? row.teamId + '' : null);
+      this.$set(this.form2, "nickName", row.nickName);
+      this.$set(this.form2, "userName", row.userName);
+    },
     /** 重置密码按钮操作 */
     handleResetPwd(row) {
       this.$prompt('请输入"' + row.userName + '"的新密码', "提示", {
@@ -559,6 +619,27 @@ export default {
         }
       });
     },
+    /** 关联班组提交按钮 */
+    submitForm2: function () {
+      this.$refs["form2"].validate(valid => {
+        if (valid) {
+          let loading = this.$loading({
+            lock: true,
+            text: "提交中，请稍候...",
+            background: 'rgba(0,0,0,0.5)'
+          })
+          console.log(this.form2);
+          associationTeam(this.form2).then(response => {
+            loading.close()
+            this.$modal.msgSuccess(response.msg);
+            this.openAssociation = false;
+            this.getList();
+          }).catch(error => {
+            loading.close();
+          });
+        }
+      });
+    },
     /** 删除按钮操作 */
     handleDelete(row) {
       const userIds = row.userId || this.ids;