提交

1

src/store/getters.js

@@ -18,6 +18,7 @@ const getters = {
   phone: state => state.user.phone,
   isSuperAdmin:state=>state.user.isSuperAdmin,
   roles:state=>state.user.roles,
+  newRoles:state=>state.user.newRoles,
   newStudentinfo: state => state.buildTeam.newStudentList,
   reactClassStudentList:state=>state.reactClassStudent.classList ,
   buildIndex:state=>state.buildTeam.buildIndex,

src/store/modules/user.js

@@ -21,6 +21,7 @@ const state = {
   phone: "",
   isSuperAdmin: false,
   roles: [],
+  newRoles:[],
   tenantId: null,
   baseTenantId: null,
   imToken: ""
@@ -59,6 +60,9 @@ const mutations = {
   SET_ROLES: (state, roles) => {
     state.roles = roles;
   },
+  SET_NEWROLES:(state,newRoles)=>{
+    state.newRoles = newRoles
+  },
   SET_TENANTID: (state, tenantId) => {
     state.tenantId = tenantId;
   },
@@ -164,6 +168,7 @@ const actions = {
               const phone = data.data.phone;
               const isSuperAdmin = data.data.isSuperAdmin;
               const roles = data.data?.positions?.split(",") || [];
+              const newRoles = data.data?.roles || [];
               const tenantId = data.data.tenantId;
               const positionName = data.data.positionName;
               const imToken = data.data.imToken;
@@ -191,6 +196,8 @@ const actions = {
               commit("SET_PHONE", phone);
               commit("SET_SUPERADMIN", isSuperAdmin);
               commit("SET_ROLES", roles);
+              commit("SET_NEWROLES", newRoles);
+              newRoles
               commit("SET_POSITIONNAME", positionName);
               commit("SET_IMTOKEN", imToken);
               resolve(data);

src/views/withdrawal-application/index.vue

@@ -372,9 +372,11 @@ export default {
   async mounted() {
     that = this;
     let isSuperAdmin = this.$store.getters.isSuperAdmin;
-    let roles = this.$store.getters.roles;
+    let roles = this.$store.getters.roles; // 岗位
+    let newRoles = this.$store.getters.newRoles  // 角色  这里判断一半岗位 一半角色 深水炸弹!!!!!  危险 危险 危险
     await this.$store.dispatch("setBranchs");
-    if (isSuperAdmin || roles.indexOf("150") != -1) {
+    if (isSuperAdmin || newRoles.indexOf(150) != -1) {
+      console.log('isSuperAdmin')
       this.isManage = "super";
     } else {
       if (roles.indexOf("1") != -1) {