feat:公司账号权限/登录

src/apis/axios.js

@@ -12,7 +12,7 @@ const header = {
   // "Content-Type": "application/x-www-form-urlencoded; charset=UTF-8"
 }
 window.ajaxTimeout = 20000
-export default async (
+export default async(
   url = '',
   data = {},
   type = 'GET',
@@ -73,7 +73,9 @@ export default async (
     async response => {
       if (response.status === 200) {
         const code = response.data.code
-        if (code >= 100 && code <= 104) {
+        const message = response.data.message
+
+        if (code >= 100 && code <= 104 && message !== '账户已禁用') {
           removeToken()
           removeMenu()
           removeBtn()
@@ -92,10 +94,10 @@ export default async (
       })
       .catch(res => {
         if (res.response && res.response.data) {
-          reject(res.response.data);
+          reject(res.response.data)
         } else {
-          reject(res);
+          reject(res)
         }
-      });
+      })
   })
 }

src/apis/service/interest/accountQuery/index.js

@@ -3,10 +3,10 @@ import http from '@/apis/axios'
 const api = 'admin/'
 export default {
   // 分页查询
-  list: (data, params) => http(api + 'userCompanyList', data, 'post', params),
+  list: (data, params) => http(api + 'user_role_list', data, 'post', params),
   // 详情
   detail: (data, params) => http(api + 'userCompanyInfo', data, 'post', params),
   // 更新
-  update: (data, params) => http(api + 'userCompanyUpdate', data, 'post', params),
+  update: (data, params) => http(api + 'setrole', data, 'post', params),
   rolelist: (data, params) => http(api + 'rolelist', data, 'post', params)
 }

src/apis/service/interest/role/index.js

@@ -10,7 +10,6 @@ export default {
   detail: (data, params) => http(api + 'roleinfo', data, 'post', params),
   // 更新
   update: (data, params) => http(api + 'rolesave', data, 'post', params),
-
   // 修改状态
   status: (data, params) => http(api + 'rolestatus', data, 'post', params),
   // 功能权限列表

src/apis/user/index.js

@@ -69,6 +69,7 @@ export function roleProcessInfo(data) {
   })
 }
 
