v1.9 发布，详情查看发行版说明

src/views/system/user/index.vue

@@ -1,13 +1,13 @@
 <template>
   <div class="app-container">
     <el-row :gutter="20">
-      <el-col :xs="24" :sm="24" :md="4" :lg="4" :xl="4">
+      <el-col :xs="7" :sm="6" :md="4" :lg="4" :xl="4">
         <div class="head-container">
           <el-input v-model="deptName" clearable placeholder="输入部门名称搜索" prefix-icon="el-icon-search" style="width: 100%;" class="filter-item" @input="getDeptDatas"/>
         </div>
         <el-tree :data="depts" :props="defaultProps" :expand-on-click-node="false" default-expand-all @node-click="handleNodeClick"/>
       </el-col>
-      <el-col :xs="24" :sm="24" :md="20" :lg="20" :xl="20">
+      <el-col :xs="17" :sm="18" :md="20" :lg="20" :xl="20">
         <eHeader :query="query" :sup_this="sup_this" :dicts="dicts"/>
         <!--表格渲染-->
         <el-table v-loading="loading" :data="data" size="small" style="width: 100%;">
@@ -31,11 +31,11 @@
               <span>{{ parseTime(scope.row.createTime) }}</span>
             </template>
           </el-table-column>
-          <el-table-column label="操作" width="140" align="center">
+          <el-table-column v-if="checkPermission(['ADMIN','USER_ALL','USER_EDIT','USER_DELETE'])" label="操作" width="125" align="center">
             <template slot-scope="scope">
-              <edit v-if="checkPermission(['ADMIN','USER_ALL','USER_EDIT'])" :dicts="dicts" :data="scope.row" :sup_this="sup_this"/>
+              <edit v-permission="['ADMIN','USER_ALL','USER_EDIT']" :dicts="dicts" :data="scope.row" :sup_this="sup_this"/>
               <el-popover
-                v-if="checkPermission(['ADMIN','USER_ALL','USER_DELETE'])"
+                v-permission="['ADMIN','USER_ALL','USER_DELETE']"
                 :ref="scope.row.id"
                 placement="top"
                 width="180">
@@ -44,7 +44,7 @@
                   <el-button size="mini" type="text" @click="$refs[scope.row.id].doClose()">取消</el-button>
                   <el-button :loading="delLoading" type="primary" size="mini" @click="subDelete(scope.row.id)">确定</el-button>
                 </div>
-                <el-button slot="reference" type="danger" size="mini">删除</el-button>
+                <el-button slot="reference" type="danger" icon="el-icon-delete" size="mini"/>
               </el-popover>
             </template>
           </el-table-column>

src/views/system/user/module/edit.vue

@@ -1,6 +1,6 @@
 <template>
   <div>
-    <el-button size="mini" type="success" @click="to">编辑</el-button>
+    <el-button size="mini" type="primary" icon="el-icon-edit" @click="to"/>
     <eForm ref="form" :sup_this="sup_this" :is-add="false" :dicts="dicts"/>
   </div>
 </template>
@@ -28,6 +28,7 @@ export default {
       const _this = this.$refs.form
       _this.getRoles()
       _this.getDepts()
+      _this.getRoleLevel()
       _this.roleIds = []
       _this.form = { id: this.data.id, username: this.data.username, phone: this.data.phone, email: this.data.email, enabled: this.data.enabled.toString(), roles: [], dept: { id: this.data.dept.id }, job: { id: this.data.job.id }}
       this.data.roles.forEach(function(data, index) {

src/views/system/user/module/form.vue

@@ -29,6 +29,7 @@
         <el-select v-model="roleIds" style="width: 450px;" multiple placeholder="请选择">
           <el-option
             v-for="(item, index) in roles"
+            :disabled="level !== 1 && item.level <= level"
             :key="item.name + index"
             :label="item.name"
             :value="item.id"/>
@@ -46,7 +47,7 @@
 
 import { add, edit } from '@/api/user'
 import { getDepts } from '@/api/dept'
-import { getAll } from '@/api/role'
+import { getAll, getLevel } from '@/api/role'
 import { getAllJob } from '@/api/job'
 import Treeselect from '@riophae/vue-treeselect'
 import '@riophae/vue-treeselect/dist/vue-treeselect.css'
@@ -78,7 +79,7 @@ export default {
     }
     return {
       dialog: false, loading: false, form: { username: '', email: '', enabled: 'false', roles: [], job: { id: '' }, dept: { id: '' }, phone: null },
-      roleIds: [], roles: [], depts: [], deptId: null, jobId: null, jobs: [], style: 'width: 184px',
+      roleIds: [], roles: [], depts: [], deptId: null, jobId: null, jobs: [], style: 'width: 184px', level: 3,
       rules: {
         username: [
           { required: true, message: '请输入用户名', trigger: 'blur' },
@@ -210,6 +211,14 @@ export default {
     },
     selectFun(node, instanceId) {
       this.getJobs(node.id)
+    },
+    getRoleLevel() {
+      getLevel().then(res => {
+        console.log(res)
+        this.level = res.level
+      }).catch(err => {
+        console.log(err.response.data.message)
+      })
     }
   }
 }

src/views/system/user/module/header.vue

@@ -8,11 +8,11 @@
     <el-select v-model="query.enabled" clearable placeholder="状态" class="filter-item" style="width: 90px" @change="toQuery">
       <el-option v-for="item in enabledTypeOptions" :key="item.key" :label="item.display_name" :value="item.key"/>
     </el-select>
-    <el-button class="filter-item" size="mini" type="primary" icon="el-icon-search" @click="toQuery">搜索</el-button>
+    <el-button class="filter-item" size="mini" type="success" icon="el-icon-search" @click="toQuery">搜索</el-button>
     <!-- 新增 -->
     <div style="display: inline-block;margin: 0px 2px;">
       <el-button
-        v-if="checkPermission(['ADMIN','USER_ALL','USER_CREATE'])"
+        v-permission="['ADMIN','USER_ALL','USER_CREATE']"
         class="filter-item"
         size="mini"
         type="primary"
@@ -22,18 +22,17 @@
     </div>
     <!-- 导出 -->
     <el-button
-      v-if="checkPermission(['ADMIN'])"
+      v-permission="['ADMIN']"
       :loading="downloadLoading"
       size="mini"
       class="filter-item"
-      type="primary"
+      type="warning"
       icon="el-icon-download"
       @click="download">导出</el-button>
   </div>
 </template>
 
 <script>
-import checkPermission from '@/utils/permission' // 权限判断函数
 import { parseTime } from '@/utils/index'
 import eForm from './form'
 // 查询条件
@@ -67,10 +66,10 @@ export default {
     }
   },
   methods: {
-    checkPermission,
     add() {
       this.$refs.form.getDepts()
       this.$refs.form.getRoles()
+      this.$refs.form.getRoleLevel()
       this.$refs.form.dialog = true
     },
     // 去查询