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

src/api/temp.js

@@ -0,0 +1,8 @@
+import request from '@/utils/request'
+
+export function run(){
+  return request({
+    url:'/api/public/handledata',
+    method:'post',
+  })
+}

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

@@ -20,7 +20,7 @@
         <div class="checkOne" v-for="(item, index) in admin_user" :key="index">
           <van-checkbox :name="item.id" @change="onChange"></van-checkbox>
           <div class="checkUserBox">
-            <img v-if="item.avatar.length > 0" :src="item.avatar" alt="" />
+            <img v-if="item.avatar.length > 0" :src="item.avatar" alt=""/>
             <img
               v-if="item.avatar.length == 0"
               src="../../../../../assets/images/default_avatar.jpg"
@@ -35,116 +35,147 @@
 </template>
 
 <script>
-import { setRem } from "@/libs/functionRem";
-import { GetAllStaff, AddUserRole } from "@/api/admin_user";
-export default {
-  data() {
-    return {
-      allChecked: false,
-      isSubSuperAdmin:false,
-      result: [],
-      admin_user: []
-    };
-  },
-  methods: {
-    save() {
-      if (this.result.length == 0) {
-        this.$toast({
-          message: "至少选择一个用户"
-        });
-        return;
-      }
+  import {setRem} from "@/libs/functionRem";
+  import {AddUserRole, GetAllStaff, GetRoleInfo} from "@/api/admin_user";
+
+  export default {
+    data() {
+      return {
+        allChecked: false,
+        isSubSuperAdmin: false,
+        result: [],
+        admin_user: [],
+        name: "",
+        is_system: "",
 
-      let params = {
-        id: this.$route.query.id,
-        ids: this.result.join(",")
       };
-      AddUserRole(params).then(response => {
-        if (response.data.state === 1) {
-          this.$router.go(-1);
-        } else {
+    },
+    methods: {
+      save() {
+        if (this.result.length == 0) {
           this.$toast({
-            message: response.data.msg
+            message: "至少选择一个用户"
           });
+          return;
         }
-      });
-    },
-    GetAllStaff: function() {
-      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) {
-              let isExist = -1;
-              let ids = this.admin_user[i].role_ids.split(",");
-              isExist = ids.indexOf(this.$route.query.id.toString());
-              if (isExist >= 0) {
-                this.admin_user.splice(i, 1);
-                i = i - 1;
-              }
-            }
+        let params = {
+          id: this.$route.query.id,
+          ids: this.result.join(",")
+        };
+        AddUserRole(params).then(response => {
+          if (response.data.state === 1) {
+            this.$router.go(-1);
+          } else {
+            this.$toast({
+              message: response.data.msg
+            });
           }
-          for (let i = 0; i < this.admin_user.length; i++) {
+        });
+      },
+      GetAllStaff: function () {
+        GetAllStaff().then(response => {
+          if (response.data.state === 1) {
+            this.admin_user = response.data.data.admins;
+            this.isSubSuperAdmin = response.data.data.isSubSuperAdmin;
 
-            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){
+            console.log(this.admin_user);
+            for (let i = 0; i < this.admin_user.length; i++) {
+              if (this.admin_user[i].role_ids.length > 0) {
+                let isExist = -1;
+                let ids = this.admin_user[i].role_ids.split(",");
+                isExist = ids.indexOf(this.$route.query.id.toString());
+                if (isExist >= 0) {
                   this.admin_user.splice(i, 1);
                   i = i - 1;
                 }
               }
-            }else{
-
-
             }
+            for (let i = 0; i < this.admin_user.length; i++) {
+              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 { //如果当前用户是超级管理员，而且当前编辑角色是子管理员的话，需要将超级管理员剔除到待添加员工列表
+                if (this.name == "子管理员" && this.is_system == 1) {
+                  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
+            });
+          }
+        });
+      },
 
-
+      checkAll() {
+        if (this.allChecked == false) {
+          for (let i = 0; i < this.admin_user.length; i++) {
+            this.result.push(this.admin_user[i].id);
           }
+          this.allChecked = true;
         } else {
-          this.$toast({
-            message: response.data.msg
-          });
+          this.result = [];
         }
-      });
-    },
-
-    checkAll() {
-      if (this.allChecked == false) {
-        for (let i = 0; i < this.admin_user.length; i++) {
-          this.result.push(this.admin_user[i].id);
+      },
+      onChange() {
+        if (this.result.length == this.admin_user.length) {
+          this.allChecked = true;
+        } else {
+          this.allChecked = false;
+        }
+      }, GetRoleInfo(role_id) {
+        let params = {
+          id: role_id,
         }
-        this.allChecked = true;
-      } else {
-        this.result = [];
+        GetRoleInfo(params).then(response => {
+          if (response.data.state === 1) {
+
+            this.name = response.data.data.role.name
+            this.desc = response.data.data.role.intro
+            this.is_system = response.data.data.role.is_system
+            this.GetAllStaff();
+
+
+          } else {
+
+            this.$toast({
+              message: response.data.msg
+            });
+          }
+        }).catch(error => {
+          this.loading = false
+
+        });
+        ;
+
       }
     },
-    onChange() {
-      if (this.result.length == this.admin_user.length) {
-        this.allChecked = true;
-      } else {
-        this.allChecked = false;
-      }
+    created() {
+      //获取没被禁用的用户
+      this.GetRoleInfo(this.$route.query.id)
+      setRem();
     }
-  },
-  created() {
-    //获取没被禁用的用户
-    this.GetAllStaff();
-    setRem();
-  }
-};
+  };
 </script>
 
 <style lang="scss" scoped>
-.page_employeeList {
-  height: 100%;
-  overflow-y: auto;
-  background: #fafafa;
+  .page_employeeList {
+    height: 100%;
+    overflow-y: auto;
+    background: #fafafa;
+
   .editRoleTitle {
     background: #fff;
     padding: 0 1.125rem;
@@ -152,49 +183,58 @@ export default {
     display: flex;
     align-items: center;
     justify-content: space-between;
-    span {
-      font-size: 1rem;
-    }
+
+  span {
+    font-size: 1rem;
+  }
+
   }
   .jiantou {
     font-size: 1.5rem;
     font-weight: 600;
     margin-right: 1.5rem;
   }
+
   .titleName {
     font-size: 1.125rem !important;
     font-weight: 600;
   }
+
   .allCheckBox {
-    .allCheck {
-      height: 2.8125rem;
-      display: flex;
-      align-items: center;
-      background: #fff;
-      padding-left: 0.75rem;
-      margin: 1rem 0;
-      font-size: 1rem;
-    }
-    .checkOne {
-      background: #fff;
-      height: 3.75rem;
-      display: flex;
-      align-items: center;
-      padding-left: 0.75rem;
-    }
-    .checkUserBox {
-      display: flex;
-      align-items: center;
-      font-size: 1rem;
-      img {
-        width: 2.5rem;
-        height: 2.5rem;
-        margin: 0 0.75rem 0 1.25rem;
-      }
-    }
+
+  .allCheck {
+    height: 2.8125rem;
+    display: flex;
+    align-items: center;
+    background: #fff;
+    padding-left: 0.75rem;
+    margin: 1rem 0;
+    font-size: 1rem;
+  }
+
+  .checkOne {
+    background: #fff;
+    height: 3.75rem;
+    display: flex;
+    align-items: center;
+    padding-left: 0.75rem;
+  }
+
+  .checkUserBox {
+    display: flex;
+    align-items: center;
+    font-size: 1rem;
+
+  img {
+    width: 2.5rem;
+    height: 2.5rem;
+    margin: 0 0.75rem 0 1.25rem;
+  }
+
+  }
+  }
+  }
+  ::-webkit-scrollbar {
+    width: 0;
   }
-}
-::-webkit-scrollbar {
-  width: 0;
-}
 </style>

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

@@ -17,6 +17,7 @@
             v-for="(item,index) in admin_user"
             :key="index"
             v-if="admin_user.length > 0"
+            @click="goEditStaff(item.user_id)"
           >
             <img v-if="item.avatar.length > 0" :src="item.avatar" alt />
             <img
@@ -26,7 +27,7 @@
             />
             <p>
               <span>{{item.user_name}}</span>
-              <i @click="goEditStaff(item.user_id)" class="iconfont icon-bianji bianji"></i>
+              <i class="iconfont icon-bianji bianji"></i>
             </p>
           </div>
         </div>
@@ -42,6 +43,7 @@
             v-for="(item,index) in del_admin_user"
             :key="index"
             v-if="del_admin_user.length > 0"
+            @click="goEditStaff(item.user_id)"
           >
             <img v-if="item.avatar.length > 0" :src="item.avatar" alt />
             <img
@@ -51,7 +53,7 @@
             />
             <p>
               <span>{{item.user_name}}</span>
-              <i @click="goEditStaff(item.user_id)" class="iconfont icon-bianji bianji"></i>
+              <i  class="iconfont icon-bianji bianji"></i>
             </p>
           </div>
         </div>

src/pages/homeIndex/index.vue

@@ -153,6 +153,8 @@
 import { Toast } from "vant";
 
 import { GetHomeData, ChangeOrg } from "@/api/home";
+import { run } from "@/api/temp";
+
 import "../../libs/rem.js";
 import "../../styles/newStyle.scss";
 import { setRem } from "@/libs/functionRem";
@@ -248,6 +250,13 @@ export default {
       });
     },
     jump(url) {
+      // run().then(response => {
+      //   if (response.data.state === 1) {
+      //
+      //   } else {
+      //
+      //   }
+      // });
       if (url.length != 0) {
         window.location.href = url;
       }
@@ -258,7 +267,7 @@ export default {
         return;
       }
       if (app.open_status == 0) {
-        Toast("敬请期待");
+        Toast("近期发布");
 
         return;
       }