+// 获取角色详情
 export function reuqsetRoleInfo(data) {
   const _data = {
     ...data,
@@ -76,7 +77,7 @@ export function reuqsetRoleInfo(data) {
   }
 
   return http({
-    url: `${urlConfig.baseURL}admin/role_process_detail`,
+    url: `${urlConfig.baseURL}admin/roleinfo`,
     method: 'post',
     data: _data
   })
@@ -101,15 +102,15 @@ export function requsetSupertubeCompany(data) {
 }
 
 // 普通用户获取绑定的企业列表
-export function requsetBindCompany(data) {
+export function requsetUserBindingCompany(data) {
   const _data = {
     ...data,
-    size: 100,
+    size: 10,
     noRelation: true
   }
 
   return http({
-    url: `${urlConfig.baseURL}admin/userCompanyList`,
+    url: `${urlConfig.baseURL}admin/myCompanyList`,
     method: 'post',
     data: _data
   })

src/layout/components/Navbar.vue

@@ -1,13 +1,15 @@
 <template>
   <div class="navbar">
-    <hamburger
-      id="hamburger-container"
-      :is-active="sidebar.opened"
-      class="hamburger-container"
-      @toggleClick="toggleSideBar"
-    />
-
-    <breadcrumb id="breadcrumb-container" class="breadcrumb-container" />
+    <div class="left-menu">
+      <hamburger
+        id="hamburger-container"
+        :is-active="sidebar.opened"
+        class="hamburger-container"
+        @toggleClick="toggleSideBar"
+      />
+
+      <breadcrumb id="breadcrumb-container" class="breadcrumb-container" />
+    </div>
 
     <div class="right-menu">
       <div class="right-menu-item">
@@ -22,7 +24,6 @@
           @click="openNotice()"
         />
         <screenfull id="screenfull" class="right-menu-item hover-effect" />
-
         <!-- <el-tooltip content="Global Size" effect="dark" placement="bottom">
           <size-select id="size-select" class="right-menu-item hover-effect" />
         </el-tooltip> -->
@@ -358,16 +359,18 @@ export default {
 
 .navbar {
   height: 50px;
-  overflow: hidden;
   position: relative;
   background: #fff;
   min-width: 1000px;
   box-shadow: 0 1px 4px rgba(0, 21, 41, 0.08);
+  display: flex;
+  justify-content: space-between;
 
-  .hamburger-container {
+  .left-menu{
+    display: flex;
+    .hamburger-container {
     line-height: 46px;
     height: 100%;
-    float: left;
     cursor: pointer;
     transition: background 0.3s;
     -webkit-tap-highlight-color: transparent;
@@ -378,10 +381,10 @@ export default {
   }
 
   .breadcrumb-container {
-    float: left;
     width: 500px;
     //min-width: calc(1200px - 200px - 150px);
   }
+  }
 
   .errLog-container {
     display: inline-block;
@@ -389,9 +392,10 @@ export default {
   }
 
   .right-menu {
-    float: right;
     height: 100%;
     line-height: 50px;
+    display: flex;
+    flex-wrap: nowrap;
 
     &:focus {
       outline: none;
@@ -428,6 +432,7 @@ export default {
       .avatar-wrapper {
         margin-top: 5px;
         position: relative;
+        display: flex;
 
         .user-avatar {
           cursor: pointer;

src/layout/components/company-select/index.vue

@@ -33,8 +33,8 @@
 
 <script>
 import { mapState } from 'vuex'
-import { setUserCompany } from '@/utils/auth'
-import { requsetSupertubeCompany, requsetBindCompany } from '@/apis/user'
+import { convertCompanylist } from '@/utils'
+import { requsetSupertubeCompany, requsetUserBindingCompany } from '@/apis/user'
 
 export default {
   /**
@@ -104,33 +104,42 @@ export default {
     async initalData() {
       // 区分是否超管用户请求不同接口
       this.state.loading = true
-      const api = this.isSupertube ? requsetSupertubeCompany : requsetBindCompany
-      const { code, data } = await api(this.params)
+      const api = this.isSupertube ? requsetSupertubeCompany : requsetUserBindingCompany
+
+      const { page, size, name } = this.params
+      const params = {
+        [this.isSupertube ? 'name' : 'companyName']: name,
+        page,
+        size
+      }
+
+      const { code, data } = await api(params)
+
       if (code === 0) {
         if (data.list.length < 10) this.state.noMore = true
         this.state.loading = false
         this.params.page++
-        return data.list
+        const _list = this.isSupertube ? data.list : convertCompanylist(data.list)
+        this.$store.commit('user/setCompanylist', [...this.companylist, ..._list])
+        return this.isSupertube ? data.list : convertCompanylist(data.list)
       }
     },
 
     setCurrentCompany(currentCompany) {
       this.$emit('update:value', currentCompany)
       this.$emit('change', currentCompany)
-
       if (!this.global) return null // 作为通用组件使用不设置全局选中公司
-
-      setUserCompany(currentCompany)
       this.$store.commit('user/setCurrentCompany', currentCompany)
-
-      if (this.initialization || this.isSupertube) return (this.initialization = false) // 超管用户 && 初始化不刷新路由
+      if (this.isSupertube) return null // 超管用户不刷新路由
       this.changeRouterWithCompany()
     },
 
     async changeRouterWithCompany() {
       const { path, query } = this.$route
+
       query.redirect = path
-      const keys = Object.keys(query).filter(key => key)
+
+      const keys = Object.keys(query).filter(key => key && key !== 'error')
 
       // 1.保存透传参数
       let queryString = ''
@@ -140,13 +149,17 @@ export default {
       }
 
       // 2.重新获取用户信息和菜单
-      const result = await this.$store.dispatch('user/getMenuList')
+      const result = await this.$store.dispatch('user/reloadMenulist')
 
       switch (result) {
         case 'noToken':
           await this.$store.dispatch('user/logout')
           this.$router.push(`/login`)
           break
+        case 'disabled':
+          // 角色异常或该公司禁用,请检查账号或者角色设置"
+          this.$store.dispatch('user/disabledCompany')
+          break
         default:
           queryString = keys.reduce(chunk, '?')
           this.$router.replace('/reload' + queryString)
@@ -173,27 +186,31 @@ export default {
       const scrollTop = ScrollWrapper.scrollTop
       const scrollHeight = ScrollWrapper.scrollHeight
       const { loading, noMore } = this.state
-
       // 是否允许下拉加载
       const isAllowLoad = !loading && !noMore
       if (height + scrollTop >= scrollHeight && isAllowLoad) {
         const list = await this.loadMore()
-
         // 保存到全局
-        this.$store.commit('user/setCompanylist', [...this.companylist, ...list])
+        this.$store.commit('user/setCompanylist', [...this.companylist, ...convertCompanylist(list)])
       }
     },
 
     async loadMore() {
       // 区分超管用户和普通用户
-      const api = this.isSupertube ? requsetSupertubeCompany : requsetBindCompany
-
+      const api = this.isSupertube ? requsetSupertubeCompany : requsetUserBindingCompany
       this.state.loading = true
-      const { data } = await api(this.params)
+
+      const { page, size, name } = this.params
+      const params = {
+        [this.isSupertube ? 'name' : 'companyName']: name,
+        page,
+        size
+      }
+
+      const { data } = await api(params)
 
       this.state.loading = false
       const isTransboundary = this.companylist.length >= Number(data.count) // 是否越界
-
       if (isTransboundary) {
         this.state.noMore = true
         this.sate.loading = false
@@ -211,10 +228,8 @@ export default {
       this.params.page = 1
       this.state.noMore = false
       this.state.loading = false
-
       // 获取列表数据
       const result = await this.initalData()
-      console.log(result)
       if (result) this.$store.commit('user/setCompanylist', result)
     },
 

src/layout/index.vue

@@ -21,19 +21,19 @@
 
 <script>
 // import RightPanel from '@/components/RightPanel'
-import { AppMain, Navbar, Settings, Sidebar, TagsView } from "./components";
-import ResizeMixin from "./mixin/ResizeHandler";
-import { mapState } from "vuex";
+import { AppMain, Navbar, Settings, Sidebar, TagsView } from './components'
+import ResizeMixin from './mixin/ResizeHandler'
+import { mapState } from 'vuex'
 
 export default {
-  name: "Layout",
+  name: 'Layout',
   components: {
     AppMain,
     Navbar,
     // RightPanel,
     Settings,
     Sidebar,
-    TagsView,
+    TagsView
   },
   mixins: [ResizeMixin],
   computed: {
@@ -42,23 +42,23 @@ export default {
       device: (state) => state.app.device,
       showSettings: (state) => state.settings.showSettings,
       needTagsView: (state) => state.settings.tagsView,
-      fixedHeader: (state) => state.settings.fixedHeader,
+      fixedHeader: (state) => state.settings.fixedHeader
     }),
     classObj() {
       return {
         hideSidebar: !this.sidebar.opened,
         openSidebar: this.sidebar.opened,
         withoutAnimation: this.sidebar.withoutAnimation,
-        mobile: this.device === "mobile",
-      };
-    },
+        mobile: this.device === 'mobile'
+      }
+    }
   },
   methods: {
     handleClickOutside() {
-      this.$store.dispatch("app/closeSideBar", { withoutAnimation: false });
-    },
-  },
-};
+      this.$store.dispatch('app/closeSideBar', { withoutAnimation: false })
+    }
+  }
+}
 </script>
 
 <style lang="scss" scoped>

src/mixins/resToken.js

@@ -1,25 +1,25 @@
 export default {
   methods: {
     async logout() {
-      if (this.$route.path !== "/login") {
-        await this.$store.dispatch("user/logout");
-        this.$router.push(`/login?redirect=${this.$route.fullPath}`);
+      if (this.$route.path !== '/login') {
+        await this.$store.dispatch('user/logout')
+        this.$router.push(`/login?redirect=${this.$route.fullPath}`)
       }
     },
     async routeGoto(path, query) {
       window.vm.$router.push({
         path: path,
-        query: query,
-      });
+        query: query
+      })
     },
     async routeReGoto(path, query) {
       window.vm.$router.replace({
         path: path,
-        query: query,
-      });
+        query: query
+      })
     },
     setNum(s) {
-      return s ? parseFloat(s + "").toFixed(2) : "-";
-    },
+      return s ? parseFloat(s + '').toFixed(2) : '-'
+    }
   }
 }

src/store/modules/user.js

@@ -5,10 +5,12 @@ import {
   menuList,
   dingdingdetail,
   usergetinfo,
-  roleProcessInfo, 
-  requsetSupertubeCompany, 
-  requsetBindCompany 
+  roleProcessInfo,
+  requsetSupertubeCompany,
+  requsetUserBindingCompany,
+  reuqsetRoleInfo
 } from "@/apis/user";
+import router from "@/router";
 
 import {
   getToken,
@@ -36,7 +38,12 @@ import {
   set_role_level,
   remove_role_level,
   getUserCompany,
+  setUserCompany,
+  removeUserCompany,
 } from "@/utils/auth";
+import { MessageBox } from "element-ui";
+
+import { convertCompanylist } from "@/utils";
 import store from "..";
 
 const state = {
@@ -52,7 +59,7 @@ const state = {
   business_companyNo: get_business_companyNo() || "",
   private_field: get_private_field() || [],
   roleProcess: get_action_data() || [],
-  currentCompany: getUserCompany(),
+  currentCompany: getUserCompany() ? getUserCompany().code : '',
   isSupertube: false,
   companylist:[]
 };
@@ -110,6 +117,9 @@ const mutations = {
     set_private_field(val);
   },
   setCurrentCompany(state,val){
+    //获取当前公司详细信息
+    const company = state.companylist.find(({code}) => code === val)
+    setUserCompany(company)
     state.currentCompany = val;
   },
   setCompanylist(state,val){
@@ -118,7 +128,7 @@ const mutations = {
   setSupertube(state, val) {
     state.isSupertube = val;
   }
-};
+}
 
 const actions = {
   // user login
@@ -142,11 +152,25 @@ const actions = {
     });
   },
 
+  //公司角色异常
+  disabledCompany({commit, that}){
+    commit("navListFn", []);
+    commit("btnListFn", []);
+    initRouter([], that);
+
+    const company = getUserCompany()
+
+    MessageBox
+     .alert(`公司 ${company.name} 角色异常或该公司禁用,请检查账号或者角色设置`, '公司角色异常')
+     .then(() => router.push("/reload?redirect=welcome/dashboard"))
+     .catch(() => router.push("/reload?redirect=welcome/dashboard"))
+  },
+
   dingUserInfor({ commit }, code) {
     return new Promise(async (resolve, reject) => {
       dingdingdetail(code)
         .then((response) => {
-          const { data } = response;
+          const { data } = response;P
           if (response.code === 0) {
             commit("SET_TOKEN", data.token);
             setToken(data.token);
@@ -161,7 +185,73 @@ const actions = {
     });
   },
 
-  async getMenuList({ commit, that }) {
+  async reloadMenulist({commit, dispatch ,that}){
+    return new Promise(async resolve => {
+      const company = getUserCompany()
+
+      dispatch('getRoleInfo', company)
+
+
+       //获取菜单
+       const { mcode, mdata, message: mmsg } = await getRoleMenuList();
+
+       //账号禁用
+       if(mcode === 10001){
+        commit("navListFn", []);
+        commit("btnListFn", []);
+        initRouter([], that);
+        resolve('disabled')
+        return
+       }
+
+       if (mcode >= 100 && mcode <= 104) {
+         resolve("noToken");
+       } else if (mcode !== 0) {
+         resolve({ code: mcode, data: {}, massage: mmsg });
+       } else {
+         const { arrag, isok, btnList } = mdata;
+         // 生成页面权限
+         commit("navListFn", arrag);
+         // 生成按钮权限
+         commit("btnListFn", btnList);
+         // 生成路由
+         initRouter(arrag, that);
+         resolve(isok ? "success-dataV" : "success");
+       }
+    })
+  },
+
+  async getRoleInfo({commit, that, dispatch}, _current_company_){
+    return new Promise(async resolve => {
+      //查找默认的业务公司 设置到全局的currentCompany
+      const { roleid } = _current_company_;
+
+      //根据角色获取流程节点权限
+      const { pcode, pdata, pmsg } = await getRoleProcess(roleid);
+      if (pcode === 0) {
+        commit("roleProcess", pdata ?? []);
+      }
+
+      if (pcode >= 100 && pcode <= 104) {
+        resolve("noToken");
+        return
+      }
+
+      //根据角色获取角色详情 获取关键字字段
+      const {code: rcode, data: rdata, message: rmsg} = await reuqsetRoleInfo({ roleid })
+
+      if(rcode === 0){
+        commit("private_field", rdata.private_field ? rdata.private_field.split(',') : []);
+      }
+
+      if (rcode >= 100 && rcode <= 104) {
+        resolve("noToken");
+        return
+      }
+    })
+  },
+
+  async getMenuList({ commit, that, dispatch }) {
     return new Promise(async (resolve, reject) => {
       if (!getToken()) {
         resolve("noToken");
@@ -174,17 +264,23 @@ const actions = {
         } else {
           const { level } = udata;
           const isSupertube = level === '1';
+
            //保存是否超管用户
            commit("setSupertube", isSupertube);
-           
+
            //获取公司列表(区分超管和普通账户api)
-           const api = isSupertube ? requsetSupertubeCompany : requsetBindCompany;
-           const { data: companyData, code: companyCode } = await api({})
-          
+           const api = isSupertube
+                         ? requsetSupertubeCompany
+                         : requsetUserBindingCompany
+
+           //获取缓存里的业务公司 =》 公司名称搜索 =》 存在设置为默认公司
+           const company = getUserCompany();
+           const { data: companyData, code: companyCode } = await api({[isSupertube ? 'code' : 'companyCode'] :company ? company.code : ""})
+
+           //保存公司列表 普通用户和超管使用两个列表需要转换
            let _companylist = []
-           //保存公司列表:todo 两个接口返回值可能不同 需要转换
            if(companyCode === 0) {
-            _companylist = isSupertube ? companyData.list : companyData.list
+            _companylist = isSupertube ? companyData.list : convertCompanylist(companyData.list);
             commit('setCompanylist', _companylist)
            }
 
@@ -193,47 +289,44 @@ const actions = {
              return
            }
 
-          let _current_company_ = ''
           //非超管用户获取保存 流程权限 & 关键字字段 & 设置默认业务公司
+          let _current_company_ = ''
           if(!isSupertube){
              //查找默认的业务公司 设置到全局的currentCompany
-             const _mainCompany = _companylist.find(({is_main}) => String(is_main) === '1')
-             _current_company_ = _mainCompany ? _mainCompany : _companylist[0];
-
-             const { roleid } = _current_company_;
-
-            //根据角色获取流程节点权限
-             const { pcode, pdata, pmsg } = await getRoleProcess({ roleid });
-             if (pcode >= 100 && pcode <= 104) {
-              resolve("noToken");
-             } else if (pcode !== 0) {
-              resolve({ code: pcode, data: {}, massage: pmsg });
-             } else {
-              commit("roleProcess", pdata ?? []);
-             }
-
-             //根据角色获取角色详情 获取关键字字段
+             _current_company_ =  _companylist[0];
+            const result = dispatch('getRoleInfo', _current_company_)
+
+            if(result === 'noToken') {
+              resolve('noToken')
+              return
+            }
           }
-          
+
           //保存默认公司
-          commit('setCurrentCompany', _current_company_ ? _current_company_.companyCode : '')
-          
+          commit('setCurrentCompany', _current_company_ ? _current_company_.code : '')
           //获取菜单
           const { mcode, mdata, mmsg } = await getRoleMenuList();
-            if (mcode >= 100 && mcode <= 104) {
-              resolve("noToken");
-            } else if (mcode !== 0) {
-              resolve({ code: mcodd, data: {}, massage: mmsg });
-            } else {
-              const { arrag, isok, btnList } = mdata;
-              // 生成页面权限
-              commit("navListFn", arrag);
-              // 生成按钮权限
-              commit("btnListFn", btnList);
-              // 生成路由
-              initRouter(arrag, that);
-              resolve(isok ? "success-dataV" : "success");
-            }
+
+          //拦截账号异常: 禁用
+          if(mcode === 10001) {
+            dispatch('disabledCompany');
+            return
+          }
+
+          if (mcode >= 100 && mcode <= 104) {
+            resolve("noToken");
+          } else if (mcode !== 0) {
+            resolve({ code: mcode, data: {}, massage: mmsg });
+          } else {
+            const { arrag, isok, btnList } = mdata;
+            // 生成页面权限
+            commit("navListFn", arrag);
+            // 生成按钮权限
+            commit("btnListFn", btnList);
+            // 生成路由
+            initRouter(arrag, that);
+            resolve(isok ? "success-dataV" : "success");
+          }
         }
       }
     });
@@ -258,6 +351,8 @@ const actions = {
       commit("private_field", []);
       remove_action_data();
       commit("action_data", []);
+      removeUserCompany()
+      commit("action_data", []);
       // removeMainList()
       // reset visited views and cached views
       // to fixed https://github.com/PanJiaChen/vue-element-admin/issues/2485
@@ -314,7 +409,17 @@ async function getRoleProcess(roleid) {
   };
 }
 async function getRoleMenuList() {
-  const { code, data, meaasge } = await menuList({});
+  const { code, data, meaasge, message } = await menuList({});
+
+  //menu接受账户异常:禁用 并返回
+  if(message === '账户已禁用'){
+    return {
+      mdata:{},
+      mmsg:'账号被禁用',
+      mcode:10001
+    }
+  }
+
   let arrag = [];
   let btnList = [];
   let list = [];
@@ -451,10 +556,6 @@ function initRouter(arr) {
   window.vm.$router.addRoutes(IndexRoute);
 }
 
-function getCompanylist(){
-  
-}
-
 initalUserInfo();
 
 export default {

src/utils/auth.js

@@ -13,7 +13,7 @@ const roleLevelKey = 'Purchase-Console-roleLevel'
 const companyKey = 'Purchase-Console-company'
 
 export function setUserCompany(company) {
-  return sessionStorage.setItem(companyKey, company)
+  return sessionStorage.setItem(companyKey, company ? JSON.stringify(company) : '')
 }
 
 export function removeUserCompany() {
@@ -21,7 +21,8 @@ export function removeUserCompany() {
 }
 
 export function getUserCompany() {
-  return sessionStorage.getItem(companyKey) || ''
+  const company = sessionStorage.getItem(companyKey)
+  return company ? JSON.parse(company) : ''
 }
 
 export function getToken() {

src/utils/index.js

@@ -359,9 +359,10 @@ export function removeClass(ele, cls) {
 }
 
 export function convertCompanylist(list) {
-  return list.map(({ companyName, companyCode, is_main }) => ({
+  return list.map(({ companyName, companyCode, is_main, roleid }) => ({
     code: companyCode,
     name: companyName,
-    is_main
+    is_main,
+    roleid
   }))
 }

src/views/dashboard/index.vue

@@ -4,16 +4,16 @@
     <!-- <div class="info-container clearfix">
         <pan-thumb :image="avatar" :width="'130px'" :height="'130px'">
         </pan-thumb>
-        
+
         <span class="welcome-title">欢迎登录采销平台</span>
       </div> -->
     <!-- style="width: 60%; margin: -30px auto 0 auto" -->
-    <img :src="emptyGif" class="bg-img" />
+    <img :src="emptyGif" class="bg-img">
     <div class="duihua">
       <!-- <img src="@/assets/img/duihuakuang.png" /> -->
-      <img class="bg" src="@/assets/img/duihua.png" />
+      <img class="bg" src="@/assets/img/duihua.png">
       <div class="neirong">
-        <img src="@/assets/img/neirong.png" />
+        <img src="@/assets/img/neirong.png">
       </div>
 
       <!-- <div>
@@ -27,14 +27,13 @@
 
 <script>
 // import { mapGetters } from "vuex";
-
 export default {
-  name: "dashboard",
+  name: 'Dashboard',
   data() {
     return {
-      emptyGif: require("@/assets/img/welcome.gif"),
-    };
-  },
+      emptyGif: require('@/assets/img/welcome.gif')
+    }
+  }
   // computed: {
   // ...mapGetters([
   // 'name',
@@ -43,7 +42,7 @@ export default {
   // ]),
   // },
   // mounted() {},
-};
+}
 </script>
 <style lang="scss" scoped>
 .dashboard-container {

src/views/interest/account/index.vue

@@ -144,6 +144,10 @@
               @click="openModal(scope.row.id, true, scope.row)"
             ></i>
           </el-tooltip>
+
+          <el-tooltip effect="dark" placement="top" content="设置部门">
+            <i class="el-icon-view tv-icon"></i>
+          </el-tooltip>
           <!-- <el-tooltip
             v-if="powers.some((i) => i == '005')"
             effect="dark"
@@ -309,7 +313,7 @@ export default {
           label: "操作",
           fixed: "right",
           _noset_: true,
-          width: "60px",
+          width: "90px",
           _slot_: "operation",
         },
       ],
@@ -380,7 +384,7 @@ export default {
     async searchList() {
       this.loading = true;
       this.parmValue.comnpanyNo = this.currentCompany;
-      
+
       const res = await asyncRequest.list(this.parmValue);
       if (res && res.code === 0 && res.data) {
         this.tableData = res.data.list;
@@ -405,7 +409,7 @@ export default {
             id: id,
             status: status + '' === "1" ? "0" : "1",
           };
-          
+
           const res = await asyncRequest.status(model);
           if (res && res.code === 0) {
             this.loading = false;

src/views/interest/accountQuery/addEdit.vue

@@ -87,7 +87,7 @@ export default {
   data() {
     return {
       loading: false,
-      title: '添加账号',
+      title: '添加角色',
       organizeList: [],
       showModelThis: this.showModel,
       coptions: [],
@@ -145,14 +145,14 @@ export default {
         await this.initData()
       }
       if (this.id === 'add') {
-        this.title = '添加账号'
+        this.title = '添加角色'
         this.rulesThis = this.rules
       } else {
         if (this.isDetail) {
-          this.title = '账号详情'
+          this.title = '角色详情'
           this.rulesThis = {}
         } else {
-          this.title = '修改账号'
+          this.title = '修改角色'
           this.rulesThis = this.rules
         }
       }
@@ -173,12 +173,13 @@ export default {
         this.$message.warning(message)
       }
     },
+
     handleCheckedCitiesChange(value) {
-      console.log(value)
       const checkedCount = value.length
       this.ruleForm.is_all = checkedCount === this.coptions.length
       this.isIndeterminate = checkedCount > 0 && checkedCount < this.coptions.length
     },
+
     recursion(list) {
       list.map((v) => {
         if (v && Array.isArray(v.child)) {
@@ -194,17 +195,23 @@ export default {
       })
     },
     async initData() {
-      const { code, data, message } = await asyncRequest.detail({
-        id: this.id
-      })
-      if (code === 0) {
-        await this.getRoleWithCompany(data.companyCode)
-        await this.resetForm(data)
-      } else if (code >= 100 && code <= 104) {
-        await this.logout()
-      } else {
-        this.$message.warning(message)
+      const {
+        roleid,
+        companyCode,
+        nickname,
+        mobile,
+        id
+      } = this.sitem
+
+      const data = {
+        roleid,
+        companyCode,
+        nickname,
+        mobile,
+        id
       }
+      await this.getRoleWithCompany(data.companyCode)
+      await this.resetForm(data)
     },
     async resetForm(sitem) {
       // 重置
@@ -214,37 +221,41 @@ export default {
           this.$refs.ruleForm.clearValidate()
           if (sitem) {
             const {
-              account_id, companyCode, nickname, mobile, roleid
+              companyCode,
+              nickname,
+              mobile,
+              roleid,
+              id
             } = sitem
 
             this.ruleForm = {
-              account_id, companyCode, nickname, mobile, roleid
+              companyCode, nickname, mobile, roleid, id
             }
           } else {
             this.ruleForm = {
-              nickname: '',
+              companyCode: '',
               mobile: '',
-              roleid: '', // 角色id
-              account_id: ''
+              roleid: '' // 角色id
             }
           }
         }
       })
     },
+
     async submitForm() {
       await this.$refs.ruleForm.validate(async(valid) => {
         if (valid) {
           if (!this.loading) {
             this.loading = true
             const {
+              id,
               roleid,
-              account_id,
               companyCode
             } = JSON.parse(JSON.stringify(this.ruleForm))
 
             const model = {
+              id,
               roleid,
-              account_id,
               companyNo: companyCode
             }
 

src/views/interest/accountQuery/index.vue

@@ -47,7 +47,7 @@
                     />
                   </el-select>
                 </el-col>
-                <!-- <el-col :span="4" style="width: 150px; padding: 0 0 0 10px">
+              <el-col :span="4" style="width: 150px; padding: 0 0 0 10px">
                   <el-input
                     :size="searchSize"
                     v-model="parmValue.nickname"
@@ -62,7 +62,7 @@
                     :maxlength="40"
                     placeholder="手机号"
                   />
-                </el-col> -->
+                </el-col>
                 <el-col :span="4" style="width: 54px">
                   <el-button
                     :size="searchSize"
@@ -113,9 +113,9 @@
         <template #status="{ scope }">
           <el-tag
             :size="tablebtnSize"
-            :type="scope.row.status == '0' ? 'warning' : ''"
+            :type="String(scope.row.status) == '0' ? 'warning' : ''"
             v-text="
-              (statusOptions.find((item) => item.id == String(scope.row.account_status)) || {}).label ||
+              (statusOptions.find((item) => item.id == String(scope.row.status)) || {}).label ||
               '--'
             "
           ></el-tag>
@@ -358,7 +358,7 @@ export default {
             id: id,
             status: status + '' === "1" ? "0" : "1",
           };
-          
+
           const res = await asyncRequest.status(model);
           if (res && res.code === 0) {
             this.loading = false;

src/views/interest/action/index.vue

@@ -184,8 +184,9 @@
 </template>
 <script>
 import asyncRequest from "@/apis/service/interest/action";
-import resToken from "@/mixins/resToken";
 import companyHelper from "@/mixins/companyHelper.js";
+import resToken from "@/mixins/resToken";
+
 export default {
   name: "Action",
   mixins: [resToken, companyHelper],
@@ -259,16 +260,26 @@ export default {
     onCompanyChange(){
        this.initactionList();
     },
+    recursionFilterActionList(list) {
+      const _list = []
+      for (let i = 0; i < list.length; i++) {
+        const item = list[i]
+
+        if (item.level !== 1) _list.push(item)
+        if (item.child && item.child.length > 0) item.child = this.recursionFilterActionList(item.child)
+      }
+      return _list
+    },
     // 全选/全不选
     handleCheckAllChange(checkAll, index, item, subIndex) {
       this.actionList[index].child[subIndex].checkAll = checkAll;
       this.$set(this.actionList, index, item);
       this.actionList[index].child[subIndex].action.forEach((element) => {
         const findindex = this.actionList[index].child[subIndex].checkList.findIndex(
-          (findItem) => findItem === element.id
+          (findItem) => findItem === String(element.id)
         );
         if (checkAll && findindex == -1) {
-          this.actionList[index].child[subIndex].checkList.push(element.id);
+          this.actionList[index].child[subIndex].checkList.push(String(element.id));
         } else if (!checkAll && findindex > -1) {
           this.actionList[index].child[subIndex].checkList.splice(findindex, 1);
         }
@@ -280,10 +291,10 @@ export default {
       this.$set(this.actionList, index, item);
       this.actionList[index].child[subIndex].action_data.forEach((element) => {
         const findindex = this.actionList[index].child[subIndex].fieldList.findIndex(
-          (findItem) => findItem === element.id
+          (findItem) => findItem === String(element.id)
         );
         if (fieldAll && findindex == -1) {
-          this.actionList[index].child[subIndex].fieldList.push(element.id);
+          this.actionList[index].child[subIndex].fieldList.push(String(element.id));
         } else if (!fieldAll && findindex > -1) {
           this.actionList[index].child[subIndex].fieldList.splice(findindex, 1);
         }
@@ -297,7 +308,7 @@ export default {
       ].action.every(
         (evitem) =>
           this.actionList[index].child[subIndex].checkList.findIndex(
-            (finditem) => finditem === evitem.id
+            (finditem) => finditem === String(evitem.id)
           ) > -1
       );
       this.$set(this.actionList, index, item);
@@ -309,7 +320,7 @@ export default {
       ].action_data.every(
         (evitem) =>
           this.actionList[index].child[subIndex].fieldList.findIndex(
-            (finditem) => finditem === evitem.id
+            (finditem) => finditem === String(evitem.id)
           ) > -1
       );
       this.$set(this.actionList, index, item);
@@ -321,8 +332,8 @@ export default {
       // console.log(checked, id, index, subIndex);
       if (checked) {
         // 选中时检查pid的选中状态
-        this.actionList[index].child[subIndex].checkList.indexOf(id) == -1 &&
-          this.actionList[index].child[subIndex].checkList.push(id);
+        this.actionList[index].child[subIndex].checkList.indexOf(String(id)) == -1 &&
+          this.actionList[index].child[subIndex].checkList.push(String(id));
       } else {
         const find = this.actionList[index].child[subIndex].checkList.findIndex(
           (e) => e == id
@@ -340,8 +351,8 @@ export default {
       // console.log(checked, id, index, subIndex);
       if (checked) {
         // 选中时检查pid的选中状态
-        this.actionList[index].child[subIndex].fieldList.indexOf(id) == -1 &&
-          this.actionList[index].child[subIndex].fieldList.push(id);
+        this.actionList[index].child[subIndex].fieldList.indexOf(String(id)) == -1 &&
+          this.actionList[index].child[subIndex].fieldList.push(String(id));
       } else {
         const find = this.actionList[index].child[subIndex].fieldList.findIndex(
           (e) => e == id
@@ -358,7 +369,7 @@ export default {
     switchRoleHandle(item) {
       this.roleActive = Object.assign({}, item);
       this.$nextTick(async () => {
-        await this.refreshRoleDetail(item.id);
+        await this.refreshRoleDetail(String(item.id));
       });
     },
     // 保存
@@ -371,7 +382,7 @@ export default {
           this.action_data.push(...y.fieldList);
           this.action.push(...y.checkList);
           if (String(y.is_private_change) === "1") {
-            arr.push(y.id);
+            arr.push(String(y.id));
           }
         });
       });
@@ -387,7 +398,8 @@ export default {
           action: this.action,
           action_data: this.action_data,
           private_data: arr,
-          private_field: this.private_field,
+          private_field: this.private_field.split(','),
+          is_allow_see_price: this.ruleForm.is_allow_see_price
         };
 
         const loadding = this.$loading();
@@ -411,7 +423,10 @@ export default {
 
       const res = await asyncRequest.detail({ roleid: roleid });
 
+
       if (res && res.code === 0 && res.data) {
+        this.ruleForm.is_allow_see_price = res.data.is_allow_see_price
+
         let resD = res.data;
         this.ruleForm = resD;
 
@@ -452,7 +467,9 @@ export default {
 
       const res = await asyncRequest.actionList({});
       if (res && res.code === 0 && res.data) {
-        this.rules = res.data;
+        this.rules = this.recursionFilterActionList(res.data);
+
+        console.dir(this.rules)
         await this.initRoleList();
       } else if (res && res.code >= 100 && res.code <= 104) {
         await this.logout();

src/views/interest/role/addEdit.vue

@@ -530,8 +530,6 @@ export default {
 
         this.ruleForm = resD
 
-        console.log(this.ruleForm)
-
         if (resD.action && resD.action.length > 0) {
           this.action = resD.action
         } else {
@@ -606,10 +604,23 @@ export default {
         this.$message.warning(res.message)
       }
     },
+    recursionFilterActionList(list) {
+      const _list = []
+      for (let i = 0; i < list.length; i++) {
+        const item = list[i]
+
+        if (item.level !== 1) _list.push(item)
+        if (item.child && item.child.length > 0) item.child = this.recursionFilterActionList(item.child)
+      }
+      return _list
+    },
+
     async initActionList() {
       const res = await asyncRequest.actionList({})
       if (res && res.code === 0) {
         const list = res.data
+        console.log(this.recursionFilterActionList(list))
+
         let arr = list.filter((item) => item.child && item.child.length > 0)
         arr = arr.map((x) => {
           x.child.map((y) => {

src/views/loadingPage/index.vue

@@ -1,17 +1,17 @@
 <template>
   <div class="dingLoading">
-    <img src="@/assets/img/loading.gif" alt="" />
+    <img src="@/assets/img/loading.gif" alt="">
   </div>
 </template>
 
 <script>
 export default {
-  name: "loadingPage",
+  name: 'LoadingPage',
   data() {
-    return {};
+    return {}
   },
-  mounted() {},
-};
+  mounted() {}
+}
 </script>
 <style lang="scss" scoped>
 .dingLoading {

src/views/login/index.vue

@@ -1,7 +1,7 @@
 <template>
   <div class="login-container">
     <div class="login-form-main">
-      <img src="@/assets/sheji/loginlan.png" alt="" />
+      <img src="@/assets/sheji/loginlan.png" alt="">
       <div class="main-title">
         <h1>欢迎登录</h1>
         <h3>采销平台</h3>
@@ -23,7 +23,7 @@
 
         <el-form-item prop="username">
           <span class="svg-container">
-            <i class="el-icon-user"></i>
+            <i class="el-icon-user" />
           </span>
           <el-input
             ref="username"
@@ -45,7 +45,7 @@
         >
           <el-form-item prop="password">
             <span class="svg-container">
-              <i class="el-icon-unlock"></i>
+              <i class="el-icon-unlock" />
             </span>
             <el-input
               :key="passwordType"
@@ -73,8 +73,7 @@
           type="primary"
           style="width: 100%; margin-top: 5px"
           @click.native.prevent="handleLogin()"
-          >登&nbsp;&nbsp;&nbsp;&nbsp;录</el-button
-        >
+        >登&nbsp;&nbsp;&nbsp;&nbsp;录</el-button>
 
         <div style="position: relative; padding: 12px 0 0 0">
           <div class="tips" style="float: left">
@@ -85,7 +84,7 @@
               trigger="click"
               content="dingding123"
             >
-              <i class="el-icon-info" slot="reference"></i>
+              <i slot="reference" class="el-icon-info" />
             </el-popover>
           </div>
           <!-- <router-link to="/forget-password">
@@ -97,84 +96,84 @@
       </el-form>
     </div>
 
-    <div class="beian" v-if="loginBeian !== ''">
+    <div v-if="loginBeian !== ''" class="beian">
       <span>{{ loginTitle }}</span>
       <a target="_blank" :href="loginBeianUrl">{{ loginBeian }}</a>
-      <span> </span>
+      <span />
     </div>
   </div>
 </template>
 
 <script>
-import asyncRequest from "@/apis/service/user";
-import resToken from "@/mixins/resToken";
-import { isnumber, isAlphanumeric, validAlphabets, isMobile } from "@/utils/validate";
-import urlConfig from "@/apis/url-config";
+import asyncRequest from '@/apis/service/user'
+import resToken from '@/mixins/resToken'
+import { isnumber, isAlphanumeric, validAlphabets, isMobile } from '@/utils/validate'
+import urlConfig from '@/apis/url-config'
 export default {
-  name: "Login",
+  name: 'Login',
   mixins: [resToken],
   data() {
     const validateUsername = (rule, value, callback) => {
-      if (value === "") {
-        callback(new Error("手机号不能为空！"));
+      if (value === '') {
+        callback(new Error('手机号不能为空！'))
       } else {
         if (!isMobile(value)) {
-          callback(new Error("请输入正确的手机号"));
+          callback(new Error('请输入正确的手机号'))
         } else {
-          callback();
+          callback()
         }
       }
-    };
+    }
     const validatePassword = (rule, value, callback) => {
-      if (value === "") {
-        callback(new Error("密码不能为空！"));
+      if (value === '') {
+        callback(new Error('密码不能为空！'))
       } else {
         if (!isAlphanumeric(value)) {
-          callback(new Error("密码为6-18位数字字母组合！"));
+          callback(new Error('密码为6-18位数字字母组合！'))
         } else if (value.length < 6 || value.length > 18) {
-          callback(new Error("密码为6-18位数字字母组合！"));
+          callback(new Error('密码为6-18位数字字母组合！'))
         } else if (isnumber(value)) {
-          callback(new Error("密码不能为纯数字！"));
+          callback(new Error('密码不能为纯数字！'))
         } else if (validAlphabets(value)) {
-          callback(new Error("密码不能为纯字母！"));
+          callback(new Error('密码不能为纯字母！'))
         } else {
-          callback();
+          callback()
         }
       }
-    };
+    }
     return {
-      ver: "",
+      ver: '',
       show: false,
       loginTitle: urlConfig.loginTitle,
       loginBeian: urlConfig.loginBeian,
       loginBeianUrl: urlConfig.loginBeianUrl,
       loginForm: {
-        username: "17531816886",
-        password: "dingding123",
+        username: '17531816886',
+        password: 'dingding123'
       },
       loginRules: {
-        username: [{ required: true, trigger: "blur", validator: validateUsername }],
-        password: [{ required: true, trigger: "blur", validator: validatePassword }],
+        username: [{ required: true, trigger: 'blur', validator: validateUsername }],
+        password: [{ required: true, trigger: 'blur', validator: validatePassword }]
       },
-      passwordType: "password",
+      passwordType: 'password',
       capsTooltip: false,
       loading: false,
       showDialog: false,
       redirect: undefined,
-      otherQuery: {},
-    };
+      otherQuery: {}
+    }
   },
   watch: {
     $route: {
-      handler: function (route) {
-        const query = route.query;
+      handler: function(route) {
+        const query = route.query
         if (query) {
-          this.redirect = query.redirect;
-          this.otherQuery = this.getOtherQuery(query);
+          this.redirect = query.redirect
+          this.otherQuery = this.getOtherQuery(query)
         }
       },
-      immediate: true,
-    },
+      immediate: true
+    }
   },
   mounted() {
     // console.log(process.env.NODE_ENV);
@@ -185,100 +184,97 @@ export default {
     //   };
     // }
     // this.getversion();
-    if (this.loginForm.username === "") {
-      this.$refs.username.focus();
-    } else if (this.loginForm.password === "") {
-      this.$refs.password.focus();
+    if (this.loginForm.username === '') {
+      this.$refs.username.focus()
+    } else if (this.loginForm.password === '') {
+      this.$refs.password.focus()
     }
   },
   methods: {
     async getversion() {
-      const { code, data } = await asyncRequest.version({});
+      const { code, data } = await asyncRequest.version({})
       if (code === 0) {
-        const { version } = data;
-        this.ver = version;
+        const { version } = data
+        this.ver = version
       } else {
-        this.ver = "";
+        this.ver = ''
       }
     },
     setVisible(val) {
-      this.show = val;
+      this.show = val
     },
     handleClick() {
-      this.show = true;
+      this.show = true
     },
     handleSuccess() {
-      this.show = false;
-      this.handleLogin();
+      this.show = false
+      this.handleLogin()
     },
     checkCapslock(e) {
-      const { key } = e;
-      this.capsTooltip = key && key.length === 1 && key >= "A" && key <= "Z";
+      const { key } = e
+      this.capsTooltip = key && key.length === 1 && key >= 'A' && key <= 'Z'
     },
     showPwd() {
-      if (this.passwordType === "password") {
-        this.passwordType = "";
+      if (this.passwordType === 'password') {
+        this.passwordType = ''
       } else {
-        this.passwordType = "password";
+        this.passwordType = 'password'
       }
       this.$nextTick(() => {
-        this.$refs.password.focus();
-      });
+        this.$refs.password.focus()
+      })
     },
     handleLogin() {
       this.$refs.loginForm.validate((valid) => {
         if (valid) {
-          this.loading = true;
+          this.loading = true
           this.$store
-            .dispatch("user/login", this.loginForm)
+            .dispatch('user/login', this.loginForm)
             .then((res) => {
-              console.log(res);
+              console.log(res)
               if (res.code === 0) {
-                this.getMenu();
+                this.getMenu()
               } else {
-                this.$message.warning(res.message);
-                this.loading = false;
+                this.$message.warning(res.message)
+                this.loading = false
               }
             })
             .catch((err) => {
-              console.log(err);
-              this.loading = false;
-            });
+              console.log(err)
+              this.loading = false
+            })
         } else {
-          console.log("error submit!!");
-          return false;
+          console.log('error submit!!')
+          return false
         }
-      });
+      })
     },
     getMenu() {
       this.$store
-        .dispatch("user/getMenuList", this)
+        .dispatch('user/getMenuList', this)
         .then((res) => {
-          console.log(res);
           window.vm.$router.push({
             path: this.redirect
               ? this.redirect
-              : res === "success-dataV"
-              ? "/bigScreen/datavScr"
-              : "/welcome",
-            query: this.otherQuery,
-          });
-          this.loading = false;
+              : res === 'success-dataV'
+                ? '/bigScreen/datavScr'
+                : '/welcome/dashboard/',
+            query: this.otherQuery
+          })
+          this.loading = false
         })
-        .catch((err) => {
-          this.loading = false;
-        });
+        .catch((err) => { this.loading = false })
     },
     getOtherQuery(query) {
       return Object.keys(query).reduce((acc, cur) => {
-        if (cur !== "redirect") {
-          acc[cur] = query[cur];
+        if (cur !== 'redirect') {
+          acc[cur] = query[cur]
         }
-        return acc;
-      }, {});
-    },
-  },
-};
+        return acc
+      }, {})
+    }
+  }
+}
 </script>
 
 <style lang="scss">

src/views/reload/index.vue

@@ -1,20 +1,22 @@
 <script>
 export default {
-  render:() => null,
   created() {
-    const { query } = this.$route;
-    let redirect = query.redirect;
-    if (redirect) delete query.redirect;
-    const keys = Object.keys(query).filter(key => key);
-    let queryString = "";
+    const { query } = this.$route
+    const redirect = query.redirect
+
+    if (redirect) delete query.redirect
+
+    const keys = Object.keys(query).filter(key => key)
+    let queryString = ''
 
     const chunk = (qs, key, index) => {
-      const next = `${key}=${query[key]}${index === keys.length ? "" : "&"}`;
-      return qs + next;
-    };
+      const next = `${key}=${query[key]}${index === !keys.length ? '&' : ''}`
+      return qs + next
+    }
 
-    queryString = keys.reduce(chunk, "?");
-    this.$router.replace(redirect + queryString);
-  }
+    queryString = keys.reduce(chunk, '?')
+    this.$router.replace(redirect + queryString)
+  },
+  render: () => null
 }
 </script>