shaogen1995 4 лет назад
Родитель
Сommit
65deab4cf1

+ 1 - 1
src/views/layout/index.vue

@@ -246,7 +246,7 @@ export default {
     temp = JSON.parse(temp)
     if (temp) {
       const temp2 = temp.role[0]
-      if (temp2 === 'sys_admin' || temp2 === 'sys_base_admin') {
+      if (temp2 === 'sys_admin' || temp2 === 'sys_user') {
         this.tabList.push(
           {
             name: '系统管理',

+ 9 - 27
src/views/system/system2.vue

@@ -28,8 +28,8 @@
               <el-option
                 v-for="item in source"
                 :key="item.value"
-                :label="item.label"
-                :value="item.value"
+                :label="item.roleName"
+                :value="item.id"
               >
               </el-option>
             </el-select>
@@ -92,7 +92,7 @@
 </template>
 
 <script>
-import { getUserList, userRemov, resetPass } from '@/apis/system2'
+import { getUserList, userRemov, resetPass, getRole } from '@/apis/system2'
 import System2Add from './system2_add.vue'
 import System2Edit from './system2_Edit.vue'
 import TabList from '@/components/tabLeft4.vue'
@@ -115,29 +115,7 @@ export default {
       },
       dialogFormVisible: false,
       // 多选数据
-      source: [
-        { value: '', label: '全部' },
-        {
-          value: 1,
-          label: '超级管理员'
-        },
-        {
-          value: 2,
-          label: '保管部主任'
-        },
-        {
-          value: 3,
-          label: '保管部成员'
-        },
-        {
-          value: 4,
-          label: '其他部门人员'
-        },
-        {
-          value: 5,
-          label: '征集部主任'
-        }
-      ],
+      source: [],
       // 表格数据
       tableData: []
     }
@@ -217,7 +195,11 @@ export default {
     }
   },
   // 生命周期 - 创建完成(可以访问当前this实例)
-  created () {},
+  async created () {
+    // 获取角色
+    const res = await getRole()
+    this.source = res.data
+  },
   // 生命周期 - 挂载完成(可以访问DOM元素)
   mounted () {
     // 调用获取列表方法

+ 3 - 3
src/views/system/system2_Edit.vue

@@ -14,8 +14,8 @@
         <el-form-item label="确定密码:" prop="checkPass">
           <el-input v-model="form.checkPass" placeholder="请输入" style="width:300px" show-password></el-input>
         </el-form-item> -->
-        <el-form-item label="角色:" prop="roleId">
-          <el-select v-model="form.roleId" placeholder="请选择" style="width:300px">
+        <el-form-item label="角色:" prop="roleId" v-if="form.roleId!==1" v-show="form.roleId!==6">
+          <el-select v-model="form.roleId" placeholder="请选择" style="width:300px" >
             <el-option
               v-for="item in source"
               :key="item.value"
@@ -67,7 +67,7 @@ export default {
         userName: '',
         // passWord: '',
         // checkPass: '',
-        roleId: 1,
+        roleId: 2,
         phone: '',
         isEnabled: 1
       },

+ 1 - 1
src/views/system/system2_add.vue

@@ -67,7 +67,7 @@ export default {
         userName: '',
         // passWord: '',
         // checkPass: '',
-        roleId: 1,
+        roleId: 2,
         phone: '',
         isEnabled: 1
       },