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/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

@@ -94,7 +94,7 @@ export default {
     //获取没被禁用的用户
 
     this.org_creator  = this.$store.getters.user.org.creator
-    console.log(this.org_creator)
+
     this.GetAllStaff();
   }
 };

src/pages/homeIndex/index.vue

@@ -330,7 +330,6 @@ export default {
     }
   },
   created() {
-    console.log("1111111")
     this.GetHomeData();
     setRem();
   }