Browse Source

增加应用管理员权限

zhuliu 9 months ago
parent
commit
c09ce4d7c1

+ 1 - 1
src/router/index.js

@@ -407,7 +407,7 @@ router.beforeEach((to, from, next) => {
 
 function setRoutePermission(data){
   return new Promise((resolve, reject)=>{
-    if(Store.getters.userinfo?.roleType == 1){
+    if(permissions.hasPermission([1,3])){
       Store.commit('SET_ROUTERS', defaultBackStageManageRouterItem);
       resolve();
       return

+ 13 - 1
src/utils/permissions.js

@@ -8,7 +8,7 @@ export default{
   FunPermissions(str){
     // return true
     const user = Store.state.admin.userinfo
-    if(user.roleType == 1){
+    if(user.roleType == 1 || user.roleType == 3){
       return true
     }
     const permissionList = Store.state.permission.permission
@@ -17,4 +17,16 @@ export default{
     }
     return permissionList.includes(str)
   },
+  hasPermission(arr=[],roleType){
+    if(!roleType){
+      roleType = Store.state.admin.userinfo?.roleType
+    }
+    var index = arr.findIndex(item=>{
+      return item == roleType
+    })
+    if(index!=-1){
+      return true
+    }
+    return false
+  }
 }

+ 2 - 6
src/views/backStageManage/examine/examine/components/examine.vue

@@ -3,7 +3,7 @@
     <el-container>
         <el-header>
             <el-form :model="queryParams" ref="queryForm" size="small" :inline="true"  label-width="68px">
-                <el-form-item label="审核类型" prop="type">
+                <el-form-item label="审核类型" prop="type" v-if="$permission.hasPermission([1,3])">
                     <el-select v-model="queryParams.type" placeholder="请选择" clearable >
                         <el-option v-for="(item, key) in examineType" :key="key" :label="item" :value="key"></el-option>
                     </el-select>
@@ -266,11 +266,7 @@ export default {
             if(response.code == 200){
                 message.close()
                 this.$message.success('任务处理完成')
-                if(row){
-                    this.$set(row,'status',type)
-                }else{
-                    this.getList()
-                }
+                this.getList()
             }
         }).catch(error=>{
             message.close()

+ 3 - 0
src/views/backStageManage/examine/examine/components/mixins/commonData.js

@@ -12,5 +12,8 @@ export default{
         auditResult(){
             return this.$commonJS.arrToObjByDict('QIAO_BI_BUSINESS_TASK_RESULT')
         },
+        userinfo(){
+            return this.$store.getters.userinfo
+        }
     }
 }

+ 7 - 1
src/views/backStageManage/organization/department/components/form/department.vue

@@ -11,7 +11,7 @@
                     <el-input v-model="form.tenantName" placeholder="请输入所属租户" :readonly="true" ></el-input>
                 </el-form-item>
         
-                <el-form-item label="所属部门" prop="updepartment" v-if="parentId">
+                <el-form-item label="所属部门" prop="updepartment" v-if="lastName">
                     <el-input v-model="lastName" placeholder="请输入所属部门" :disabled="true"></el-input>
                 </el-form-item>
                 
@@ -72,6 +72,12 @@ export default {
             }
             this.init()
         },
+        parentId(){
+            if(this.$route.path != '/administrator/addDepartment'){
+                return
+            }
+            this.init()
+        },
     },
     computed: {
         userinfo() {

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

@@ -90,7 +90,7 @@
     </el-form>
     <div class="form_item_title">
         所属企业信息:
-        <div v-if="userinfo.roleType == 1 || userinfo.roleType == 2">
+        <div v-if="$permission.hasPermission([1,2,3])">
             <el-button v-if="!tenantForm.edit" type="text" @click="edit(2)">编辑</el-button>
             <template v-else>
                 <div>
@@ -170,7 +170,7 @@
             </el-col>
         </el-row>
     </el-form>
-    <div style="border:1px solid white;padding:10px;margin:10px 0;border-radius:8px;height:300px" :class="(tenantForm.edit == true && userinfo.roleType == 1)?'':'pointer_events_none'">
+    <div style="border:1px solid white;padding:10px;margin:10px 0;border-radius:8px;height:300px" :class="(tenantForm.edit == true && $permission.hasPermission([1,3]))?'':'pointer_events_none'">
         <vipTypeTable :tableData="tenantForm.vipTypes||[]"></vipTypeTable>
     </div>
   </div>

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

@@ -7,7 +7,7 @@
               <el-form-item label="姓名:" prop="name">
                 <el-input v-model="queryParams.name" placeholder="请输入"/>
               </el-form-item>
-              <el-form-item label="所属租户:" class="tenant" v-if="userinfo.roleType == 1">
+              <el-form-item label="所属租户:" class="tenant" v-if="$permission.hasPermission([1,3])">
         		<el-select v-model="queryParams.tenant" clearable placeholder="根据租户查询" >
 					<el-option
 						v-for="item in tenantList"
@@ -18,7 +18,7 @@
 				</el-select>
               </el-form-item>
               <el-form-item>
-                <el-button type="primary" icon="el-icon-search" size="mini" @click="getList">搜索</el-button>
+                <el-button type="primary" icon="el-icon-search" size="mini" @click="handleQuery">搜索</el-button>
                 <el-button icon="el-icon-refresh" size="mini" @click="resetQuery">重置</el-button>
               </el-form-item>
             </el-form>
@@ -43,7 +43,7 @@
                     <div class="block">
                         {{ scope.row.expitrTime }}
                         <el-popover
-                            v-if="userinfo.roleType == 1 && scope.row.expitrTime"
+                            v-if="($permission.hasPermission([1,3])) && scope.row.expitrTime"
                             placement="bottom"
                             title="修改到期时间"
                             width="220"
@@ -290,7 +290,7 @@ export default {
             this.getList()
         },
         getTenantList() {
-            if(this.userinfo.roleType != 1){
+            if(!this.$permission.hasPermission([1,3])){
                 return
             }
             this.$api.getAllTenantList().then(response => {

+ 1 - 1
src/views/backStageManage/organization/position/components/position.vue

@@ -8,7 +8,7 @@
                 <el-input v-model="queryParams.name" placeholder="请输入职位名称"/>
               </el-form-item>
               <el-form-item>
-                <el-button type="primary" icon="el-icon-search" size="mini" @click="getList">搜索</el-button>
+                <el-button type="primary" icon="el-icon-search" size="mini" @click="handleQuery">搜索</el-button>
                 <el-button icon="el-icon-refresh" size="mini" @click="resetQuery">重置</el-button>
               </el-form-item>
             </el-form>

+ 1 - 1
src/views/backStageManage/organization/tenant/components/tenant.vue

@@ -148,7 +148,7 @@ export default {
             0:'禁用',
             1:'启用'
         }
-        this.$api.updateTenantVip(params).then(response=>{
+        this.$api.updateQiaoBiTenant(params).then(response=>{
             if (response.code === 200) {
                 this.$message.success( state[row.state] + '成功');
             }