Merge branch 'master' of http://git.shengws.com/csx/Pad_New

src/pages/console/managementConsole/staff_role/editStaff/index.vue

@@ -50,8 +50,11 @@
     <div class="staffBox">
       <van-field v-model="title" label="职位" placeholder="请填写"/>
     </div>
-    <div v-if="adminInfo.status == 1 && !adminInfo.admin.is_super_admin  &&  !adminInfo.is_sub_super_admin" class="stop" @click="onClick(2)">禁用该员工账号</div>
-    <div v-if="adminInfo.status != 1 && !adminInfo.admin.is_super_admin  &&  !adminInfo.is_sub_super_admin " class="stop1" @click="onClick(1)">恢复该员工账号</div>
+    <div v-if="isShow()" class="stop" @click="onClick(2)">禁用该员工账号</div>
+    <!--<div v-if="isShow()" class="stop" @click="onClick(2)">禁用该员工账号</div>-->
+
+    <div v-if="adminInfo.status == 1  &&  (!adminInfo.is_sub_super_admin || !this.is_sub_super_admin)" class="stop" @click="onClick(2)">禁用该员工账号</div>
+    <div v-if="adminInfo.status != 1  &&  (!adminInfo.is_sub_super_admin || !this.is_sub_super_admin)" class="stop1" @click="onClick(1)">恢复该员工账号</div>
 
     <van-popup v-model="show1" position="bottom" :style="{ height: '40%' }">
       <van-picker show-toolbar :columns="user_type_name" @cancel="onCancel" @confirm="onUserTypeConfirm"/>
@@ -83,6 +86,7 @@
           admin:{},
 
         },
+        is_sub_super_admin:false,
         show1: false,
         show2: false,
         type_name:"",
