From aeab9c8bbd9b8be8cd01ba419f15f562087e6653 Mon Sep 17 00:00:00 2001
From: yujintao <yujintaodotcn@foxmail.com>
Date: Fri, 25 Oct 2019 09:27:46 +0800
Subject: [PATCH] =?UTF-8?q?=E8=A7=92=E8=89=B2=E7=BC=96=E7=A0=81=E6=94=B9?=
 =?UTF-8?q?=E4=B8=BA=E8=A7=92=E8=89=B2=E7=B1=BB=E5=9E=8B?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/views/modules/sys/role-add-or-update.vue | 20 ++++++------
 src/views/modules/sys/role.vue               | 32 +++++++++++++++++---
 2 files changed, 38 insertions(+), 14 deletions(-)

diff --git a/src/views/modules/sys/role-add-or-update.vue b/src/views/modules/sys/role-add-or-update.vue
index 8f46b883..670bc469 100644
--- a/src/views/modules/sys/role-add-or-update.vue
+++ b/src/views/modules/sys/role-add-or-update.vue
@@ -13,10 +13,10 @@
         <el-input v-model="dataForm.name"
                   :placeholder="$t('role.name')"></el-input>
       </el-form-item>
-      <el-form-item label="角色编码">
-        <el-select v-model="dataForm.code"
-                   placeholder="角色编码">
-          <el-option v-for="item in roleCodeList"
+      <el-form-item label="角色类型">
+        <el-select v-model="dataForm.typeKey"
+                   placeholder="角色类型">
+          <el-option v-for="item in roleTypeList"
                      :key="item.dictValue"
                      :label="item.dictName"
                      :value="item.dictValue">
@@ -71,14 +71,14 @@ export default {
       visible: false,
       menuList: [],
       deptList: [],
-      roleCodeList: [],
+      roleTypeList: [],
       dataForm: {
         id: '',
         name: '',
         menuIdList: [],
         deptIdList: [],
         remark: '',
-        code: ''
+        typeKey: ''
       }
     }
   },
@@ -92,7 +92,7 @@ export default {
     }
   },
   created () {
-    this.getRoleCodeList()
+    this.getRoleTypeList()
   },
   methods: {
     init () {
@@ -170,12 +170,12 @@ export default {
         }).catch(() => { })
       })
     }, 1000, { 'leading': true, 'trailing': false }),
-    getRoleCodeList () {
-      this.$http.get(`/sys/dict/listSimple/sysRoleCode`).then(({ data: res }) => {
+    getRoleTypeList () {
+      this.$http.get(`/sys/dict/listSimple/sysRoleType`).then(({ data: res }) => {
         if (res.code !== 0) {
           return this.$message.error(res.msg)
         }
-        this.roleCodeList = res.data
+        this.roleTypeList = res.data
       }).catch(() => { })
     }
   }
diff --git a/src/views/modules/sys/role.vue b/src/views/modules/sys/role.vue
index 9f7c017d..e62280e7 100644
--- a/src/views/modules/sys/role.vue
+++ b/src/views/modules/sys/role.vue
@@ -38,10 +38,11 @@
                          :label="$t('role.name')"
                          header-align="center"
                          align="center"></el-table-column>
-        <el-table-column prop="code"
-                         label="角色编码"
+        <el-table-column prop="typeKey"
+                         label="角色类型"
                          header-align="center"
-                         align="center"></el-table-column>
+                         align="center"
+                         :formatter="showRoleTypeFormatter"></el-table-column>
         <el-table-column prop="remark"
                          :label="$t('role.remark')"
                          header-align="center"
@@ -100,11 +101,34 @@ export default {
       },
       dataForm: {
         name: ''
-      }
+      },
+      sysRoleTypeList: []
     }
   },
+  created () {
+    this.getSysRoleTypeList()
+  },
   components: {
     AddOrUpdate
+  },
+  methods: {
+    getSysRoleTypeList () {
+      this.$http.get(`/sys/dict/listSimple/sysRoleType`).then(({ data: res }) => {
+        if (res.code !== 0) {
+          return this.$message.error(res.msg)
+        }
+        this.sysRoleTypeList = res.data
+      }).catch(() => { })
+    },
+    showRoleTypeFormatter: function (row, column) {
+      if (row.typeKey) {
+        let dict = this.sysRoleTypeList.filter(item => item.dictValue === row.typeKey)[0]
+        if (dict) {
+          return dict.dictName
+        }
+      }
+      return ''
+    }
   }
 }
 </script>