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

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

@@ -7,7 +7,7 @@
     </div>
     <div class="editStaffTip">必填</div>
     <div class="staffBox">
-      <van-field v-model="name" label="姓名" clearable placeholder="请输入姓名" />
+      <van-field v-model="name" label="姓名" clearable placeholder="请输入姓名"/>
       <van-field
         v-model="tel"
         type="tel"
@@ -28,7 +28,8 @@
                 shape="square"
                 v-for="(item, index) in roles"
                 :key="index"
-              >{{item.name}}</van-checkbox>
+              >{{item.name}}
+              </van-checkbox>
             </van-checkbox-group>
           </div>
         </template>
@@ -39,12 +40,12 @@
           <span class="custom-title" style="width:90px">职称</span>
           <div style="display:flex;">
             <div style="margin-right:2rem;display: flex;align-items: center;" @click="show1 = true">
-              <span>请选择</span>
-              <van-icon name="arrow-down" />
+              <span>{{type_name}}</span>
+              <van-icon name="arrow-down"/>
             </div>
-            <div style="margin-right:2rem;display: flex;align-items: center;">
-              <span>请选择</span>
-              <van-icon name="arrow-down" />
+            <div style="margin-right:2rem;display: flex;align-items: center;" @click="show2 = true">
+              <span>{{titles_name}}</span>
+              <van-icon name="arrow-down"/>
             </div>
           </div>
         </template>
@@ -52,114 +53,209 @@
     </div>
     <div class="editStaffTip">选填</div>
     <div class="staffBox">
-      <van-field v-model="title" label="职位" placeholder="请填写" />
+      <van-field v-model="title" label="职位" placeholder="请填写"/>
     </div>
     <div class="addnewStaff" @click="save(2)">
-      <van-icon class="addIcon" name="add" />
+      <van-icon class="addIcon" name="add"/>
       <p>保存并继续新增员工</p>
     </div>
     <van-popup v-model="show1" position="bottom" :style="{ height: '40%' }">
-      <van-picker show-toolbar :columns="columns" @cancel="onCancel" @confirm="onConfirm" />
+      <van-picker show-toolbar :columns="user_type_name" @cancel="onCancel" @confirm="onUserTypeConfirm"/>
     </van-popup>
     <van-popup v-model="show2" position="bottom" :style="{ height: '40%' }">
-      <van-picker show-toolbar :columns="columns" @cancel="onCancel" @confirm="onConfirm" />
+      <van-picker show-toolbar :columns="user_titles_name" @cancel="onCancel" @confirm="onUserTitleConfirm"/>
     </van-popup>
+
   </div>
 </template>
 
 <script>