@@ -132,6 +136,12 @@
       };
     },
     methods: {
+      isShow(){
+
+        // if(this.adminInfo.admin_user_id)
+
+
+      },
       onUserTypeConfirm(value, index){
         this.type_name = value
         this.show1 = false
@@ -171,12 +181,20 @@
 
       },
       save() {
+
         if (this.name.trim().length == 0) {
           this.$toast({
             message: "姓名不能为空!"
           });
           return;
         }
+        if(this.type_name.length == 0){
+          this.$toast({
+            message: "职称不能为空!"
+          });
+          return;
+        }
+
         if (this.role_ids.length <= 0) {
           this.$toast({
             message: "至少选择一种角色"
@@ -210,8 +228,8 @@
         GetAdminUserInfo(params).then(response => {
           if (response.data.state === 1) {
             this.adminInfo = response.data.data.user_info
-            console.log(this.adminInfo)
-            // this.name = this.adminInfo.
+            this.is_sub_super_admin = response.data.data.is_sub_super_admin
+
             this.name = this.adminInfo.user_name
             this.tel = this.adminInfo.admin.mobile
             this.title = this.adminInfo.user_title_name
@@ -235,6 +253,7 @@
               }
             }
 
+
             //如果当前用户是超级管理员，而且是在编辑自己的信息的时候，将子管理员角色去除
             for (let i = 0; i < this.roles.length; i++){
               if(this.adminInfo.admin.id == this.$store.getters.user.admin.id && this.$store.getters.user.admin.is_super_admin && this.roles[i].is_system == 1 && this.roles[i].name == "子管理员"){
@@ -244,6 +263,7 @@
             }
 
 
+
           } else {
             this.$toast({
               message: response.data.msg

src/pages/console/managementConsole/staff_role/employeeList/index.vue

@@ -41,6 +41,7 @@ export default {
   data() {
     return {
       allChecked: false,
+      isSubSuperAdmin:false,
       result: [],
       admin_user: []
     };
@@ -72,6 +73,8 @@ export default {
       GetAllStaff().then(response => {
         if (response.data.state === 1) {
           this.admin_user = response.data.data.admins;
+          this.isSubSuperAdmin = response.data.data.isSubSuperAdmin;
+
           console.log(this.admin_user);
           for (let i = 0; i < this.admin_user.length; i++) {
             if (this.admin_user[i].role_ids.length > 0) {
@@ -85,12 +88,23 @@ export default {
             }
           }
           for (let i = 0; i < this.admin_user.length; i++) {
-            if (
-              this.admin_user[i].user_id == this.$store.getters.user.org.creator
-            ) {
-              this.admin_user.splice(i, 1);
-              i = i - 1;
+
+            if(this.isSubSuperAdmin){
+              if (this.admin_user[i].user_id == this.$store.getters.user.org.creator) {
+                this.admin_user.splice(i, 1);
+                i = i - 1;
+              }else{
+                if(this.admin_user[i].is_sub_admin && this.admin_user[i].user_id != this.$store.getters.user.admin.id){
+                  this.admin_user.splice(i, 1);
+                  i = i - 1;
+                }
+              }
+            }else{
+
+
             }
+
+
           }
         } else {
           this.$toast({

src/pages/console/managementConsole/staff_role/staffManagement/index.vue

@@ -91,7 +91,7 @@ export default {
 
           for(let i = 0; i < response.data.data.admins.length; i++){
             if(response.data.data.admins[i].status == 1){
-              if(response.data.data.isSubSuperAdmin){ //当前用户为子管理员，不展示管理员信息
+              if(response.data.data.isSubSuperAdmin){ //当前用户为子管理员，不展示其他子管理员信息
                   if(response.data.data.admins[i].user_id != response.data.data.org_creator){
                     this.admin_user.push(response.data.data.admins[i])
                   }

src/pages/console/managementConsole/staff_role/userManage/index.vue

@@ -11,8 +11,8 @@
         class="staffOne"
         v-for="(item, index) in admin_user"
         :key="index"
-        
-        @click="goEditStaff(item.user_id,item.is_sub_admin)"
+
+        @click="goEditStaff(item.is_sub_admin,item.user_id)"
 
       >
         <img v-if="item.avatar.length > 0" :src="item.avatar" alt />
@@ -24,7 +24,7 @@
         <p >
           <span>{{ item.user_name }}</span>
           <i
-            v-if="org_creator != item.user_id"
+            v-if="isShow(item.is_sub_admin,item.user_id)"
             class="iconfont icon-bianji bianji"
           ></i>
         </p>
@@ -44,6 +44,7 @@
 // import "../libs/rem.js";
 import { setRem } from "@/libs/functionRem";
 import { GetAllStaff } from "@/api/admin_user";
+import {Toast} from "vant";
 
 export default {
   data() {
@@ -52,15 +53,39 @@ export default {
       active: 0,
       admin_user: [],
       org_creator: 0,
-      name:''
+      name:'',
+      isSubSuperAdmin:false,
     };
   },
   methods: {
+    isShow:function(is_sub_admin,user_id){
+      if (!this.isSubSuperAdmin){
+        return true
+      }else {
+        if (is_sub_admin) {
+          if (user_id == this.$store.getters.user.admin.id) {
+            return true
+          }else{
+            return false
+          }
+        } else {
+          if (user_id != this.$store.getters.user.org.creator) {
+            return true
+
+          } else {
+            return false
+
+          }
+        }
+      }
+    },
     GetAllStaff: function() {
       this.loading = true
       GetAllStaff().then(response => {
         if (response.data.state === 1) {
           this.admin_user = response.data.data.admins;
+          this.isSubSuperAdmin = response.data.data.isSubSuperAdmin;
+
           for (let i = 0; i < this.admin_user.length; i++) {
             if (this.admin_user[i].role_ids.length > 0) {
               let isExist = -1;
@@ -83,9 +108,33 @@ export default {
         }
       });
     },
-    goEditStaff: function(id,is_sub_admin) {
-      if (this.org_creator != id){
-        this.$router.push({ path: "/staff/editstaff?id=" + id });
+    goEditStaff: function(is_sub_admin, user_id) {
+      if (this.isShow(is_sub_admin,user_id)){
+        this.$router.push({ path: "/staff/editstaff?id=" + user_id });
+      }else{
+
+        if (!this.isSubSuperAdmin){
+
+        }else {
+          if (is_sub_admin) {
+            if (user_id == this.$store.getters.user.admin.id) {
+
+            }else{
+              Toast("无法修改其他子管理员或者管理员信息");
+
+            }
+          } else {
+            if (user_id != this.$store.getters.user.org.creator) {
+
+            } else {
+              Toast("无法修改其他子管理员或者管理员信息");
+
+
+            }
+          }
+        }
+
+
       }
     },
     goAddStaff: function() {
@@ -98,7 +147,7 @@ export default {
     //获取没被禁用的用户
 
     this.org_creator  = this.$store.getters.user.org.creator
-    console.log(this.org_creator)
+
     this.GetAllStaff();
   }
 };

src/pages/homeIndex/index.vue

@@ -289,7 +289,7 @@ export default {
       }
     },
     toCreateOrg() {
-      this.show = false;
+      this.show = false
       this.$router.push({ path: "/perfectOrg" });
     },
     toPatients() {
@@ -323,11 +323,12 @@ export default {
             this.value1 = this.$store.getters.user.org.id;
             this.show = false;
           } else {
-            console.log(1);
+            console.log(1)
             this.show = true;
-            console.log(2);
+            console.log(2)
             this.apps = response.data.data.apps;
             this.banners = response.data.data.banners;
+
           }
         } else {
           this.$toast({