zhuliu 2 місяців тому
батько
коміт
bd0bd9d596

+ 31 - 26
src/router/index.js

@@ -112,18 +112,32 @@ export const defaultBackStageManageRouterItem = [
         meta: {title: '企业管理',icon: '企业',sign:'administrator/tenant'},
       },
       {
+        path: 'personnel',
+        name: 'Administrator_personnel',
+        component: () => import('@/views/backStageManage/organization/personnel/index.vue'),
+        meta: {title: '人员清单',icon: '人员',sign:'administrator/personnel'},
+      },
+      {
+        path: 'department',
+        name: 'Administrator_department',
+        component: () => import('@/views/backStageManage/organization/department/index.vue'),
+        meta: {title: '部门管理',icon: '部门',sign:'administrator/department'},
+      },
+      {
+        path: 'position',
+        name: 'Administrator_position',
+        component: () => import('@/views/backStageManage/organization/position/index.vue'),
+        meta: {title: '职位管理',icon: '职位',sign:'administrator/position'},
+        
+      },
+      {
         path: 'editTenant',
         name: 'Administrator_editTenant',
         component: () => import('@/views/backStageManage/organization/tenant/editTenant.vue'),
         meta: {title: '编辑企业信息',icon: '企业',keepAlive:true},
         hidden:true
       },
-      {
-        path: 'personnel',
-        name: 'Administrator_personnel',
-        component: () => import('@/views/backStageManage/organization/personnel/index.vue'),
-        meta: {title: '人员清单',icon: '人员',sign:'administrator/personnel'},
-      },
+      
       {
         path: 'invitationMessage',
         name: 'Administrator_invitationMessage',
@@ -131,12 +145,7 @@ export const defaultBackStageManageRouterItem = [
         meta: {title: '邀请人员清单',icon: '人员',sign:'administrator/invitationMessage'},
         hidden:true
       },
-      {
-        path: 'department',
-        name: 'Administrator_department',
-        component: () => import('@/views/backStageManage/organization/department/index.vue'),
-        meta: {title: '部门管理',icon: '部门',sign:'administrator/department'},
-      },
+      
       {
         path: 'addDepartment',
         name: 'Administrator_addDepartment',
@@ -151,13 +160,7 @@ export const defaultBackStageManageRouterItem = [
         meta: {title: '编辑部门', keepAlive:true},
         hidden:true
       },
-      {
-        path: 'position',
-        name: 'Administrator_position',
-        component: () => import('@/views/backStageManage/organization/position/index.vue'),
-        meta: {title: '职位管理',icon: '职位',sign:'administrator/position'},
-        
-      },
+      
       {
         path: 'addPosition',
         name: 'Administrator_addPosition',
@@ -209,6 +212,13 @@ export const defaultBackStageManageRouterItem = [
         
       },
       {
+        path: 'vipType',
+        name: 'Administrator_vipType',
+        component: () => import('@/views/backStageManage/application/vipType/index.vue'),
+        meta: {title: '应用会员类型', icon: '会员类型',sign:'administrator/vipType'},
+        
+      },
+      {
         path: 'addVersion',
         name: 'Administrator_addVersion',
         component: () => import('@/views/backStageManage/application/vision/addVersion.vue'),
@@ -229,13 +239,7 @@ export const defaultBackStageManageRouterItem = [
         meta: {title: '应用版本详情', icon: 'editVision'},
         hidden:true
       },
-      {
-        path: 'vipType',
-        name: 'Administrator_vipType',
-        component: () => import('@/views/backStageManage/application/vipType/index.vue'),
-        meta: {title: '应用会员类型', icon: '会员类型',sign:'administrator/vipType'},
-        
-      },
+      
       {
         path: 'addVipType',
         name: 'Administrator_addVipType',
@@ -523,6 +527,7 @@ function setRoutePermission(data){
       if(item.meta.sign || item.children.length>0){
         addRouters.push(item)
       }
+      
     }
     Store.commit('SET_ROUTERS', addRouters);
     resolve();

+ 1 - 1
src/views/backStageManage/layout/Layout.vue

@@ -72,7 +72,7 @@ export default {
     },
     //到期通知
     expirationNotice(){
-      if(!this.$permission.FunPermissions('administrator/personnel')){
+      if(!this.$permission.hasPermission([1,3])){
         return
       }
       var params = {

+ 2 - 2
src/views/backStageManage/organization/personnel/components/personnel.vue

@@ -91,7 +91,7 @@
                     <div v-html="getRemainDays(scope.row.expitrTime)"></div>
                 </template>
             </el-table-column>
-            <el-table-column label="是否启用" align="center" show-overflow-tooltip>
+            <el-table-column label="是否启用" align="center" show-overflow-tooltip v-if="$permission.hasPermission([1,3])">
                 <template slot-scope="scope">
                     <div>
                        <el-switch 
@@ -108,7 +108,7 @@
             </el-table-column>
             
             
-            <el-table-column label="操作" align="center" class-name="small-padding fixed-width">
+            <el-table-column label="操作" align="center" class-name="small-padding fixed-width" v-if="$permission.hasPermission([1,3])">
                 <template slot-scope="scope">
                     <!-- <el-button size="mini" type="text" icon="el-icon-refresh-right" @click="handleReset(scope.row)">重置密码</el-button> -->
                     <!-- <el-button size="mini" type="text" icon="el-icon-edit" @click="handleEdit(scope.row)">修改</el-button> -->