-import { AdminInitData, CreateAdminUser } from "@/api/admin_user";
-import { checkMobile } from "@/utils/tools";
-import { setRem } from "@/libs/functionRem";
-
-export default {
-  data() {
-    return {
-      name: "",
-      tel: "",
-      role_ids: [],
-      title: "",
-      value1: "",
-      roles: [],
-      show1: false,
-      show2: false,
-      columns: ["杭州", "宁波", "温州", "嘉兴", "湖州"]
-    };
-  },
-  methods: {
-    GetAdminUserInitData() {
-      AdminInitData().then(response => {
-        if (response.data.state === 1) {
-          for (let i = 0; i < response.data.data.roles.length; i++) {
-            if (!response.data.data.roles[i].is_super_admin) {
-              this.roles.push(response.data.data.roles[i]);
-            }
+  import {AdminInitData, CreateAdminUser} from "@/api/admin_user";
+  import {checkMobile} from "@/utils/tools";
+  import {setRem} from "@/libs/functionRem";
+
+  export default {
+    data() {
+      return {
+        name: "",
+        tel: "",
+        role_ids: [],
+        title: "",
+        value1: "",
+        roles: [],
+        show1: false,
+        show2: false,
+        type_name:"",
+        titles_name:"",
+        user_type:2,
+        user_title:1,
+
+        user_types: [
+          {index: 2, name: '医生'},
+          {index: 3, name: '护士'}
+        ],
+        user_titles: [
+          {index: 1, name: '医士'},
+          {index: 2, name: '医师'},
+          {index: 3, name: '住院医师'},
+          {index: 4, name: '主治医师'},
+          {index: 5, name: '副主任医师'},
+          {index: 6, name: '主任医师'},
+          {index: 7, name: '护士'},
+          {index: 8, name: '护师'},
+          {index: 9, name: '主管护师'},
+          {index: 10, name: '副主任护师'},
+          {index: 11, name: '主任护师'},
+          {index: 12, name: '运营专员'},
+          {index: 13, name: '运营主管'}
+        ],
+
+        user_type_name: [
+          '医生',
+          '护士'
+        ],
+
+        user_titles_name: [
+          '医士',
+          '医师',
+          '住院医师',
+          '主治医师',
+          '副主任医师',
+          '主任医师',
+          '护士',
+          '护师',
+          '主管护师',
+          '副主任护师',
+          '主任护师',
+          '运营专员',
+          '运营主管'
+        ],
+
+      };
+    },
+    methods: {
+      onUserTypeConfirm(value, index){
+        this.show1 = false
+        for (let i = 0; i < this.user_types.length; i++){
+          if (this.user_types[i].name == value){
+            this.user_type = this.user_types[i].index
+            this.type_name= this.user_types[i].name
+
           }
-        } else {
-          this.$toast({
-            message: response.data.msg
-          });
+
         }
-      });
-    },
-    save(type) {
-      if (this.name.trim().length == 0) {
-        this.$toast({
-          message: "姓名不能为空!"
-        });
-        return;
-      }
-      if (!checkMobile(this.tel)) {
-        this.$toast({
-          message: "请填写正确的手机号码!"
-        });
-        return;
-      }
-      if (this.role_ids.length <= 0) {
-        this.$toast({
-          message: "至少选择一种角色"
-        });
-        return;
-      }
 
-      let params = {
-        name: this.name,
-        mobile: this.tel,
-        role_ids: this.role_ids.join(","),
-        title: this.title
-      };
-      console.log(params);
-      CreateAdminUser(params).then(response => {
-        if (response.data.state === 1) {
-          this.$toast({ message: "新增成功" });
-          if (type == 1) {
-            this.$router.go(-1);
+      },
+      onUserTitleConfirm(value, index){
+        this.show2 = false
+
+        for (let i = 0; i < this.user_titles.length; i++){
+          if (this.user_titles[i].name == value){
+            this.user_title = this.user_titles[i].index
+            this.titles_name= this.user_titles[i].name
+
+          }
+        }
+
+
+      },
+      onCancel() {
+        this.show1 = false
+        this.show2 = false
+
+
+      },
+
+      GetAdminUserInitData() {
+        AdminInitData().then(response => {
+          if (response.data.state === 1) {
+            for (let i = 0; i < response.data.data.roles.length; i++) {
+              if (!response.data.data.roles[i].is_super_admin) {
+                if(this.$store.getters.user.admin.is_super_admin){
+                  this.roles.push(response.data.data.roles[i]);
+                }else{
+                  if(response.data.data.roles[i].is_system != 1 && response.data.data.roles[i].name != "子管理员"){
+                    this.roles.push(response.data.data.roles[i]);
+                  }
+
+                }
+              }
+            }
           } else {
-            this.name = "";
-            this.mobile = "";
-            this.role_ids = [];
-            this.title = "";
+            this.$toast({
+              message: response.data.msg
+            });
           }
-        } else {
+        });
+      },
+      save(type) {
+        if (this.name.trim().length == 0) {
           this.$toast({
-            message: response.data.msg
+            message: "姓名不能为空!"
           });
+          return;
         }
-      });
+        if (!checkMobile(this.tel)) {
+          this.$toast({
+            message: "请填写正确的手机号码!"
+          });
+          return;
+        }
+        if (this.role_ids.length <= 0) {
+          this.$toast({
+            message: "至少选择一种角色"
+          });
+          return;
+        }
+
+        let params = {
+          name: this.name,
+          mobile: this.tel,
+          role_ids: this.role_ids.join(","),
+          title: this.title,
+          user_type: this.user_type,
+          user_title: this.user_title
+        };
+        CreateAdminUser(params).then(response => {
+          if (response.data.state === 1) {
+            this.$toast({message: "新增成功"});
+            if (type == 1) {
+              this.$router.go(-1);
+            } else {
+              this.name = "";
+              this.tel = "";
+              this.role_ids = [];
+              this.title = "";
+              this.user_type = 2
+              this.user_title = 1
+              this.titles_name = this.user_titles_name[0]
+              this.type_name = this.user_type_name[0]
+
+            }
+          } else {
+            this.$toast({
+              message: response.data.msg
+            });
+          }
+        });
+      }
+    },
+    created() {
+      this.GetAdminUserInitData();
+      this.titles_name = this.user_titles_name[0]
+      this.type_name = this.user_type_name[0]
+
+      setRem();
     }
-  },
-  created() {
-    this.GetAdminUserInitData();
-    setRem();
-  }
-};
+  };
 </script>
 
 <style lang="scss" scoped>
-.page_addStaff {
-  height: 100%;
-  overflow: hidden;
-  background: #fafafa;
+  .page_addStaff {
+    height: 100%;
+    overflow: hidden;
+    background: #fafafa;
+
   .editStaffTitle {
     height: 3.125rem;
     display: flex;
@@ -169,15 +265,18 @@ export default {
     padding: 0 1.125rem;
     background: #fff;
   }
+
   .jiantou {
     font-size: 1.5rem;
     font-weight: 600;
     margin-right: 1.25rem;
   }
+
   .titleName {
     font-size: 1.125rem;
     font-weight: 600;
   }
+
   .editStaffTip {
     height: 1.875rem;
     line-height: 1.875rem;
@@ -185,24 +284,31 @@ export default {
     padding-left: 0.875rem;
     color: #989898;
   }
+
   .staffBox {
-    .van-cell {
-      font-size: 1rem;
-    }
-    .newCell {
-      padding-right: 0;
-    }
+
+  .van-cell {
+    font-size: 1rem;
+  }
+
+  .newCell {
+    padding-right: 0;
+  }
+
   }
   .van-cell__title {
     display: flex;
   }
+
   .van-checkbox-group {
     display: flex;
     flex-wrap: wrap;
   }
+
   .van-checkbox {
     margin-bottom: 0.625rem;
   }
+
   .addnewStaff {
     height: 2.8125rem;
     line-height: 2.8125rem;
@@ -212,19 +318,23 @@ export default {
     display: flex;
     align-items: center;
     padding-left: 1rem;
-    .addIcon {
-      color: #338afb;
-      font-size: 1.5rem;
-      margin-right: 0.625rem;
-    }
+
+  .addIcon {
+    color: #338afb;
+    font-size: 1.5rem;
+    margin-right: 0.625rem;
+  }
+
+  }
   }
-}
 </style>
 <style lang="scss">
-.page_editStaff {
+  .page_editStaff {
+
   .van-cell__value {
     display: flex;
     align-items: center;
   }
-}
+
+  }
 </style>

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

@@ -26,13 +26,39 @@
           </div>
         </template>
       </van-cell>
+
+
+      <van-cell class="newCell">
+        <!-- 使用 title 插槽来自定义标题 -->
+        <template slot="title">
+          <span class="custom-title" style="width:90px">职称</span>
+          <div style="display:flex;">
+            <div style="margin-right:2rem;display: flex;align-items: center;" @click="show1 = true">
+              <span>{{type_name}}</span>
+              <van-icon name="arrow-down"/>
+            </div>
+            <div style="margin-right:2rem;display: flex;align-items: center;" @click="show2 = true">
+              <span>{{titles_name}}</span>
+              <van-icon name="arrow-down"/>
+            </div>
+          </div>
+        </template>
+      </van-cell>
+
     </div>
     <div class="editStaffTip">选填</div>
     <div class="staffBox">
       <van-field v-model="title" label="职位" placeholder="请填写"/>
     </div>
-    <div v-if="adminInfo.status == 1" class="stop" @click="onClick(2)">禁用该员工账号</div>
-    <div v-if="adminInfo.status != 1" class="stop1" @click="onClick(1)">恢复该员工账号</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>
+
+    <van-popup v-model="show1" position="bottom" :style="{ height: '40%' }">
+      <van-picker show-toolbar :columns="user_type_name" @cancel="onCancel" @confirm="onUserTypeConfirm"/>
+    </van-popup>
+    <van-popup v-model="show2" position="bottom" :style="{ height: '40%' }">
+      <van-picker show-toolbar :columns="user_titles_name" @cancel="onCancel" @confirm="onUserTitleConfirm"/>
+    </van-popup>
   </div>
 </template>
 
@@ -53,10 +79,97 @@
         name: "",
         tel: "",
         title: "",
-        adminInfo: {},
+        adminInfo: {
+          admin:{},
+
+        },
+        show1: false,
+        show2: false,
+        type_name:"",
+        titles_name:"",
+        user_type:2,
+        user_title:1,
+        user_types: [
+          {index: 2, name: '医生'},
+          {index: 3, name: '护士'}
+        ],
+        user_titles: [
+          {index: 1, name: '医士'},
+          {index: 2, name: '医师'},
+          {index: 3, name: '住院医师'},
+          {index: 4, name: '主治医师'},
+          {index: 5, name: '副主任医师'},
+          {index: 6, name: '主任医师'},
+          {index: 7, name: '护士'},
+          {index: 8, name: '护师'},
+          {index: 9, name: '主管护师'},
+          {index: 10, name: '副主任护师'},
+          {index: 11, name: '主任护师'},
+          {index: 12, name: '运营专员'},
+          {index: 13, name: '运营主管'}
+        ],
+
+        user_type_name: [
+          '医生',
+          '护士'
+        ],
+
+        user_titles_name: [
+          '医士',
+          '医师',
+          '住院医师',
+          '主治医师',
+          '副主任医师',
+          '主任医师',
+          '护士',
+          '护师',
+          '主管护师',
+          '副主任护师',
+          '主任护师',
+          '运营专员',
+          '运营主管'
+        ],
       };
     },
     methods: {
+      onUserTypeConfirm(value, index){
+        this.type_name = value
+        this.show1 = false
+
+        for (let i = 0; i < this.user_types.length; i++){
+          if (this.user_types[i].name == value){
+            this.user_type = this.user_types[i].index
+            this.type_name= this.user_types[i].name
+
+          }
+
+        }
+
+
+
+      },
+      onUserTitleConfirm(value, index){
+        this.titles_name = value
+        this.show2 = false
+
+        for (let i = 0; i < this.user_titles.length; i++){
+          if (this.user_titles[i].name == value){
+            this.user_title = this.user_titles[i].index
+            this.titles_name= this.user_titles[i].name
+
+          }
+        }
+
+
+
+
+      },
+      onCancel() {
+        this.show1 = false
+        this.show2 = false
+
+
+      },
       save() {
         if (this.name.trim().length == 0) {
           this.$toast({
@@ -76,6 +189,8 @@
           mobile: this.tel,
           role_ids: this.role_ids.join(","),
           title: this.title,
+          user_type: this.user_type,
+          user_title: this.user_title
         }
         EditAdmin(params).then(response => {
           if (response.data.state === 1) {
@@ -95,6 +210,7 @@
         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.name = this.adminInfo.user_name
             this.tel = this.adminInfo.admin.mobile
@@ -103,6 +219,31 @@
             for (let i = 0; i < roles.length; i++) {
               this.role_ids.push(parseInt(roles[i]))
             }
+
+            for (let i = 0; i < this.user_types.length; i++){
+              if (this.user_types[i].index == this.adminInfo.user_type){
+                  this.user_type = this.adminInfo.user_type
+                  this.type_name= this.user_types[i].name
+
+              }
+
+            }
+            for (let i = 0; i < this.user_titles.length; i++){
+              if (this.user_titles[i].index == this.adminInfo.user_title){
+                this.user_title = this.adminInfo.user_title
+                this.titles_name= this.user_titles[i].name
+              }
+            }
+
+            //如果当前用户是超级管理员，而且是在编辑自己的信息的时候，将子管理员角色去除
+            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 == "子管理员"){
+                this.roles.splice(i,1)
+                i = i - 1;
+              }
+            }
+
+
           } else {
             this.$toast({
               message: response.data.msg
@@ -129,20 +270,34 @@
           }
         });
       },
+
       GetAdminUserInitData() {
         AdminInitData().then(response => {
           if (response.data.state === 1) {
             for (let i = 0; i < response.data.data.roles.length; i++) {
               if (!response.data.data.roles[i].is_super_admin) {
-                this.roles.push(response.data.data.roles[i])
+                if(this.$store.getters.user.admin.is_super_admin){
+                  this.roles.push(response.data.data.roles[i]);
+                }else{
+                  if(response.data.data.roles[i].is_system != 1 && response.data.data.roles[i].name != "子管理员"){
+                    this.roles.push(response.data.data.roles[i]);
+                  }
+
+                }
               }
             }
+
+            this.GetAdminUserInfo(this.$route.query.id)
+
+
+
           } else {
             this.$toast({
               message: response.data.msg
             });
           }
         });
+
       },
       onClick(id) {
         if (id == 2) {
@@ -165,8 +320,7 @@
       }
     }, created() {
       this.GetAdminUserInitData()
-      var id = this.$route.query.id
-      this.GetAdminUserInfo(id)
+
       setRem()
 
     }

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

@@ -75,16 +75,19 @@ export default {
             if (this.admin_user[i].role_ids.length > 0) {
               let isExist = -1;
               let ids = this.admin_user[i].role_ids.split(",");
-              console.log(ids);
               isExist = ids.indexOf(this.$route.query.id.toString());
-              console.log(isExist);
-
               if (isExist >= 0) {
                 this.admin_user.splice(i, 1);
                 i = i - 1;
               }
             }
           }
+          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;
+              }
+          }
         } else {
           this.$toast({
             message: response.data.msg

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

@@ -8,6 +8,7 @@
       <van-field
         v-model="name"
         required
+        maxlength="30"
         label="角色名称"
         placeholder="请填写角色名称"
       />

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

@@ -21,6 +21,23 @@
         placeholder="请输入手机号"
         clearable
       />
+      <van-cell class="newCell">
+        <!-- 使用 title 插槽来自定义标题 -->
+        <template slot="title">
+          <span class="custom-title" style="width:90px">职称</span>
+          <div style="display:flex;">
+            <div style="margin-right:2rem;display: flex;align-items: center;" @click="show1 = true">
+              <span>{{type_name}}</span>
+              <van-icon name="arrow-down"/>
+            </div>
+            <div style="margin-right:2rem;display: flex;align-items: center;" @click="show2 = true">
+              <span>{{titles_name}}</span>
+              <van-icon name="arrow-down"/>
+            </div>
+          </div>
+        </template>
+      </van-cell>
+
     </div>
     <div class="editStaffTip">选填</div>
     <div class="staffBox">
@@ -30,6 +47,13 @@
       <van-icon class="addIcon" name="add" />
       <p>保存并继续新增员工</p>
     </div>
+    <van-popup v-model="show1" position="bottom" :style="{ height: '40%' }">
+      <van-picker show-toolbar :columns="user_type_name" @cancel="onCancel" @confirm="onUserTypeConfirm"/>
+    </van-popup>
+    <van-popup v-model="show2" position="bottom" :style="{ height: '40%' }">
+      <van-picker show-toolbar :columns="user_titles_name" @cancel="onCancel" @confirm="onUserTitleConfirm"/>
+    </van-popup>
+
   </div>
 </template>
 
@@ -46,10 +70,89 @@ export default {
       role_ids: [],
       title: "",
       value1: "",
-      roles: []
+      roles: [],
+      show1: false,
+      show2: false,
+      type_name:"",
+      titles_name:"",
+      user_type:2,
+      user_title:1,
+
+      user_types: [
+        {index: 2, name: '医生'},
+        {index: 3, name: '护士'}
+      ],
+      user_titles: [
+        {index: 1, name: '医士'},
+        {index: 2, name: '医师'},
+        {index: 3, name: '住院医师'},
+        {index: 4, name: '主治医师'},
+        {index: 5, name: '副主任医师'},
+        {index: 6, name: '主任医师'},
+        {index: 7, name: '护士'},
+        {index: 8, name: '护师'},
+        {index: 9, name: '主管护师'},
+        {index: 10, name: '副主任护师'},
+        {index: 11, name: '主任护师'},
+        {index: 12, name: '运营专员'},
+        {index: 13, name: '运营主管'}
+      ],
+
+      user_type_name: [
+        '医生',
+        '护士'
+      ],
+
+      user_titles_name: [
+        '医士',
+        '医师',
+        '住院医师',
+        '主治医师',
+        '副主任医师',
+        '主任医师',
+        '护士',
+        '护师',
+        '主管护师',
+        '副主任护师',
+        '主任护师',
+        '运营专员',
+        '运营主管'
+      ],
+
     };
   },
   methods: {
+    onUserTypeConfirm(value, index){
+      this.show1 = false
+      for (let i = 0; i < this.user_types.length; i++){
+        if (this.user_types[i].name == value){
+          this.user_type = this.user_types[i].index
+          this.type_name= this.user_types[i].name
+
+        }
+
+      }
+
+    },
+    onUserTitleConfirm(value, index){
+      this.show2 = false
+
+      for (let i = 0; i < this.user_titles.length; i++){
+        if (this.user_titles[i].name == value){
+          this.user_title = this.user_titles[i].index
+          this.titles_name= this.user_titles[i].name
+
+        }
+      }
+
+
+    },
+    onCancel() {
+      this.show1 = false
+      this.show2 = false
+
+
+    },
     GetAdminUserInitData() {
       AdminInitData().then(response => {
         if (response.data.state === 1) {
@@ -89,7 +192,9 @@ export default {
         name: this.name,
         mobile: this.tel,
         role_ids: this.role_ids.join(","),
-        title: this.title
+        title: this.title,
+        user_type: this.user_type,
+        user_title: this.user_title
       };
       CreateAdminUser(params).then(response => {
         if (response.data.state === 1) {
@@ -112,6 +217,8 @@ export default {
   },
   created() {
     this.GetAdminUserInitData();
+    this.titles_name = this.user_titles_name[0]
+    this.type_name = this.user_type_name[0]
     this.role_ids.push(this.$route.query.id);
     setRem();
   }

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

@@ -83,15 +83,55 @@ export default {
         if (response.data.state === 1) {
           for(let i = 0; i < response.data.data.admins.length; i++){
             if(response.data.data.admins[i].status == 1){
-              this.admin_user.push(response.data.data.admins[i])
+              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])
+                  }
+              }else{
+                this.admin_user.push(response.data.data.admins[i])
+
+              }
             }else{
-              this.del_admin_user.push(response.data.data.admins[i])
+              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])
+                  this.del_admin_user.push(response.data.data.admins[i])
+
+                }
+              }else{
+                // this.admin_user.push(response.data.data.admins[i])
+                this.del_admin_user.push(response.data.data.admins[i])
+
+
+              }
+
+
+            }
+          }
+
+
+          for(let i = 0; i < this.admin_user.length; i++) {
+            if(response.data.data.isSubSuperAdmin){ //当前用户为子管理员，不展示管理员和其他子管理信息
+              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;
+              }
+            }
+          }
+
+
+          for(let i = 0; i < this.del_admin_user.length; i++) {
+            if(response.data.data.isSubSuperAdmin){ //当前用户为子管理员，不展示管理员和其他子管理信息
+              if(this.del_admin_user[i].is_sub_admin && this.del_admin_user[i].user_id != this.$store.getters.user.admin.id){
+                this.del_admin_user.splice(i,1)
+                i = i - 1;
+              }
             }
           }
 
 
 
-        } else {
+          } else {
           this.$toast({
             message: response.data.msg
           });

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

@@ -12,6 +12,8 @@
         v-for="(item, index) in admin_user"
         :key="index"
         v-if="admin_user.length > 0"
+        @click="goEditStaff(item.user_id,item.is_sub_admin)"
+
       >
         <img v-if="item.avatar.length > 0" :src="item.avatar" alt />
         <img
@@ -19,10 +21,10 @@
           src="../../../../../assets/images/default_avatar.jpg"
           alt
         />
-        <p>
+        <p >
           <span>{{ item.user_name }}</span>
           <i
-            @click="goEditStaff(item.user_id)"
+            v-if="!item.is_sub_admin && org_creator != item.user_id"
             class="iconfont icon-bianji bianji"
           ></i>
         </p>
@@ -39,7 +41,8 @@ export default {
   data() {
     return {
       active: 0,
-      admin_user: []
+      admin_user: [],
+      org_creator:0,
     };
   },
   methods: {
@@ -65,8 +68,10 @@ export default {
         }
       });
     },
-    goEditStaff: function(id) {
-      this.$router.push({ path: "/staff/editstaff?id=" + id });
+    goEditStaff: function(id,is_sub_admin) {
+      if (!is_sub_admin && org_creator != id){
+        this.$router.push({ path: "/staff/editstaff?id=" + id });
+      }
     },
     goAddStaff: function() {
       this.$router.push({ path: "/staff/addstaff" });
@@ -75,6 +80,8 @@ export default {
   created() {
     setRem();
     //获取没被禁用的用户
+    this.org_creator  = this.$store.getters.user.org.creator
+    console.log(this.org_creator)
     this.GetAllStaff();
   }
 };

src/pages/homeIndex/index.vue

@@ -228,7 +228,10 @@
 
       },
       jump(url){
-        window.location.href = url
+        if (url.length != 0){
+          window.location.href = url
+        }
+
       },jumpApp(app){
         if(!this.isCreateOrg){
           Toast('你尚未创建机构，请先创建机构')
@@ -302,15 +305,20 @@
                 let obj= {
                   text: this.orgs[i].org_name,
                   value: this.orgs[i].id
-
                 }
                 this.org_arr.push(obj)
               }
               this.value1 = this.$store.getters.user.org.id
+              this.show = false
             }else{
               this.apps = response.data.data.apps
               this.banners = response.data.data.banners
+              this.show = true
             }
+
+
+
+
           } else {
             this.$toast({
               message: response.data.msg

src/utils/request.js

@@ -28,7 +28,12 @@ service.interceptors.response.use(
         Toast("登录超时");
         location.reload();
         return Promise.reject("error");
-      } else {
+      } else if (res.code == 20035){
+        Toast("你已经被管理员禁用,无法使用该系统");
+        location.reload();
+        return Promise.reject("error");
+
+      }else {
         return response;
       }
     } else {