feat:用户可以在多个权限组里

Author: GongJS

.env.development

@@ -1,3 +1,3 @@
 ENV = 'development'
 
-VUE_APP_BASE_URL = 'http://digital.7yue.pro/'
+VUE_APP_BASE_URL = 'http://pedro.7yue.pro/'

package-lock.json

@@ -842,7 +842,7 @@ $typeMap: (primary:#3963BC,
 /* select */
 @include b(select) {
   .el-tag {
-    background-color: #3963bc !important;
+    // background-color: #3963bc !important;
     &__close.el-icon-close {
       background-color: #3963bc;
       right: -7px;

src/assets/styles/realize/element-variables.scss

@@ -32,7 +32,7 @@ export default class Admin {
   }
 
   static getAllAuths() {
-    return get('cms/admin/authority')
+    return get('cms/admin/permission')
   }
 
   static async getAdminUsers({ group_id, count = this.uCount, page = this.uPag }) {

src/lin/models/admin.js

@@ -128,7 +128,7 @@ _axios.interceptors.response.use(
         return
       }
       // 令牌相关，刷新令牌
-      if (error_code === 10040 || error_code === 10050) {
+      if (error_code === 10040 || error_code === 10041 || error_code === 10050 || error_code === 10051) {
         const cache = {}
         if (cache.url !== url) {
           cache.url = url

src/lin/plugins/axios.js

@@ -14,7 +14,13 @@
         <el-input size="medium" clearable v-model="form.username" :disabled="isEdited"></el-input>
       </el-form-item>
       <el-form-item label="邮箱" prop="email">
-        <el-input size="medium" clearable v-model="form.email" auto-complete="new-password"></el-input>
+        <el-input
+          size="medium"
+          clearable
+          v-model="form.email"
+          :disabled="isEdited"
+          auto-complete="new-password"
+        ></el-input>
       </el-form-item>
       <el-form-item v-if="pageType === 'add'" label="密码" prop="password">
         <el-input
@@ -31,8 +37,8 @@
       <el-form-item v-if="pageType !== 'password'" label="选择分组">
         <el-select
           size="medium"
-          filterable
-          v-model="form.group_id"
+          multiple
+          v-model="form.group_ids"
           :disabled="groups.length === 0"
           placeholder="请选择分组"
         >
@@ -124,7 +130,7 @@ export default {
         password: '',
         confirm_password: '',
         email: '',
-        group_id: '请先创建分组',
+        group_ids: [],
       },
       // 验证规则
       rules: {
@@ -172,13 +178,16 @@ export default {
             }
           } else {
             // 更新用户信息
-            if (this.form.email === this.info.email && this.form.group_id === this.info.group_id) {
+            if (
+              this.form.email === this.info.email
+              && this.form.group_ids.sort().toString() === this.info.group_ids.sort().toString()
+            ) {
               this.$emit('handleInfoResult', false)
               return
             }
             try {
               this.loading = true
-              res = await Admin.updateOneUser(this.form.email, this.form.group_id, this.id)
+              res = await Admin.updateOneUser(this.form.email, this.form.group_ids, this.id)
             } catch (e) {
               this.loading = false
               console.log(e)
@@ -203,22 +212,26 @@ export default {
       if (this.pageType === 'edit') {
         this.setInfo()
       } else {
-        this.form.group_id = this.groups[0].id
+        this.form.group_ids = [this.groups[0].id]
         this.$refs[formName].resetFields()
       }
     },
     setInfo() {
       this.form.username = this.info.username
       this.form.email = this.info.email
-      this.form.group_id = this.info.group_id
+      const temp = []
+      this.info.group_ids.forEach(item => {
+        temp.push(item.id)
+      })
+      this.form.group_ids = temp
     },
   },
   watch: {
     groups: {
       // 默认选中管理员组
       handler() {
         if (this.groups && this.groups[0] && this.groups[0].id) {
-          this.form.group_id = this.groups[0].id
+          this.form.group_ids = [this.groups[0].id]
         }
       },
       immediate: true,

src/views/admin/user/UserInfo.vue

@@ -93,7 +93,7 @@ export default {
         password: '',
         confirm_password: '',
         email: '',
-        group_id: '',
+        group_ids: [],
       },
       loading: false,
     }
@@ -139,7 +139,7 @@ export default {
       this.id = selectedData.id
       this.form.username = selectedData.username
       this.form.email = selectedData.email
-      this.form.group_id = selectedData.group_id
+      this.form.group_ids = selectedData.groups
       this.dialogFormVisible = true
     },
     // 下拉框选择分组