Merge remote-tracking branch 'origin/master'

base-manager-ui/admin/src/pages/basicset/system/user/User.vue

@@ -64,13 +64,14 @@
     <AddUserRole
       ref="AddUserRole"
       :addVisible.sync="addVisible"
+      :roleList="roleList"
       @addSuccess="getUserList"
     ></AddUserRole>
   </div>
 </template>
 
 <script>
-import { getUserList } from "@/services/system";
+import { getUserList, getRoleList } from "@/services/system";
 import { pageSizeOptions } from "@/config/pageConfig.js";
 import AddUserRole from "./modal/AddUserRole.vue";
 import { mapState } from "vuex";
@@ -98,8 +99,15 @@ export default {
         title: "所属角色",
         dataIndex: "roleIds",
         customRender: (text) => {
-          if (text && this.dict.roleIds) {
-            return <a-tag>{this.dict.roleIds[text]}</a-tag>;
+          if (text && this.roleList.length) {
+            let obj = {};
+            this.roleList.forEach((v) => {
+              obj[v.id] = v.name;
+            });
+            let roleIds = text.split(",");
+            return roleIds.map((v) => {
+              return <a-tag>{obj[v]}</a-tag>;
+            });
           }
         },
       },
@@ -130,6 +138,7 @@ export default {
         realName: "",
       },
       tableData: [],
+      roleList: [], // 角色列表
       selectedRowKeys: [],
       dict: {}, // 字典
       addVisible: false,
@@ -141,9 +150,22 @@ export default {
     ...mapState("site", ["userInfo"]),
   },
   created() {
+    this.getRoleList();
     this.getUserList();
   },
   methods: {
+    // 获取角色列表
+    async getRoleList() {
+      let res = await getRoleList({
+        page: 1,
+        size: -1,
+      });
+      if (res.data.code == 1) {
+        let { data } = res.data.data;
+        this.roleList = data;
+      }
+    },
+
     // 获取用户列表
     async getUserList() {
       this.loading = true;

base-manager-ui/admin/src/pages/basicset/system/user/modal/AddUserRole.vue

@@ -38,7 +38,7 @@
 </template>
 
 <script>
-import { getRoleList, saveUser } from "@/services/system";
+import { saveUser } from "@/services/system";
 
 export default {
   components: {},
@@ -48,6 +48,11 @@ export default {
       type: Boolean,
       default: false,
     },
+    roleList: {
+      required: true,
+      type: Array,
+      default: () => [],
+    },
   },
   data() {
     return {
@@ -55,7 +60,6 @@ export default {
       form: {
         roleIds: [],
       },
-      roleList: [],
       rules: {
         roleIds: [{ required: true, message: "请选择角色", trigger: "change" }],
       },
@@ -71,21 +75,8 @@ export default {
       },
     },
   },
-  created() {
-    this.getRoleList();
-  },
+  created() {},
   methods: {
-    // 获取角色列表
-    async getRoleList() {
-      let res = await getRoleList({
-        page: 1,
-        size: -1,
-      });
-      if (res.data.code == 1) {
-        let { data } = res.data.data;
-        this.roleList = data;
-      }
-    },
     // 新增
     onAdd() {
       Object.assign(this.form, this.$options.data().form);
@@ -96,7 +87,7 @@ export default {
       this.$nextTick(() => {
         this.form = { ...row };
         if (this.form.roleIds) {
-          this.form.roleIds = this.form.roleIds.split(",");
+          this.form.roleIds = this.form.roleIds.split(",").map(Number);
         } else {
           this.form.roleIds = [];
         }