feat:业务公司登录

src/App.vue

@@ -1,57 +1,57 @@
 <template>
-  <div id="app" v-cloak>
+  <div v-cloak id="app">
     <router-view />
   </div>
 </template>
 
 <script>
-import { JudgeEnvironment } from "@/utils/validate";
-import { getCode } from "@/utils/dingding";
+import { JudgeEnvironment } from '@/utils/validate'
+import { getCode } from '@/utils/dingding'
 export default {
-  name: "App",
+  name: 'App',
   data() {
     return {
-      code: "",
-    };
+      code: ''
+    }
   },
   async created() {
-    await this.getMenu();
+    await this.getMenu()
   },
   methods: {
     async getMenu() {
       this.$store
-        .dispatch("user/getMenuList", this)
-        .then(async (res) => {
-          if (res === "noToken") {
-            await this.logout();
-          } else if (res === "success" || res === "success-dataV") {
+        .dispatch('user/getMenuList', this)
+        .then(async(res) => {
+          if (res === 'noToken') {
+            await this.logout()
+          } else if (res === 'success' || res === 'success-dataV') {
             if (
-              this.$route.path === "/loadingPage" ||
-              this.$route.path === "/" ||
-              this.$route.path === "/login"
+              this.$route.path === '/loadingPage' ||
+              this.$route.path === '/' ||
+              this.$route.path === '/login'
             ) {
-              if (res === "success-dataV") {
-                window.vm.$router.replace("/bigScreen/datavScr");
+              if (res === 'success-dataV') {
+                window.vm.$router.replace('/bigScreen/datavScr')
               } else {
-                window.vm.$router.replace("/welcome");
+                window.vm.$router.replace('/welcome')
               }
             }
           } else {
-            await this.logout();
+            await this.logout()
           }
         })
-        .catch(async (err) => {
-          await this.logout();
-        });
+        .catch(async(err) => {
+          await this.logout()
+        })
     },
     async logout() {
-      if (this.$route.path !== "/login") {
-        await this.$store.dispatch("user/logout");
-        this.$router.push(`/login`);
+      if (this.$route.path !== '/login') {
+        await this.$store.dispatch('user/logout')
+        this.$router.push(`/login`)
       }
-    },
-  },
-};
+    }
+  }
+}
 </script>
 <style lang="scss">
 @import "./assets/css/index.scss";

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

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

src/apis/user/axios.js

@@ -11,7 +11,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',
@@ -54,14 +54,14 @@ export default async (
         config.data.token = getToken()
       }
 
-      const { noRelation } = config.data;
+      const { noRelation } = config.data
 
-      //决定传递关联公司:非超管用户且单独的请求中data中没有设置noRelation
-      const isAllowRelaComNo = !store.state.user.isSupertube && !noRelation;
-      config.data.relaComNo = isAllowRelaComNo ? store.state.user.currentCompany : '';
+      // 决定传递关联公司:非超管用户且单独的请求中data中没有设置noRelation
+      const isAllowRelaComNo = !store.state.user.isSupertube && !noRelation
+      config.data.relaComNo = isAllowRelaComNo ? store.state.user.currentCompany : ''
       return config
     },
-    error => {
+    () => {
       // 错误抛到业务代码
       return Promise.reject(new Error('服务器异常，请联系管理员！'))
     }

src/apis/user/index.js

@@ -1,5 +1,5 @@
-import http from "@/apis/user/axios";
-import urlConfig from "@/apis/url-config";
+import http from '@/apis/user/axios'
+import urlConfig from '@/apis/url-config'
 // 登录
 export function login(data) {
   const _data = {
@@ -8,9 +8,9 @@ export function login(data) {
   }
   return http({
     url: `${urlConfig.baseURL}admin/login`,
-    method: "post",
-    data: _data,
-  });
+    method: 'post',
+    data: _data
+  })
 }
 // 获取个人信息
 export function userinfo(data) {
@@ -21,26 +21,26 @@ export function userinfo(data) {
 
   return http({
     url: `${urlConfig.baseURL}admin/userinfo`,
-    method: "post",
-    data: _data,
-  });
+    method: 'post',
+    data: _data
+  })
 }
 
 // 获取用户权限导航列表
 export function menuList(data) {
   return http({
     url: `${urlConfig.baseURL}admin/menu`,
-    method: "post",
-    data,
-  });
+    method: 'post',
+    data
+  })
 }
 // 钉钉获取用户信息
 export function dingdingdetail(data) {
   return http({
     url: `${urlConfig.baseURL}Api/dintalk`,
-    method: "post",
-    data,
-  });
+    method: 'post',
+    data
+  })
 }
 // 获取账号详情
 export function usergetinfo(data) {
@@ -50,9 +50,9 @@ export function usergetinfo(data) {
   }
   return http({
     url: `${urlConfig.baseURL}admin/userinfo`,
-    method: "post",
+    method: 'post',
     data: _data
-  });
+  })
 }
 
 // 获取角色流程节点详情
@@ -64,34 +64,53 @@ export function roleProcessInfo(data) {
 
   return http({
     url: `${urlConfig.baseURL}admin/role_process_detail`,
-    method: "post",
-    data: _data,
-  });
+    method: 'post',
+    data: _data
+  })
 }
 
-//获取用户的企业列表
+export function reuqsetRoleInfo(data) {
+  const _data = {
+    ...data,
+    noRelation: true
+  }
+
+  return http({
+    url: `${urlConfig.baseURL}admin/role_process_detail`,
+    method: 'post',
+    data: _data
+  })
+}
+
+// 获取用户的企业列表
 export function requsetCompanyList(data) {
   return http({
     url: `${urlConfig.baseURL}admin/businesslist`,
-    method: "post",
-    data,
-  });
+    method: 'post',
+    data
+  })
 }
 
-//超管用户获取所有企业列表
+// 超管用户获取所有企业列表
 export function requsetSupertubeCompany(data) {
   return http({
     url: `${urlConfig.baseURL}admin/comprehensiveList`,
-    method: "post",
-    data,
-  });
+    method: 'post',
+    data
+  })
 }
 
-//普通用户获取绑定的企业列表
+// 普通用户获取绑定的企业列表
 export function requsetBindCompany(data) {
+  const _data = {
+    ...data,
+    size: 100,
+    noRelation: true
+  }
+
   return http({
     url: `${urlConfig.baseURL}admin/userCompanyList`,
-    method: "post",
-    data,
-  });
+    method: 'post',
+    data: _data
+  })
 }

src/assets/js/roleLevel.js

@@ -1,5 +1,5 @@
 const role = [
-  { name: "管理员", code: "1" },
-  { name: "非管理员", code: "2" },
+  { name: "管理员", code: "2" },
+  { name: "专员", code: "3" },
 ];
 export default role;

src/components/flow-chart/legend.vue

@@ -24,15 +24,14 @@
 </template>
 
 <script>
-import { colors } from "./config";
+import { colors } from './config'
 export default {
   data() {
-    return { colors };
+    return { colors }
   }
-};
+}
 </script>
 
-
 <style scoped>
 .legend__container {
   width: 150px;

src/layout/components/Navbar.vue

@@ -18,8 +18,8 @@
         <i
           v-if="isShow"
           class="el-icon-message-solid right-menu-item hover-effect shake"
-          @click="openNotice()"
           style="height: 50px; width: 40px; line-height: 52px; font-size: 22px"
+          @click="openNotice()"
         />
         <screenfull id="screenfull" class="right-menu-item hover-effect" />
 
@@ -30,7 +30,7 @@
 
       <el-dropdown class="avatar-container right-menu-item hover-effect" trigger="click">
         <div class="avatar-wrapper">
-          <img :src="avatar + '?imageView2/1/w/80/h/80'" class="user-avatar" />
+          <img :src="avatar + '?imageView2/1/w/80/h/80'" class="user-avatar">
           <div class="username">
             {{ $store.state.user.name }}
             <i class="el-icon-caret-bottom" />
@@ -38,7 +38,7 @@
         </div>
 
         <el-dropdown-menu slot="dropdown">
-          <router-link to="/person/my-message">
+          <!-- <router-link to="/person/my-message">
             <el-dropdown-item>我的信息</el-dropdown-item>
           </router-link>
           <router-link to="/person/change-phone">
@@ -46,8 +46,8 @@
           </router-link>
           <router-link to="/person/change-password">
             <el-dropdown-item>修改密码</el-dropdown-item>
-          </router-link>
-          <el-dropdown-item divided @click.native="logout">
+          </router-link> -->
+          <el-dropdown-item @click.native="logout">
             <span style="display: block">退出登录</span>
           </el-dropdown-item>
         </el-dropdown-menu>
@@ -77,16 +77,16 @@
       align="left"
       top="6vh"
       width="900px"
-      @close="submit"
       :close-on-click-modal="false"
       :visible.sync="showModel"
       element-loading-text="拼命加载中"
       element-loading-spinner="el-icon-loading"
       element-loading-background="rgba(0, 0, 0, 0.8)"
       append-to-body
+      @close="submit"
     >
       <el-card style="margin-top: -20px">
-        <el-row :gutter="10" v-if="activeMsg !== null">
+        <el-row v-if="activeMsg !== null" :gutter="10">
           <el-col :span="24">
             <div style="padding: 0 0 22px 0">
               <el-alert
@@ -96,7 +96,7 @@
                 class="my-el-alert"
                 :title="activeMsg.module"
                 :type="activeMsg.sys_type === 'VER' ? 'success' : 'warning'"
-              ></el-alert>
+              />
             </div>
             <el-form
               :size="'mini'"
@@ -106,7 +106,7 @@
               style="padding-left: 25px"
             >
               <el-row>
-                <el-col :span="12" v-if="activeMsg.sys_type === 'VER'">
+                <el-col v-if="activeMsg.sys_type === 'VER'" :span="12">
                   <el-form-item label="版本编号：">
                     <p style="margin: 0">{{ activeMsg.version }}</p>
                   </el-form-item>
@@ -122,15 +122,21 @@
                 </el-col>
                 <el-col :span="24">
                   <el-form-item label="更新内容：">
-                    <p style="margin: 0" v-html="activeMsg.system"></p>
+                    <p style="margin: 0" v-html="activeMsg.system" />
                   </el-form-item>
                 </el-col>
                 <el-col :span="24" style="text-align: right">
-                  <el-checkbox v-model="checked" class="fl" style="padding-top: 5px"
-                    >我已知晓，后续不再提示！</el-checkbox
-                  >
-                  <el-button @click="submit" type="primary" plain :size="'mini'"
-                    >关闭
+                  <el-checkbox
+                    v-model="checked"
+                    class="fl"
+                    style="padding-top: 5px"
+                  >我已知晓，后续不再提示！</el-checkbox>
+                  <el-button
+                    type="primary"
+                    plain
+                    :size="'mini'"
+                    @click="submit"
+                  >关闭
                   </el-button>
                 </el-col>
               </el-row>
@@ -143,74 +149,74 @@
 </template>
 
 <script>
-import { mapGetters } from "vuex";
+import { mapGetters } from 'vuex'
 
-import asyncRequest from "@/apis/service/system/updates";
-import resToken from "@/mixins/resToken";
-import CompanySelect from "./company-select/index.vue";
+import asyncRequest from '@/apis/service/system/updates'
+import resToken from '@/mixins/resToken'
+import CompanySelect from './company-select/index.vue'
 
 import {
   getNotice,
   setNotice,
   get_business_companyNo,
-  get_business_company,
-} from "@/utils/auth";
+  get_business_company
+} from '@/utils/auth'
 
 export default {
   computed: {
-    ...mapGetters(["sidebar", "avatar", "device"]),
+    ...mapGetters(['sidebar', 'avatar', 'device'])
+  },
+  components: {
+    CompanySelect
   },
   mixins: [resToken],
   data() {
     return {
-      companyNo: "",
-      companyNoName: "",
+      companyNo: '',
+      companyNoName: '',
       showModel: false,
       loading: false,
       isShow: true,
       statsTime: 0,
       endTime: 0,
       checked: true,
-      lastNotice: null, //最后一次提示时间
+      lastNotice: null, // 最后一次提示时间
       parmValue: {
-        type: "",
+        type: '',
         page: 1, // 页码
-        size: 15, // 每页显示条数
+        size: 15 // 每页显示条数
       },
-      activeMsg: null, //消息展示对象
-    };
-  },
-  components: {
-    CompanySelect,
+      activeMsg: null // 消息展示对象
+    }
   },
   mounted() {
-    this.companyNo = get_business_companyNo() || "";
-    this.companyNoName = get_business_company() || "";
-    this.openNotice(true);
+    this.companyNo = get_business_companyNo() || ''
+    this.companyNoName = get_business_company() || ''
+    this.openNotice(true)
   },
   methods: {
     async openNotice(is) {
       if (getNotice() && getNotice().length > 0) {
-        this.lastNotice = JSON.parse(getNotice());
+        this.lastNotice = JSON.parse(getNotice())
       } else {
-        this.lastNotice = null;
+        this.lastNotice = null
       }
-      const { code, count, item, message } = await this.initData();
+      const { code, count, item, message } = await this.initData()
       if (code === 0) {
         if (count != 0) {
-          this.activeMsg = item;
+          this.activeMsg = item
           if (is) {
-            this.typeShow();
+            this.typeShow()
           } else {
-            this.showModel = true;
+            this.showModel = true
           }
         } else {
-          this.$message.warning("暂无系统消息！");
+          this.$message.warning('暂无系统消息！')
         }
       } else if (code >= 100 && code <= 104) {
-        await this.logout();
+        await this.logout()
       } else {
-        this.$message.warning(message);
+        this.$message.warning(message)
       }
     },
     business_companyNo_change(e) {
@@ -228,94 +234,94 @@ export default {
       // }
     },
     async initData() {
-      let res = {
+      const res = {
         code: 0,
         count: 0,
         item: {},
-        message: "",
-      };
-
-      this.loading = true;
-      const { code, data, message } = await asyncRequest.list(this.parmValue);
-      this.loading = false;
-      res.code = code;
-      res.message = message;
+        message: ''
+      }
+
+      this.loading = true
+      const { code, data, message } = await asyncRequest.list(this.parmValue)
+      this.loading = false
+      res.code = code
+      res.message = message
       if (code === 0) {
-        const { list, count } = data;
-        res.count = count;
+        const { list, count } = data
+        res.count = count
         if (count !== 0) {
-          res.item = JSON.parse(JSON.stringify(list[0]));
+          res.item = JSON.parse(JSON.stringify(list[0]))
         }
       }
-      return res;
+      return res
     },
     typeShow() {
-      let is = this.is_Tips();
+      const is = this.is_Tips()
       if (!is) {
-        return;
+        return
       }
-      if (this.lastNotice + "" === "null" && is) {
-        this.showModel = true;
+      if (this.lastNotice + '' === 'null' && is) {
+        this.showModel = true
       } else {
-        const { addtime: laddtime, type: ltype, sys_type: lsys_type } = this.lastNotice;
-        const { sys_type, addtime } = this.activeMsg;
+        const { addtime: laddtime, type: ltype, sys_type: lsys_type } = this.lastNotice
+        const { sys_type, addtime } = this.activeMsg
 
         if (laddtime === addtime && lsys_type === sys_type) {
-          if (ltype + '' === "1") {
-            this.showModel = false;
+          if (ltype + '' === '1') {
+            this.showModel = false
           } else {
-            this.showModel = true;
+            this.showModel = true
           }
         } else {
-          this.showModel = true;
+          this.showModel = true
         }
       }
     },
     is_Tips() {
-      let nowtime = new Date().valueOf();
-      const { sys_type, addtime } = this.activeMsg;
-      let timeV = new Date(addtime).valueOf();
-      if (sys_type === "VER") {
-        this.statsTime = timeV;
-        this.endTime = this.statsTime + 1000 * 60 * 60 * 24 * 7;
+      const nowtime = new Date().valueOf()
+      const { sys_type, addtime } = this.activeMsg
+      const timeV = new Date(addtime).valueOf()
+      if (sys_type === 'VER') {
+        this.statsTime = timeV
+        this.endTime = this.statsTime + 1000 * 60 * 60 * 24 * 7
         if (nowtime >= this.statsTime && nowtime <= this.endTime) {
-          return true;
+          return true
         } else {
-          return false;
+          return false
         }
       } else {
-        this.statsTime = 0;
-        this.endTime = timeV;
+        this.statsTime = 0
+        this.endTime = timeV
         if (nowtime <= this.endTime) {
-          return true;
+          return true
         } else {
-          return false;
+          return false
         }
       }
     },
     toggleSideBar() {
-      this.$store.dispatch("app/toggleSideBar");
+      this.$store.dispatch('app/toggleSideBar')
     },
     async logout() {
-      await this.$store.dispatch("user/logout");
-      this.$router.push(`/login?redirect=${this.$route.fullPath}`);
+      await this.$store.dispatch('user/logout')
+      this.$router.push(`/login?redirect=${this.$route.fullPath}`)
     },
     submit() {
-      this.page_set_notice();
-      this.showModel = false;
+      this.page_set_notice()
+      this.showModel = false
     },
-    //保存提交结果
+    // 保存提交结果
     page_set_notice() {
-      const { sys_type, addtime } = this.activeMsg;
-      let model = {
-        type: this.checked ? "1" : "0",
+      const { sys_type, addtime } = this.activeMsg
+      const model = {
+        type: this.checked ? '1' : '0',
         sys_type: sys_type,
-        addtime: addtime,
-      };
-      setNotice(JSON.stringify(model));
-    },
-  },
-};
+        addtime: addtime
+      }
+      setNotice(JSON.stringify(model))
+    }
+  }
+}
 </script>
 
 <style lang="scss" scoped>

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

@@ -4,34 +4,37 @@
     :size="size"
     :placeholder="placeholder"
     :value="value ? value : currentCompany"
-    @change="setCurrentCompany"
     :remote-method="handleRemoteSearch"
     :disabled="disabled"
     reserve-keyword
     filterable
     remote
+    @change="setCurrentCompany"
   >
     <!-- 当selectAll为true 且为超管账号允许选择所有公司 -->
-    <el-option v-if="selectAll" label="所有公司" value />
+    <el-option v-if="selectAll && isSupertube" label="所有公司" value />
+
     <el-option
-      class="custom-company"
       v-for="(company, index) in companylist"
+      :key="index"
+      class="custom-company"
       :label="company.code + '/' + company.name"
       :value="company.code"
-      :key="index"
     />
-    <p class="company-loading" v-if="state.loading">
+
+    <p v-if="state.loading" class="company-loading">
       <i class="el-icon-loading" />
       加载中...
     </p>
-    <p class="company-more" v-if="state.noMore">没有更多数据了...</p>
+
+    <p v-if="state.noMore" class="company-more">没有更多数据了...</p>
   </el-select>
 </template>
 
 <script>
-import { mapState } from "vuex";
-import { setUserCompany } from "@/utils/auth";
-import { requsetSupertubeCompany, requsetBindCompany } from "@/apis/user";
+import { mapState } from 'vuex'
+import { setUserCompany } from '@/utils/auth'
+import { requsetSupertubeCompany, requsetBindCompany } from '@/apis/user'
 
 export default {
   /**
@@ -48,11 +51,11 @@ export default {
     },
     size: {
       type: String,
-      default: "small"
+      default: 'small'
     },
     placeholder: {
       type: String,
-      default: ""
+      default: ''
     },
     disabled: {
       type: Boolean,
@@ -64,18 +67,18 @@ export default {
     },
     value: {
       type: String,
-      default: ""
+      default: ''
     }
   },
   computed: {
     ...mapState({
       currentCompany: state => state.user.currentCompany,
+      companylist: state => state.user.companylist,
       isSupertube: state => state.user.isSupertube
     })
   },
   data() {
     return {
-      companylist: [],
       ScrollWrapper: null,
       initialization: true,
       state: {
@@ -83,145 +86,149 @@ export default {
         noMore: false
       },
       params: {
-        name: "",
-        page: 1,
+        name: '',
+        page: 2,
         size: 10
       }
-    };
+    }
   },
   async mounted() {
-    this.initalData();
-    this.ScrollWrapper = await this.getScrollWrapper();
-    this.ScrollWrapper && this.bindEvent(this.ScrollWrapper);
+    this.initalData()
+    this.ScrollWrapper = await this.getScrollWrapper()
+    this.ScrollWrapper && this.bindEvent(this.ScrollWrapper)
   },
   beforeDetoryed() {
-    this.ScrollWrapper && this.removeEvent(this.ScrollWrapper);
+    this.ScrollWrapper && this.removeEvent(this.ScrollWrapper)
   },
   methods: {
     async initalData() {
-      //todo:区分是否超管用户请求不同接口
-      this.state.loading = true;
-      const api = this.isSupertube ? requsetSupertubeCompany : requsetBindCompany;
-      const { code, data } = await api(this.params);
-      if (data.list.length < 10) this.state.noMore = true;
-      this.state.loading = false;
-      this.params.page++;
-      //超管默认查所有所有公司(空) 业务账号取列表第一个作为默认公司
-      const defaultCompany = this.isSupertube ? '' : data.list[0].code
-      this.setCurrentCompany(defaultCompany);
-      if (Number(code) === 0) this.companylist = data.list;
+      // 区分是否超管用户请求不同接口
+      this.state.loading = true
+      const api = this.isSupertube ? requsetSupertubeCompany : requsetBindCompany
+      const { code, data } = await api(this.params)
+      if (code === 0) {
+        if (data.list.length < 10) this.state.noMore = true
+        this.state.loading = false
+        this.params.page++
+        return data.list
+      }
     },
 
     setCurrentCompany(currentCompany) {
-      this.$emit("update:value", currentCompany);
-      this.$emit("change", currentCompany);
+      this.$emit('update:value', currentCompany)
+      this.$emit('change', currentCompany)
 
-      if (!this.global) {
-        return null; //作为通用组件使用不设置全局选中公司
-      }
+      if (!this.global) return null // 作为通用组件使用不设置全局选中公司
 
-      this.$store.commit("user/setCurrentCompany", currentCompany);
-      setUserCompany(currentCompany);
+      setUserCompany(currentCompany)
+      this.$store.commit('user/setCurrentCompany', currentCompany)
 
-      if (this.initialization || this.isSupertube) {
-        return (this.initialization = false); //超管用户&初始化不刷新路由
-      }
-
-      this.changeRouterWithCompany();
+      if (this.initialization || this.isSupertube) return (this.initialization = false) // 超管用户 && 初始化不刷新路由
+      this.changeRouterWithCompany()
     },
+
     async changeRouterWithCompany() {
-      const { path, query } = this.$route;
-      query.redirect = path;
-      const keys = Object.keys(query).filter(key => key);
+      const { path, query } = this.$route
+      query.redirect = path
+      const keys = Object.keys(query).filter(key => key)
 
-      //1.保存透传参数
-      let queryString = "";
+      // 1.保存透传参数
+      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
+      }
+
+      // 2.重新获取用户信息和菜单
+      const result = await this.$store.dispatch('user/getMenuList')
 
-      //2.重新获取用户信息和菜单
-      const result = await this.$store.dispatch("user/getMenuList");
       switch (result) {
-        case "noToken":
-          await this.$store.dispatch("user/logout");
-          this.$router.push(`/login`);
-          break;
+        case 'noToken':
+          await this.$store.dispatch('user/logout')
+          this.$router.push(`/login`)
+          break
         default:
-          queryString = keys.reduce(chunk, "?");
-          this.$router.replace("/reload" + queryString);
-          break;
+          queryString = keys.reduce(chunk, '?')
+          this.$router.replace('/reload' + queryString)
+          break
       }
     },
 
     getScrollWrapper() {
       return new Promise(resolve => {
         setTimeout(() => {
-          let optionEl = document.querySelector(".custom-company");
+          let optionEl = document.querySelector('.custom-company')
           if (optionEl && (optionEl = optionEl.parentElement)) {
-            resolve(optionEl.parentElement);
-            return;
+            resolve(optionEl.parentElement)
+            return
           }
-          resolve(null);
-        }, 500);
-      });
+          resolve(null)
+        }, 500)
+      })
     },
 
     async handleScroll() {
-      const ScrollWrapper = this.ScrollWrapper;
-      const height = ScrollWrapper.clientHeight;
-      const scrollTop = ScrollWrapper.scrollTop;
-      const scrollHeight = ScrollWrapper.scrollHeight;
-      const { loading, noMore } = this.state;
-
-      //是否允许下拉加载
-      const isAllowLoad = !loading && !noMore;
+      const ScrollWrapper = this.ScrollWrapper
+      const height = ScrollWrapper.clientHeight
+      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.companylist = [...this.companylist, ...list];
+        const list = await this.loadMore()
+
+        // 保存到全局
+        this.$store.commit('user/setCompanylist', [...this.companylist, ...list])
       }
     },
 
     async loadMore() {
-      //区分超管用户和普通用户
-      const api = this.isSupertube ? requsetSupertubeCompany : requsetBindCompany;
-      this.state.loading = true;
-      const { data } = await api(this.params);
-      this.state.loading = false;
-      const isTransboundary = this.companylist.length >= Number(data.count); //是否越界
-
-      if (isTransboundary || data.list.length < 10) {
-        this.state.noMore = true;
-        this.sate.lading = false;
-        return [];
+      // 区分超管用户和普通用户
+      const api = this.isSupertube ? requsetSupertubeCompany : requsetBindCompany
+
+      this.state.loading = true
+      const { data } = await api(this.params)
+
+      this.state.loading = false
+      const isTransboundary = this.companylist.length >= Number(data.count) // 是否越界
+
+      if (isTransboundary) {
+        this.state.noMore = true
+        this.sate.loading = false
+        return []
       }
 
-      this.params.page ++;
-      return data.list;
+      this.params.page++
+      return data.list
     },
 
-    handleRemoteSearch(name) {
-      this.companylist = [];
-      this.params.name = name;
-      this.params.page = 1;
-      this.state.noMore = false;
-      this.state.loading = false;
-      this.initalData();
+    async handleRemoteSearch(name) {
+      // 清空全局业务公司列表
+      this.$store.commit('user/setCompanylist', [])
+      this.params.name = name
+      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)
     },
 
     bindEvent(ScrollWrapper) {
-      ScrollWrapper.addEventListener("scroll", this.handleScroll);
+      ScrollWrapper.addEventListener('scroll', this.handleScroll)
     },
 
     removeEvent(ScrollWrapper) {
-      ScrollWrapper.removeEventListener("scroll", this.handleScroll);
+      ScrollWrapper.removeEventListener('scroll', this.handleScroll)
     }
   }
-};
+}
 </script>
 
-
 <style lang="scss" scoped>
 .company-more {
   text-align: center;

src/mixins/companyHelper.js

@@ -1,8 +1,8 @@
-import { mapState } from "vuex";
+import { mapState } from 'vuex'
 
 const _mapState = {
-  isSupertube: state => state.user.isSupertube, //是否超管
-  currentCompany: (state) => state.user.currentCompany //当前选中的业务公司
+  isSupertube: state => state.user.isSupertube, // 是否超管
+  currentCompany: (state) => state.user.currentCompany // 当前选中的业务公司
 }
 
 const companyHelper = {
@@ -14,19 +14,19 @@ const companyHelper = {
      * 当前公司发生改变时默认执行的方法,重置列表数据
      */
     onCompanyChangeInner() {
-      const vm = this;
-      const { searchList, pageInfo, parmValue } = vm;
-      if (!searchList) return null;
-      if (pageInfo) this.pageInfo.curr = 1;
-      if (parmValue) this.parmValue.page = 1;
-      this.searchList();
+      const vm = this
+      const { searchList, pageInfo, parmValue } = vm
+      if (!searchList) return null
+      if (pageInfo) this.pageInfo.curr = 1
+      if (parmValue) this.parmValue.page = 1
+      this.searchList()
     },
     /**
      * 判断当前是否有选中公司 没有选中返回false并提示警告信息
     */
-    isHasCurrentCompany(message = "请选择一家业务公司") {
-      const current = this.currentCompany;
-      if (!current) this.$message.warning(message);
+    isHasCurrentCompany(message = '请选择一家业务公司') {
+      const current = this.currentCompany
+      if (!current) this.$message.warning(message)
       return !!current
     }
   },
@@ -37,10 +37,10 @@ const companyHelper = {
     */
     currentCompany: {
       handler() {
-        const vm = this;
-        const { onCompanyChange, onCompanyChangeInner } = vm;
-        if (!vm.isSupertube) return null;
-        onCompanyChange ? onCompanyChange() : onCompanyChangeInner();
+        const vm = this
+        const { onCompanyChange, onCompanyChangeInner } = vm
+        if (!vm.isSupertube) return null
+        onCompanyChange ? onCompanyChange() : onCompanyChangeInner()
       },
       deep: true
     }

src/store/modules/user.js

@@ -5,9 +5,11 @@ import {
   menuList,
   dingdingdetail,
   usergetinfo,
-  roleProcessInfo,
-  requsetCompanyList
+  roleProcessInfo, 
+  requsetSupertubeCompany, 
+  requsetBindCompany 
 } from "@/apis/user";
+
 import {
   getToken,
   setToken,
@@ -36,6 +38,7 @@ import {
   getUserCompany,
 } from "@/utils/auth";
 import store from "..";
+
 const state = {
   token: getToken(),
   name: "",
@@ -50,8 +53,10 @@ const state = {
   private_field: get_private_field() || [],
   roleProcess: get_action_data() || [],
   currentCompany: getUserCompany(),
-  isSupertube: false
+  isSupertube: false,
+  companylist:[]
 };
+
 const mutations = {
   SET_TOKEN: (state, token) => {
     state.token = token;
@@ -107,6 +112,9 @@ const mutations = {
   setCurrentCompany(state,val){
     state.currentCompany = val;
   },
+  setCompanylist(state,val){
+    state.companylist = val
+  },
   setSupertube(state, val) {
     state.isSupertube = val;
   }
@@ -158,35 +166,59 @@ const actions = {
       if (!getToken()) {
         resolve("noToken");
       } else {
-        console.log(getToken())
         const { ucode, udata, umsg } = await getUserInfo();
-
         if (ucode >= 100 && ucode <= 104) {
           resolve("noToken");
         } else if (ucode !== 0) {
           resolve({ code: ucode, data: udata, massage: umsg });
         } else {
-          const { level, private_field, roleid } = udata;
-          console.log(private_field);
-        
-          // // 保存默认业务公司名称
-          // commit("business_company", business_company);
-          // // 保存默认业务公司编号
-          // commit("business_companyNo", business_companyNo);
+          const { level } = udata;
+          const isSupertube = level === '1';
+           //保存是否超管用户
+           commit("setSupertube", isSupertube);
+           
+           //获取公司列表(区分超管和普通账户api)
+           const api = isSupertube ? requsetSupertubeCompany : requsetBindCompany;
+           const { data: companyData, code: companyCode } = await api({})
+          
+           let _companylist = []
+           //保存公司列表:todo 两个接口返回值可能不同 需要转换
+           if(companyCode === 0) {
+            _companylist = isSupertube ? companyData.list : companyData.list
+            commit('setCompanylist', _companylist)
+           }
 
-          // 关键字段设置
-          commit("private_field", !private_field ? [] : private_field);
-          const { pcode, pdata, pmsg } = await getRoleProcess(roleid);
+           if(companyCode >= 100 && companyCode <= 104){
+             resolve("noToken")
+             return
+           }
 
-          if (pcode >= 100 && pcode <= 104) {
-            resolve("noToken");
-          } else if (pcode !== 0) {
-            resolve({ code: pcode, data: {}, massage: pmsg });
-          } else {
-            commit("roleProcess", pdata ?? []);
+          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_;
 
-          //保存是否超管用户
-            commit("setSupertube", level === '1');
+            //根据角色获取流程节点权限
+             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 ?? []);
+             }
+
+             //根据角色获取角色详情 获取关键字字段
+             const {} = await 
+          }
+          
+          //保存默认公司
+          commit('setCurrentCompany', _current_company_ ? _current_company_.companyCode : '')
+          
           //获取菜单
           const { mcode, mdata, mmsg } = await getRoleMenuList();
             if (mcode >= 100 && mcode <= 104) {
@@ -203,7 +235,6 @@ const actions = {
               initRouter(arrag, that);
               resolve(isok ? "success-dataV" : "success");
             }
-          }
         }
       }
     });
@@ -421,6 +452,10 @@ function initRouter(arr) {
   window.vm.$router.addRoutes(IndexRoute);
 }
 
+function getCompanylist(){
+  
+}
+
 initalUserInfo();
 
 export default {

src/utils/auth.js

@@ -1,149 +1,149 @@
-import Cookies from "js-cookie";
+import Cookies from 'js-cookie'
 
-const TokenKey = "Purchase-Console-Token";
-const MenuKey = "Purchase-Console-Menu";
-const BtnKey = "Purchase-Console-MenuBtn";
-const NoticeKey = "Purchase-Console-Notice";
-const mainMenuKey = "Purchase-Console-MainMenu";
-const businessCompanyKey = "Purchase-Console-businessCompany";
-const businessCompanyNoKey = "Purchase-Console-businessCompanyNo";
-const privateFieldKey = "Purchase-Console-privateField";
-const actionDataKey = "Purchase-Console-actionData";
-const roleLevelKey="Purchase-Console-roleLevel";
-const companyKey = "Purchase-Console-company";
+const TokenKey = 'Purchase-Console-Token'
+const MenuKey = 'Purchase-Console-Menu'
+const BtnKey = 'Purchase-Console-MenuBtn'
+const NoticeKey = 'Purchase-Console-Notice'
+const mainMenuKey = 'Purchase-Console-MainMenu'
+const businessCompanyKey = 'Purchase-Console-businessCompany'
+const businessCompanyNoKey = 'Purchase-Console-businessCompanyNo'
+const privateFieldKey = 'Purchase-Console-privateField'
+const actionDataKey = 'Purchase-Console-actionData'
+const roleLevelKey = 'Purchase-Console-roleLevel'
+const companyKey = 'Purchase-Console-company'
 
-export function setUserCompany(company){
-  return sessionStorage.setItem(companyKey,company);
+export function setUserCompany(company) {
+  return sessionStorage.setItem(companyKey, company)
 }
 
-export function removeUserCompany(){
+export function removeUserCompany() {
   return sessionStorage.removeItem(companyKey)
 }
 
-export function getUserCompany(){
-  return sessionStorage.getItem(companyKey) || ""
+export function getUserCompany() {
+  return sessionStorage.getItem(companyKey) || ''
 }
 
 export function getToken() {
-  return Cookies.get(TokenKey);
+  return Cookies.get(TokenKey)
 }
 
 export function setToken(token) {
-  return Cookies.set(TokenKey, token);
+  return Cookies.set(TokenKey, token)
 }
 
 export function removeToken() {
-  return Cookies.remove(TokenKey);
+  return Cookies.remove(TokenKey)
 }
 
 export function getMenu() {
-  const menu = Cookies.get(MenuKey);
+  const menu = Cookies.get(MenuKey)
   if (menu) {
-    return JSON.parse(menu);
+    return JSON.parse(menu)
   } else {
-    return [];
+    return []
   }
 }
 
 export function setMenu(menu) {
-  return Cookies.set(MenuKey, menu);
+  return Cookies.set(MenuKey, menu)
 }
 
 export function removeMenu() {
-  return Cookies.remove(MenuKey);
+  return Cookies.remove(MenuKey)
 }
 
 export function getBtn() {
-  return Cookies.get(BtnKey);
+  return Cookies.get(BtnKey)
 }
 
 export function setBtn(has) {
-  return Cookies.set(BtnKey, has);
+  return Cookies.set(BtnKey, has)
 }
 
 export function removeBtn() {
-  return Cookies.remove(BtnKey);
+  return Cookies.remove(BtnKey)
 }
 
 export function getNotice() {
-  return Cookies.get(NoticeKey);
+  return Cookies.get(NoticeKey)
 }
 
 export function setNotice(has) {
-  return Cookies.set(NoticeKey, has);
+  return Cookies.set(NoticeKey, has)
 }
 
 export function removeNotice() {
-  return Cookies.remove(NoticeKey);
+  return Cookies.remove(NoticeKey)
 }
 
 export function getMainList() {
-  return Cookies.get(mainMenuKey);
+  return Cookies.get(mainMenuKey)
 }
 
 export function setMainList(has) {
-  return Cookies.set(mainMenuKey, has);
+  return Cookies.set(mainMenuKey, has)
 }
 
 export function removeMainList() {
-  return Cookies.remove(mainMenuKey);
+  return Cookies.remove(mainMenuKey)
 }
 
 export function get_business_company() {
-  return Cookies.get(businessCompanyKey);
+  return Cookies.get(businessCompanyKey)
 }
 
 export function set_business_company(has) {
-  return Cookies.set(businessCompanyKey, has);
+  return Cookies.set(businessCompanyKey, has)
 }
 
 export function remove_business_company() {
-  return Cookies.remove(businessCompanyKey);
+  return Cookies.remove(businessCompanyKey)
 }
 export function get_business_companyNo() {
-  return Cookies.get(businessCompanyNoKey);
+  return Cookies.get(businessCompanyNoKey)
 }
 
 export function set_business_companyNo(has) {
-  return Cookies.set(businessCompanyNoKey, has);
+  return Cookies.set(businessCompanyNoKey, has)
 }
 
 export function remove_business_companyNo() {
-  return Cookies.remove(businessCompanyNoKey);
+  return Cookies.remove(businessCompanyNoKey)
 }
 
 export function get_private_field() {
-  return Cookies.get(privateFieldKey);
+  return Cookies.get(privateFieldKey)
 }
 
 export function set_private_field(has) {
-  return Cookies.set(privateFieldKey, has);
+  return Cookies.set(privateFieldKey, has)
 }
 
 export function remove_private_field() {
-  return Cookies.remove(privateFieldKey);
+  return Cookies.remove(privateFieldKey)
 }
 
 export function get_action_data() {
-  return Cookies.get(actionDataKey);
+  return Cookies.get(actionDataKey)
 }
 
 export function set_action_data(has) {
-  return Cookies.set(actionDataKey, has);
+  return Cookies.set(actionDataKey, has)
 }
 
 export function remove_action_data() {
-  return Cookies.remove(actionDataKey);
+  return Cookies.remove(actionDataKey)
 }
 
 export function get_role_level() {
-  return Cookies.get(roleLevelKey);
+  return Cookies.get(roleLevelKey)
 }
 
 export function set_role_level(has) {
-  return Cookies.set(roleLevelKey, has);
+  return Cookies.set(roleLevelKey, has)
 }
 
 export function remove_role_level() {
-  return Cookies.remove(roleLevelKey);
+  return Cookies.remove(roleLevelKey)
 }

src/utils/index.js

@@ -357,3 +357,11 @@ export function removeClass(ele, cls) {
     ele.className = ele.className.replace(reg, ' ')
   }
 }
+
+export function convertCompanylist(list) {
+  return list.map(({ companyName, companyCode, is_main }) => ({
+    code: companyCode,
+    name: companyName,
+    is_main
+  }))
+}

src/views/interest/account/addEdit.vue

@@ -36,7 +36,7 @@
                   />
                 </el-form-item>
               </el-col>
-              
+
               <el-col :span="24">
                 <el-form-item label="手机号" prop="mobile">
                   <el-input
@@ -47,14 +47,34 @@
                   />
                 </el-form-item>
               </el-col>
+
+              <el-col :span="24">
+                <el-form-item label="业务公司">
+                  <el-table size="mini" border :data="sitem && sitem.company_relaton ? sitem.company_relaton : []" max-height="300px">
+                    <el-table-column label="默认公司" width="70px">
+                      <template slot-scope="scope">
+                        <div style="display:flex;justify-content:center;width:100%">
+                          <i v-if="scope.row.is_main === '1'" class="el-icon-check" style="font-size:14px;font-weight:bold" />
+                        </div>
+                      </template>
+                    </el-table-column>
+                    <el-table-column label="公司编号" prop="companyCode" />
+                    <el-table-column label="公司名称" prop="companyName" />
+                  </el-table>
+                </el-form-item>
+              </el-col>
             </el-row>
           </el-form>
         </el-col>
         <el-col :span="6" class="bottom-btn">
-          <el-button v-if="!isDetail" type="primary" @click="submitForm" :size="'mini'"
-            >保 存
+          <el-button
+            v-if="!isDetail"
+            type="primary"
+            :size="'mini'"
+            @click="submitForm"
+          >保 存
           </el-button>
-          <el-button @click="showModelThis = false" :size="'mini'">{{
+          <el-button :size="'mini'" @click="showModelThis = false">{{
             isDetail ? "关 闭" : "取 消"
           }}</el-button>
         </el-col>
@@ -63,8 +83,8 @@
   </el-dialog>
 </template>
 <script>
-import asyncRequest from "@/apis/service/interest/account";
-import resToken from "@/mixins/resToken";
+import asyncRequest from '@/apis/service/interest/account'
+import resToken from '@/mixins/resToken'
 
 import {
   isnumber,
@@ -73,74 +93,75 @@ import {
   isAlphanumeric,
   isChinese,
   isEmoticon,
-  validAlphabets,
-} from "@/utils/validate";
+  validAlphabets
+} from '@/utils/validate'
 export default {
-  name: "Account",
-  props: ["showModel", "id", "isDetail"],
+  name: 'Account',
   mixins: [resToken],
+  props: ['showModel', 'id', 'isDetail', 'sitem'],
   data() {
     const validateusername = (rule, value, callback) => {
-      if (value === "") {
-        callback(new Error("账号不能为空！"));
+      if (value === '') {
+        callback(new Error('账号不能为空！'))
       } 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("账号规则为6~18位数字与字母组合！"));
+            callback(new Error('账号规则为6~18位数字与字母组合！'))
           } else if (validAlphabets(value)) {
-            callback(new Error("账号规则为6~18位数字与字母组合！"));
+            callback(new Error('账号规则为6~18位数字与字母组合！'))
           } else if (!isAlphanumeric(value)) {
-            callback(new Error("账号规则为6~18位数字与字母组合！"));
+            callback(new Error('账号规则为6~18位数字与字母组合！'))
           } else {
-            callback();
+            callback()
           }
         }
       }
-    };
+    }
 
     const validatename = (rule, value, callback) => {
-      if (value === "") {
-        callback(new Error("真实姓名不能为空！"));
+      if (value === '') {
+        callback(new Error('真实姓名不能为空！'))
       } else {
         if (value.length < 2 || value.length > 12) {
-          callback(new Error("真实姓名规则为2~12位！"));
+          callback(new Error('真实姓名规则为2~12位！'))
         } else {
           if (isEmoticon(value)) {
-            callback(new Error("真实姓名规则为2~12位！"));
+            callback(new Error('真实姓名规则为2~12位！'))
           } else {
-            callback();
+            callback()
           }
         }
       }
-    };
+    }
 
     const validatemobile = (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()
         }
       }
-    };
+    }
 
     return {
       roleList: [],
       loading: false,
-      title: "添加账号",
+      title: '添加账号',
       organizeList: [],
       showModelThis: this.showModel,
       coptions: [],
       is_mainoptions: [],
       isIndeterminate: false,
       ruleForm: {
-        nickname: "", // 真实姓名
-        mobile: "", //手机号
-        role_id: "", //角色id
+        nickname: '', // 真实姓名
+        mobile: '', // 手机号
+        role_id: '', // 角色id
+        company_relaton: []
       },
       platformoptions: [],
       rulesThis: this.rules,
@@ -149,205 +170,206 @@ export default {
           {
             required: true,
             validator: validatename,
-            trigger: "blur",
-          },
+            trigger: 'blur'
+          }
         ],
         mobile: [
           {
             required: true,
             validator: validatemobile,
-            trigger: "blur",
-          },
+            trigger: 'blur'
+          }
         ],
         role_id: [
           {
             required: true,
-            message: "请选择角色",
-            trigger: "change",
-          },
-        ],
-      },
-    };
+            message: '请选择角色',
+            trigger: 'change'
+          }
+        ]
+      }
+    }
   },
   watch: {
-    showModel: function (val) {
-      this.showModelThis = val;
+    showModel: function(val) {
+      this.showModelThis = val
       if (val) {
-        this.initForm();
+        this.initForm()
       }
     },
     showModelThis(val) {
       if (!val) {
-        this.$emit("cancel");
+        this.$emit('cancel')
       }
-    },
+    }
   },
   methods: {
     itemidChange(e) {
-      this.ruleForm.itemid = e;
-      this.$refs.ruleForm.validateField("itemid");
+      this.ruleForm.itemid = e
+      this.$refs.ruleForm.validateField('itemid')
     },
     async initForm() {
-      this.loading = true;
+      this.loading = true
 
-      if (this.id === "add") {
-        await this.resetForm();
+      if (this.id === 'add') {
+        await this.resetForm()
       } else {
-        await this.initData();
+        await this.initData()
       }
-      if (this.id === "add") {
-        this.title = "添加账号";
-        this.rulesThis = this.rules;
+      if (this.id === 'add') {
+        this.title = '添加账号'
+        this.rulesThis = this.rules
       } else {
         if (this.isDetail) {
-          this.title = "账号详情";
-          this.rulesThis = {};
+          this.title = '账号详情'
+          this.rulesThis = {}
         } else {
-          this.title = "修改账号";
-          this.rulesThis = this.rules;
+          this.title = '修改账号'
+          this.rulesThis = this.rules
         }
       }
-      this.loading = false;
+      this.loading = false
     },
 
     async getClist() {
-      this.organizeList = [];
+      this.organizeList = []
       const { code, data, message } = await asyncRequest.getClist({
-        size: 10000,
-      });
+        size: 10000
+      })
       if (code === 0) {
-        this.organizeList = data;
-        this.recursion(this.organizeList);
+        this.organizeList = data
+        this.recursion(this.organizeList)
       } else if (code >= 100 && code <= 104) {
-        await this.logout();
+        await this.logout()
       } else {
-        this.$message.warning(message);
+        this.$message.warning(message)
       }
     },
     handleCheckedCitiesChange(value) {
-      console.log(value);
-      let checkedCount = value.length;
-      this.ruleForm.is_all = checkedCount === this.coptions.length;
-      this.isIndeterminate = checkedCount > 0 && checkedCount < this.coptions.length;
+      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)) {
-          v.value = v.id + "";
-          v.label = v.name;
+          v.value = v.id + ''
+          v.label = v.name
           if (v.child.length === 0) {
-            delete v["child"];
+            delete v['child']
           } else {
-            this.recursion(v.child);
+            this.recursion(v.child)
           }
         }
-        return v;
-      });
+        return v
+      })
     },
     async getRole() {
       const model = {
-        status: "", // 状态
-        level: "", // 姓名
-        role_name: "",
-      };
-      const res = await asyncRequest.getRole(model);
+        status: '', // 状态
+        level: '', // 姓名
+        role_name: ''
+      }
+      const res = await asyncRequest.getRole(model)
       if (res && res.code === 0 && res.data) {
-        this.roleList = res.data;
+        this.roleList = res.data
         this.roleList.map((v1) => {
-          v1.id += "";
-          v1.status += "";
-          return v1;
-        });
+          v1.id += ''
+          v1.status += ''
+          return v1
+        })
       }
     },
     async initData() {
       const { code, data, message } = await asyncRequest.detail({
-        id: this.id,
-      });
+        id: this.id
+      })
       if (code === 0) {
-        await this.resetForm(data);
+        await this.resetForm(data)
       } else if (code >= 100 && code <= 104) {
-        await this.logout();
+        await this.logout()
       } else {
-        this.$message.warning(message);
+        this.$message.warning(message)
       }
     },
     async resetForm(sitem) {
       // 重置
       await this.$nextTick(() => {
         if (this.$refs.ruleForm) {
-          this.$refs.ruleForm.resetFields();
-          this.$refs.ruleForm.clearValidate();
+          this.$refs.ruleForm.resetFields()
+          this.$refs.ruleForm.clearValidate()
           if (sitem) {
             const {
+              company_relaton,
               nickname,
               mobile,
               id
-            } = sitem;
+            } = sitem
 
             this.ruleForm = {
               id,
-              nickname: nickname || "",
-              mobile: mobile || ""
-            };
-
+              mobile: mobile || '',
+              nickname: nickname || '',
+              company_relaton: company_relaton || []
+            }
           } else {
             this.ruleForm = {
-              nickname: "", // 真实姓名
-              mobile: ""
-            };
+              nickname: '', // 真实姓名
+              mobile: ''
+            }
           }
         }
-      });
+      })
     },
     async submitForm() {
-      await this.$refs.ruleForm.validate(async (valid) => {
+      await this.$refs.ruleForm.validate(async(valid) => {
         if (valid) {
           if (!this.loading) {
-            this.loading = true;
+            this.loading = true
             const {
               nickname,
               mobile,
               id
-            } = JSON.parse(JSON.stringify(this.ruleForm));
+            } = JSON.parse(JSON.stringify(this.ruleForm))
 
             const model = {
               nickname,
               mobile,
               id
-            };
+            }
 
-            let res = {};
-            if (this.id === "add") {
-              delete model["id"];
-              res = await asyncRequest.add(model);
+            let res = {}
+            if (this.id === 'add') {
+              delete model['id']
+              res = await asyncRequest.add(model)
             } else {
-              res = await asyncRequest.update(model);
+              res = await asyncRequest.update(model)
             }
-            this.loading = false;
+            this.loading = false
             if (res && res.code === 0) {
-              const title = this.id === "add" ? "添加成功" : "修改成功";
+              const title = this.id === 'add' ? '添加成功' : '修改成功'
               this.$notify.success({
                 title,
-                message: "",
-              });
-              this.showModelThis = false;
+                message: ''
+              })
+              this.showModelThis = false
               // 刷新
-              this.$emit("refresh");
+              this.$emit('refresh')
             } else if (res && res.code >= 100 && res.code <= 104) {
-              await this.logout();
+              await this.logout()
             } else {
-              this.$message.warning(res.message);
+              this.$message.warning(res.message)
             }
           }
         } else {
-          console.log("error submit!!");
-          return false;
+          console.log('error submit!!')
+          return false
         }
-      });
-    },
-  },
-};
+      })
+    }
+  }
+}
 </script>
 
 <style lang="scss" scoped>

src/views/interest/account/index.vue

@@ -50,9 +50,9 @@
                 <el-col :span="4" style="width: 150px; padding: 0 0 0 10px">
                   <el-input
                     :size="searchSize"
-                    v-model="parmValue.name"
+                    v-model="parmValue.nickname"
                     :maxlength="40"
-                    placeholder="业务员姓名"
+                    placeholder="真实姓名"
                   />
                 </el-col>
                 <el-col :span="4" style="width: 160px; padding: 0 0 0 10px">
@@ -241,7 +241,7 @@ export default {
       isDetail: false,
       modelId: 0,
       parmValue: {
-        name: "", // 业务员名字
+        nickname: "", // 业务员名字
         username: "", // 账号
         status: "", //
         page: 1, // 页码
@@ -321,7 +321,7 @@ export default {
   methods: {
     restSearch() {
       this.parmValue = {
-        name: "", // 业务员名字
+        nickname: "", // 业务员名字
         username: "", // 账号
         status: "", //
         page: 1, // 页码

src/views/interest/account/resetPassword.vue

@@ -61,130 +61,130 @@
   </el-dialog>
 </template>
 <script>
-import asyncRequest from "@/apis/service/interest/account";
-import { isnumber, isAlphanumeric, validAlphabets } from "@/utils/validate";
-import resToken from "@/mixins/resToken";
+import asyncRequest from '@/apis/service/interest/account'
+import { isnumber, isAlphanumeric, validAlphabets } from '@/utils/validate'
+import resToken from '@/mixins/resToken'
 export default {
-  name: "Account",
-  props: ["showModel", "id", "isDetail"],
+  name: 'Account',
   mixins: [resToken],
+  props: ['showModel', 'id', 'isDetail'],
   data() {
     const validateNewPassword = (rule, value, callback) => {
-      if (value === "") {
-        callback(new Error("新密码不能为空！"));
+      if (value === '') {
+        callback(new Error('新密码不能为空！'))
       } else {
         if (!isAlphanumeric(value)) {
-          callback(new Error("新密码为6-16位数字字母组合！"));
+          callback(new Error('新密码为6-16位数字字母组合！'))
         } else if (value.length < 6 || value.length > 16) {
-          callback(new Error("新密码为6-16位数字字母组合！"));
+          callback(new Error('新密码为6-16位数字字母组合！'))
         } else if (isnumber(value)) {
-          callback(new Error("新密码不能为纯数字！"));
+          callback(new Error('新密码不能为纯数字！'))
         } else if (validAlphabets(value)) {
-          callback(new Error("新密码不能为纯字母！"));
+          callback(new Error('新密码不能为纯字母！'))
         } else {
-          callback();
+          callback()
         }
       }
-    };
+    }
     const validateConfirmPassword = (rule, value, callback) => {
-      if (value === "") {
-        callback(new Error("确认密码不能为空！"));
+      if (value === '') {
+        callback(new Error('确认密码不能为空！'))
       } else {
         if (this.ruleForm.password !== value) {
-          callback(new Error("确认密码与新密码不一致！"));
+          callback(new Error('确认密码与新密码不一致！'))
         } else {
-          callback();
+          callback()
         }
       }
-    };
+    }
     return {
       roleList: [],
       loading: false,
-      title: "重置密码",
+      title: '重置密码',
       showModelThis: this.showModel,
       ruleForm: {
         id: this.id,
-        password: "",
-        confirmPassword: "",
+        password: '',
+        confirmPassword: ''
       },
       rulesThis: this.rules,
       rules: {
         password: [
-          { required: true, trigger: "blur", validator: validateNewPassword },
+          { required: true, trigger: 'blur', validator: validateNewPassword }
         ],
         confirmPassword: [
           {
             required: true,
-            trigger: "blur",
-            validator: validateConfirmPassword,
-          },
-        ],
-      },
-    };
+            trigger: 'blur',
+            validator: validateConfirmPassword
+          }
+        ]
+      }
+    }
   },
   watch: {
-    showModel: function (val) {
-      this.showModelThis = val;
+    showModel: function(val) {
+      this.showModelThis = val
       if (val) {
-        this.initForm();
+        this.initForm()
       }
     },
     showModelThis(val) {
       if (!val) {
-        this.$emit("cancel");
+        this.$emit('cancel')
       }
-    },
+    }
   },
   methods: {
     async initForm() {
-      this.rulesThis = this.rules;
-      await this.resetForm();
+      this.rulesThis = this.rules
+      await this.resetForm()
     },
 
     async resetForm() {
       // 重置
       await this.$nextTick(() => {
         if (this.$refs.ruleForm) {
-          this.$refs.ruleForm.resetFields();
-          this.$refs.ruleForm.clearValidate();
+          this.$refs.ruleForm.resetFields()
+          this.$refs.ruleForm.clearValidate()
           this.ruleForm = {
             id: this.id,
-            password: "",
-            confirmPassword: "",
-          };
+            password: '',
+            confirmPassword: ''
+          }
         }
-      });
+      })
     },
     async submitForm() {
-      await this.$refs.ruleForm.validate(async (valid) => {
+      await this.$refs.ruleForm.validate(async(valid) => {
         if (valid) {
           if (!this.loading) {
-            this.loading = true;
-            const obj = JSON.parse(JSON.stringify(this.ruleForm));
-            const res = await asyncRequest.setpwd(obj);
-            this.loading = false;
+            this.loading = true
+            const obj = JSON.parse(JSON.stringify(this.ruleForm))
+            const res = await asyncRequest.setpwd(obj)
+            this.loading = false
             if (res && res.code === 0) {
               this.$notify.success({
-                title: "密码修改成功！",
-                message: "",
-              });
-              this.showModelThis = false;
+                title: '密码修改成功！',
+                message: ''
+              })
+              this.showModelThis = false
               // 刷新
-              this.$emit("refresh");
+              this.$emit('refresh')
             } else if (res && res.code >= 100 && res.code <= 104) {
-              await this.logout();
+              await this.logout()
             } else {
-              this.$message.warning(res.message);
+              this.$message.warning(res.message)
             }
           }
         } else {
-          console.log("error submit!!");
-          return false;
+          console.log('error submit!!')
+          return false
         }
-      });
-    },
-  },
-};
+      })
+    }
+  }
+}
 </script>
 
    <style lang="scss" scoped>

src/views/interest/accountQuery/addEdit.vue

@@ -0,0 +1,294 @@
+<template>
+  <el-dialog
+    v-loading="loading"
+    :title="title"
+    :center="true"
+    align="left"
+    top="10vh"
+    width="750px"
+    :close-on-click-modal="false"
+    :visible.sync="showModelThis"
+    element-loading-text="拼命加载中"
+    element-loading-spinner="el-icon-loading"
+    element-loading-background="rgba(0, 0, 0, 0.8)"
+    @close="showModelThis = false"
+  >
+    <el-card style="margin-top: -20px">
+      <el-row :gutter="10">
+        <el-col :span="24">
+          <el-form
+            ref="ruleForm"
+            :model="ruleForm"
+            status-icon
+            :size="'mini'"
+            :rules="rulesThis"
+            label-width="80px"
+            class="demo-ruleForm"
+          >
+            <el-row style="margin-bottom:20px">
+              <el-col :span="24">
+                <el-form-item label="真实姓名" prop="nickname">
+                  <el-input
+                    v-model="ruleForm.nickname"
+                    :placeholder="'真实姓名'"
+                    :disabled="isDetail"
+                    maxlength="100"
+                  />
+                </el-form-item>
+              </el-col>
+
+              <el-col :span="24">
+                <el-form-item label="手机号" prop="mobile">
+                  <el-input
+                    v-model="ruleForm.mobile"
+                    :placeholder="'手机号'"
+                    maxlength="11"
+                    :disabled="isDetail"
+                  />
+                </el-form-item>
+              </el-col>
+
+              <el-col :span="24">
+                <el-form-item label="角色">
+                  <el-radio-group v-model="ruleForm.roleid">
+                    <el-radio v-for="role in rolelist" :key="role.id" :label="role.id">{{ role.role_name }}</el-radio>
+                  </el-radio-group>
+                </el-form-item>
+              </el-col>
+            </el-row>
+          </el-form>
+        </el-col>
+
+        <el-col :span="6" class="bottom-btn">
+          <el-button
+            v-if="!isDetail"
+            type="primary"
+            :size="'mini'"
+            @click="submitForm"
+          >保 存
+          </el-button>
+          <el-button :size="'mini'" @click="showModelThis = false">{{
+            isDetail ? "关 闭" : "取 消"
+          }}</el-button>
+        </el-col>
+
+      </el-row>
+    </el-card>
+  </el-dialog>
+</template>
+<script>
+import asyncRequest from '@/apis/service/interest/accountQuery'
+import resToken from '@/mixins/resToken'
+
+export default {
+  name: 'Account',
+  mixins: [resToken],
+  props: ['showModel', 'id', 'isDetail', 'sitem'],
+  data() {
+    return {
+      loading: false,
+      title: '添加账号',
+      organizeList: [],
+      showModelThis: this.showModel,
+      coptions: [],
+      is_mainoptions: [],
+      isIndeterminate: false,
+      ruleForm: {
+        nickname: '',
+        mobile: '',
+        roleid: '', // 角色id
+        account_id: ''
+      },
+      rolelist: [],
+      platformoptions: [],
+      rulesThis: this.rules,
+      rules: {
+        roleid: [
+          {
+            required: true,
+            message: '请选择角色',
+            trigger: 'change'
+          }
+        ]
+      }
+    }
+  },
+  watch: {
+    showModel: function(val) {
+      this.showModelThis = val
+      if (val) {
+        this.initForm()
+      }
+    },
+    showModelThis(val) {
+      if (!val) {
+        this.$emit('cancel')
+      }
+    }
+  },
+  methods: {
+    itemidChange(e) {
+      this.ruleForm.itemid = e
+      this.$refs.ruleForm.validateField('itemid')
+    },
+    async getRoleWithCompany(companyNo) {
+      const { data } = await asyncRequest.rolelist({ companyNo, size: 100 })
+      this.rolelist = data.list
+    },
+
+    async initForm() {
+      this.loading = true
+
+      if (this.id === 'add') {
+        await this.resetForm()
+      } else {
+        await this.initData()
+      }
+      if (this.id === 'add') {
+        this.title = '添加账号'
+        this.rulesThis = this.rules
+      } else {
+        if (this.isDetail) {
+          this.title = '账号详情'
+          this.rulesThis = {}
+        } else {
+          this.title = '修改账号'
+          this.rulesThis = this.rules
+        }
+      }
+      this.loading = false
+    },
+
+    async getClist() {
+      this.organizeList = []
+      const { code, data, message } = await asyncRequest.getClist({
+        size: 10000
+      })
+      if (code === 0) {
+        this.organizeList = data
+        this.recursion(this.organizeList)
+      } else if (code >= 100 && code <= 104) {
+        await this.logout()
+      } else {
+        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)) {
+          v.value = v.id + ''
+          v.label = v.name
+          if (v.child.length === 0) {
+            delete v['child']
+          } else {
+            this.recursion(v.child)
+          }
+        }
+        return v
+      })
+    },
+    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)
+      }
+    },
+    async resetForm(sitem) {
+      // 重置
+      await this.$nextTick(() => {
+        if (this.$refs.ruleForm) {
+          this.$refs.ruleForm.resetFields()
+          this.$refs.ruleForm.clearValidate()
+          if (sitem) {
+            const {
+              account_id, companyCode, nickname, mobile, roleid
+            } = sitem
+
+            this.ruleForm = {
+              account_id, companyCode, nickname, mobile, roleid
+            }
+          } else {
+            this.ruleForm = {
+              nickname: '',
+              mobile: '',
+              roleid: '', // 角色id
+              account_id: ''
+            }
+          }
+        }
+      })
+    },
+    async submitForm() {
+      await this.$refs.ruleForm.validate(async(valid) => {
+        if (valid) {
+          if (!this.loading) {
+            this.loading = true
+            const {
+              roleid,
+              account_id,
+              companyCode
+            } = JSON.parse(JSON.stringify(this.ruleForm))
+
+            const model = {
+              roleid,
+              account_id,
+              companyNo: companyCode
+            }
+
+            let res = {}
+            if (this.id === 'add') {
+              delete model['id']
+              res = await asyncRequest.add(model)
+            } else {
+              res = await asyncRequest.update(model)
+            }
+            this.loading = false
+            if (res && res.code === 0) {
+              const title = this.id === 'add' ? '添加成功' : '修改成功'
+              this.$notify.success({
+                title,
+                message: ''
+              })
+              this.showModelThis = false
+              // 刷新
+              this.$emit('refresh')
+            } else if (res && res.code >= 100 && res.code <= 104) {
+              await this.logout()
+            } else {
+              this.$message.warning(res.message)
+            }
+          }
+        } else {
+          console.log('error submit!!')
+          return false
+        }
+      })
+    }
+  }
+}
+</script>
+
+<style lang="scss" scoped>
+.account {
+  .bottom-btn {
+    position: absolute;
+    bottom: 0px;
+    right: 0;
+    text-align: right;
+    z-index: 2;
+  }
+}
+</style>

src/views/interest/accountQuery/index.vue

@@ -0,0 +1,385 @@
+<template>
+  <div class="account pagePadding">
+    <div v-if=" powers.some((i) => i == '001')">
+      <ex-table
+        v-loading="loading"
+        :table="table"
+        :data="tableData"
+        :columns="columns"
+        :page="pageInfo"
+        :size="size"
+        @page-curr-change="handlePageChange"
+        @page-size-change="handleSizeChange"
+        @screen-reset="
+          pageInfo.curr = 1;
+          parmValue.page = 1;
+          searchList();
+        "
+        @screen-submit="
+          pageInfo.curr = 1;
+          parmValue.page = 1;
+          searchList();
+        "
+      >
+        <template #table-header="{}">
+          <div style="width: 100%">
+            <el-row style="padding: 0 0 0 80px">
+              <el-col :span="24">
+                <el-col :span="4" style="width: 120px">
+                  <el-select
+                    :size="searchSize"
+                    v-model="parmValue.status"
+                    filterable
+                    clearable
+                    placeholder="账号状态"
+                    style="width: 100%"
+                    @change="
+                      pageInfo.curr = 1;
+                      parmValue.page = 1;
+                      searchList();
+                    "
+                  >
+                    <el-option
+                      v-for="item in statusList"
+                      :key="'status' + item.code"
+                      :label="item.name"
+                      :value="item.code"
+                    />
+                  </el-select>
+                </el-col>
+                <!-- <el-col :span="4" style="width: 150px; padding: 0 0 0 10px">
+                  <el-input
+                    :size="searchSize"
+                    v-model="parmValue.nickname"
+                    :maxlength="40"
+                    placeholder="真实姓名"
+                  />
+                </el-col>
+                <el-col :span="4" style="width: 160px; padding: 0 0 0 10px">
+                  <el-input
+                    :size="searchSize"
+                    v-model="parmValue.username"
+                    :maxlength="40"
+                    placeholder="手机号"
+                  />
+                </el-col> -->
+                <el-col :span="4" style="width: 54px">
+                  <el-button
+                    :size="searchSize"
+                    type="primary"
+                    class="fr"
+                    icon="el-icon-search"
+                    @click="searchList"
+                /></el-col>
+                <el-col :span="4" style="width: 66px">
+                  <el-button
+                    type="warning"
+                    class="fr"
+                    :size="searchSize"
+                    @click="restSearch"
+                  >
+                    重置
+                  </el-button>
+                </el-col>
+                <el-col :span="3" style="width: 66px; float: right">
+                  <el-button
+                    :size="searchSize"
+                    type="primary"
+                    style="float: right; margin-left: 5px"
+                    @click="searchList"
+                  >
+                    刷新
+                  </el-button>
+                </el-col>
+              </el-col>
+            </el-row>
+          </div>
+        </template>
+
+        <template #depart_info="{ scope }">
+          <el-tag
+            style="margin: 0 3px 0 0"
+            :size="tablebtnSize"
+            type="''"
+            v-for="(ditem, dindex) in scope.row.depart_info"
+            :key="ditem + dindex"
+          >
+            <span v-for="(cItem, cindex) in ditem" :key="cItem + dindex + cindex">
+              <span v-show="cindex > 0">/</span><span>{{ cItem }}</span>
+            </span>
+            {{ ditem.name }}</el-tag
+          >
+        </template>
+        <template #status="{ scope }">
+          <el-tag
+            :size="tablebtnSize"
+            :type="scope.row.status == '0' ? 'warning' : ''"
+            v-text="
+              (statusOptions.find((item) => item.id == String(scope.row.account_status)) || {}).label ||
+              '--'
+            "
+          ></el-tag>
+        </template>
+        <template #operation="{ scope }">
+          <el-tooltip
+            v-if="powers.some((i) => i == '007')"
+            effect="dark"
+            content="详情"
+            placement="top"
+          >
+            <i
+              class="el-icon-view tb-icon"
+              @click="openModal(scope.row.id, true, scope.row)"
+            ></i>
+          </el-tooltip>
+
+          <el-tooltip
+            v-if="powers.some((i) => i == '005')"
+            effect="dark"
+            content="修改"
+            placement="top"
+          >
+            <i
+              class="el-icon-edit tb-icon"
+              @click="openModal(scope.row.id, false, scope.row)"
+            ></i>
+          </el-tooltip>
+        </template>
+      </ex-table>
+      <add-edit
+        :id="modelId"
+        :sitem="sitem"
+        :show-model="showModel"
+        :is-detail="isDetail"
+        @refresh="searchList"
+        @cancel="showModel = false"
+      />
+    </div>
+    <div v-else>
+      <no-auth></no-auth>
+    </div>
+  </div>
+</template>
+<script>
+import mixinPage from "@/mixins/elPaginationHandle";
+import asyncRequest from "@/apis/service/interest/accountQuery";
+import addEdit from "./addEdit";
+import { statusList } from "@/assets/js/statusList";
+import { mapGetters } from "vuex";
+import resToken from "@/mixins/resToken";
+import companyHelper from "@/mixins/companyHelper";
+
+export default {
+  name: "Account",
+  components: {
+    addEdit
+  },
+  mixins: [mixinPage, resToken, companyHelper],
+  computed: {
+    ...mapGetters(["tablebtnSize", "searchSize", "size"]),
+    powers() {
+      const { btnList } = this.$store.getters;
+      const tran = btnList.find((i) => i.menu_route == "account") || {};
+      const { action } = tran ?? {};
+      return action ?? [];
+    },
+  },
+  data() {
+    return {
+      sitem: null,
+      // 状态
+      statusOptions: [
+        { id: "0", label: "禁用" },
+        { id: "1", label: "启用" },
+      ],
+      statusList: statusList,
+      loading: true,
+      showModel: false,
+      isDetail: false,
+      modelId: 0,
+      parmValue: {
+        page: 1, // 页码
+        size: 15, // 每页显示条数
+      },
+      tableData: [],
+      passwordModel: false,
+      passwordModelId: 0,
+      isPasswordDetail: false,
+      // 表格 - 数据
+      tableData: [],
+      // 表格 - 参数
+      table: {
+        stripe: true,
+        border: true,
+        _defaultHeader_: ["setcol"],
+      },
+      // 表格 - 分页
+      pageInfo: {
+        size: 15,
+        curr: 1,
+        total: 0,
+      },
+      // 表格 - 列参数
+      columns: [
+        {
+          prop: "username",
+          label: "手机号",
+          // width: "110px",
+        },
+        {
+          prop: "nickname",
+          label: "真实姓名",
+          // width: "110px",
+        },
+        {
+          prop: "role_name",
+          label: "角色名称",
+          width: "110px",
+        },
+        {
+          prop: "companyCode",
+          label: "公司编码",
+          // width: "80px",
+        },
+        {
+          prop: "companyName",
+          label: "公司名称",
+        },
+        {
+          prop: "account_status",
+          label: "状态",
+          _slot_: "status",
+          width: "70px",
+        },
+        {
+          prop: "addtime",
+          label: "创建时间",
+          sortable: true,
+          // width: "140px",
+        },
+        {
+          prop: "",
+          label: "操作",
+          fixed: "right",
+          _noset_: true,
+          width: "80px",
+          _slot_: "operation",
+        },
+      ],
+    };
+  },
+  mounted() {
+    this.searchList();
+  },
+  methods: {
+    restSearch() {
+      this.parmValue = {
+        nickname: "", // 业务员名字
+        username: "", // 账号
+        status: "", //
+        page: 1, // 页码
+        size: 15, // 每页显示条数
+      };
+      // 表格 - 分页
+      this.pageInfo = {
+        size: 15,
+        curr: 1,
+        total: 0,
+      };
+      this.searchList();
+    },
+
+    openModal(id, isDetail, sitem) {
+      this.showModel = true;
+      this.modelId = id;
+      this.isDetail = isDetail;
+      this.sitem = sitem;
+    },
+
+    openPasswordModal(id, isDetail) {
+      this.passwordModel = true;
+      this.passwordModelId = id;
+      this.isPasswordDetail = isDetail;
+    },
+
+    async deleteById(id, status) {
+      await this.$confirm("确定要删除？", {
+        confirmButtonText: "确定",
+        cancelButtonText: "取消",
+        type: "warning",
+      })
+        .then(async () => {
+          const model = {
+            id: id,
+            status: status + '' === "1" ? "0" : "1",
+          };
+          const res = await asyncRequest.status(model);
+          if (res && res.code === 0) {
+            this.$notify.success({
+              title: "删除成功",
+              message: "",
+            });
+            this.searchList();
+          } else if (res && res.code >= 100 && res.code <= 104) {
+            await this.logout();
+          } else {
+            this.$message.warning(res.message);
+          }
+        })
+        .catch(() => {
+          console.log("取消");
+        });
+    },
+    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;
+        this.pageInfo.total = Number(res.data.count);
+      } else if (res && res.code >= 100 && res.code <= 104) {
+        await this.logout();
+      } else {
+        this.tableData = [];
+        this.pageInfo.total = 0;
+      }
+      this.loading = false;
+    },
+    async statusConfirm(id, status) {
+      await this.$confirm(`确定要改为${status + '' === "1" ? "禁用" : "启用"}？`, {
+        confirmButtonText: "确定",
+        cancelButtonText: "取消",
+        type: "warning",
+      })
+        .then(async () => {
+          this.loading = true;
+          const model = {
+            id: id,
+            status: status + '' === "1" ? "0" : "1",
+          };
+          
+          const res = await asyncRequest.status(model);
+          if (res && res.code === 0) {
+            this.loading = false;
+            this.$notify.success({
+              title: "状态修改成功！",
+              message: "",
+            });
+            await this.searchList();
+          } else if (res && res.code >= 100 && res.code <= 104) {
+            await this.logout();
+          } else {
+            this.$message.warning(res.message);
+          }
+        })
+        .catch(() => {
+          console.log("取消");
+        });
+    },
+  },
+};
+</script>
+<style lang="scss" scoped>
+.account {}
+</style>

src/views/interest/role/addEdit.vue

@@ -34,8 +34,8 @@
               />
             </el-form-item>
           </el-col>
-          
-         <el-col :span="12">
+
+          <el-col :span="12">
             <el-form-item
               label="关键字段权限"
               prop="private_field"
@@ -46,14 +46,14 @@
                 :disabled="isDetail"
                 placeholder="关键字段权限"
               >
-                <el-checkbox :label="1" :key="1">成本价</el-checkbox>
-                <el-checkbox :label="2" :key="2">销售价</el-checkbox>
-                <el-checkbox :label="3" :key="3">毛利率</el-checkbox>
+                <el-checkbox :key="1" label="1">成本价</el-checkbox>
+                <el-checkbox :key="2" label="2">销售价</el-checkbox>
+                <el-checkbox :key="3" label="3">毛利率</el-checkbox>
               </el-checkbox-group>
             </el-form-item>
           </el-col>
 
-          <el-col :span="6">
+          <!-- <el-col :span="6">
             <el-form-item label="角色等级" prop="level">
               <el-select
                 v-model="ruleForm.level"
@@ -70,11 +70,11 @@
                 />
               </el-select>
             </el-form-item>
-          </el-col>
-          
+          </el-col> -->
+
           <el-col :span="12">
             <el-form-item label="是否允许查看价格" label-width="130px">
-              <el-select placeholder="是否允许查看价格" v-model="ruleForm.is_allow_see_price">
+              <el-select v-model="ruleForm.is_allow_see_price" :disabled="isDetail" placeholder="是否允许查看价格">
                 <el-option value="1" label="允许" />
                 <el-option value="0" label="不允许" />
               </el-select>
@@ -83,8 +83,7 @@
 
           <div class="quanxian-main">
             <div class="quanxian-title">
-              <span style="color: #ff8888">*</span
-              ><span
+              <span style="color: #ff8888">*</span><span
                 style="
                   font-size: 14px;
                   color: #606266;
@@ -92,8 +91,7 @@
                   padding: 0 12px 0 0;
                   font-weight: 700;
                 "
-                >功能权限</span
-              >
+              >功能权限</span>
             </div>
             <div class="rule-view">
               <div class="rule-list">
@@ -111,9 +109,9 @@
                     </div>
                     <div class="fbody">
                       <div
-                        class="fbody-item"
                         v-for="(subItem, subIndex) in item.child"
                         :key="'yemian' + subItem.id + subIndex"
+                        class="fbody-item"
                       >
                         <template
                           v-if="
@@ -128,28 +126,27 @@
                           <div class="stitle">
                             <span class="_h2">{{ subItem.menu_name }}</span>
                             <el-radio-group
-                              style="margin: 0 0 0 20px"
-                              size="mini"
-                              :disabled="isDetail"
                               v-if="
                                 subItem &&
-                                subItem.private &&
-                                subItem.private.length === 2
+                                  subItem.private &&
+                                  subItem.private.length === 2
                               "
                               v-model="subItem.is_private_change"
+                              style="margin: 0 0 0 20px"
+                              size="mini"
+                              :disabled="isDetail"
                             >
                               <el-radio-button
-                                :disabled="isDetail"
                                 v-for="(radioN, ri) in subItem.private"
                                 :key="radioN.label + ri"
+                                :disabled="isDetail"
                                 :label="String(radioN.id)"
-                                >{{ radioN.label }}</el-radio-button
-                              >
+                              >{{ radioN.label }}</el-radio-button>
                             </el-radio-group>
                           </div>
                           <div
-                            class="scheck"
                             v-if="subItem.action && subItem.action.length > 0"
+                            class="scheck"
                           >
                             <div class="checkAll">
                               <el-checkbox
@@ -164,8 +161,7 @@
                                     subIndex
                                   )
                                 "
-                                >功能全选</el-checkbox
-                              >
+                              >功能全选</el-checkbox>
                             </div>
                             <div class="checkItem">
                               <el-checkbox-group
@@ -182,8 +178,8 @@
                               >
                                 <template v-for="children in subItem.action">
                                   <el-checkbox
-                                    :disabled="isDetail"
                                     :key="'checkItem' + children.id"
+                                    :disabled="isDetail"
                                     :label="String(children.id)"
                                     @change="
                                       handleCheckedChange(
@@ -194,18 +190,17 @@
                                         item
                                       )
                                     "
-                                    >{{ children.action_name }}</el-checkbox
-                                  >
+                                  >{{ children.action_name }}</el-checkbox>
                                 </template>
                               </el-checkbox-group>
                             </div>
                           </div>
                           <div
-                            class="sfield"
                             v-if="
                               subItem.action_data &&
-                              subItem.action_data.length > 0
+                                subItem.action_data.length > 0
                             "
+                            class="sfield"
                           >
                             <div class="checkAll">
                               <el-checkbox
@@ -220,8 +215,7 @@
                                     subIndex
                                   )
                                 "
-                                >字段全选</el-checkbox
-                              >
+                              >字段全选</el-checkbox>
                             </div>
                             <div class="checkItem">
                               <el-checkbox-group
@@ -252,8 +246,7 @@
                                         item
                                       )
                                     "
-                                    >{{ children.field_name }}</el-checkbox
-                                  >
+                                  >{{ children.field_name }}</el-checkbox>
                                 </template>
                               </el-checkbox-group>
                             </div>
@@ -273,9 +266,9 @@
             type="primary"
             :size="'mini'"
             @click="submitForm"
-            >保 存
+          >保 存
           </el-button>
-          <el-button @click="showModelThis = false" :size="'mini'">{{
+          <el-button :size="'mini'" @click="showModelThis = false">{{
             isDetail ? "关 闭" : "取 消"
           }}</el-button>
         </el-col>
@@ -284,48 +277,48 @@
   </el-dialog>
 </template>
 <script>
-import asyncRequest from "@/apis/service/interest/role";
-import roleLevel from "@/assets/js/roleLevel";
-import { isChinese, isEmoticon } from "@/utils/validate";
-import resToken from "@/mixins/resToken";
-import { mapState } from "vuex";
+import asyncRequest from '@/apis/service/interest/role'
+import roleLevel from '@/assets/js/roleLevel'
+import { isChinese, isEmoticon } from '@/utils/validate'
+import resToken from '@/mixins/resToken'
+import { mapState } from 'vuex'
 export default {
-  name: "Role",
-  props: ["showModel", "id", "isDetail"],
+  name: 'Role',
   mixins: [resToken],
+  props: ['showModel', 'id', 'isDetail'],
   data() {
     const validatename = (rule, value, callback) => {
-      if (value === "") {
-        callback(new Error("角色名称不能为空！"));
+      if (value === '') {
+        callback(new Error('角色名称不能为空！'))
       } else {
         if (value.lenght < 2 || value.lenght > 10) {
-          callback(new Error("角色名称规则为2~10位汉字！"));
+          callback(new Error('角色名称规则为2~10位汉字！'))
         } else if (!isChinese(value)) {
-          callback(new Error("角色名称规则为2~10位汉字！"));
+          callback(new Error('角色名称规则为2~10位汉字！'))
         } else if (isEmoticon(value)) {
-          callback(new Error("角色名称规则为2~10位汉字！"));
+          callback(new Error('角色名称规则为2~10位汉字！'))
         } else {
-          callback();
+          callback()
         }
       }
-    };
+    }
     return {
       loading: false,
-      title: "添加角色",
-      private_data: [], //私有数据菜单ID
+      title: '添加角色',
+      private_data: [], // 私有数据菜单ID
       showModelThis: this.showModel,
       roleLevel: roleLevel,
       ruleForm: {
-        role_name: "",
-        level: "1",
+        role_name: '',
+        level: '1',
         private_field: [],
-        is_allow_see_price: ""
+        is_allow_see_price: ''
       },
       action_data: [], // 字段数据
       action: [], // 功能数据
       // 当前角色
       roleActive: {
-        rules: [],
+        rules: []
       },
       // 角色列表
       roleList: [],
@@ -337,24 +330,24 @@ export default {
       rules: {
         private_field: [
           {
-            type: "array",
+            type: 'array',
             required: true,
-            message: "请选择关键字段权限",
-            trigger: "change",
-          },
+            message: '请选择关键字段权限',
+            trigger: 'change'
+          }
         ],
         role_name: [
           {
             required: true,
             validator: validatename,
-            trigger: "blur",
-          },
-        ],
-        level: [
-          { required: true, message: "请选择角色等级", trigger: "change" },
-        ],
-      },
-    };
+            trigger: 'blur'
+          }
+        ]
+        // level: [
+        //   { required: true, message: '请选择角色等级', trigger: 'change' }
+        // ]
+      }
+    }
   },
   computed: {
     ...mapState({
@@ -366,17 +359,17 @@ export default {
         const selectItemLength = item.action.filter(
           (filitem) =>
             item.checkList.findIndex((finditem) => String(finditem) === String(filitem.id)) > -1
-        ).length;
+        ).length
         // 未选中子节点的数量
         const noSlectItemLength = item.action.filter(
           (filitem) =>
             item.checkList.findIndex((finditem) => String(finditem) === String(filitem.id)) ==
             -1
-        ).length;
+        ).length
         // // 当前节点的index
         // 存在选中子节点且存在未选中子节点为中间态
-        return selectItemLength > 0 && noSlectItemLength > 0;
-      };
+        return selectItemLength > 0 && noSlectItemLength > 0
+      }
     },
     indeterminateField() {
       return (item) => {
@@ -384,62 +377,62 @@ export default {
         const selectItemLength = item.action_data.filter(
           (filitem) =>
             item.fieldList.findIndex((finditem) => String(finditem) === String(filitem.id)) > -1
-        ).length;
+        ).length
         // 未选中子节点的数量
         const noSlectItemLength = item.action_data.filter(
           (filitem) =>
             item.fieldList.findIndex((finditem) => String(finditem) === String(filitem.id)) ==
             -1
-        ).length;
+        ).length
         // // 当前节点的index
         // 存在选中子节点且存在未选中子节点为中间态
-        return selectItemLength > 0 && noSlectItemLength > 0;
-      };
-    },
+        return selectItemLength > 0 && noSlectItemLength > 0
+      }
+    }
   },
   watch: {
-    showModel:function (val) {
-      this.showModelThis = val;
+    showModel: function(val) {
+      this.showModelThis = val
       if (val) {
-        this.initForm();
+        this.initForm()
       }
     },
     showModelThis(val) {
       if (!val) {
-        this.$emit("cancel");
+        this.$emit('cancel')
       }
-    },
+    }
   },
   methods: {
     // 全选/全不选
     handleCheckAllChange(checkAll, index, item, subIndex) {
-      this.actionList[index].child[subIndex].checkAll = checkAll;
-      this.$set(this.actionList, index, item);
+      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) => String(findItem) === String(element.id));
+        ].checkList.findIndex((findItem) => String(findItem) === String(element.id))
         if (checkAll && findindex == -1) {
-          this.actionList[index].child[subIndex].checkList.push(String(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);
+          this.actionList[index].child[subIndex].checkList.splice(findindex, 1)
         }
-      });
+      })
     },
     // 全选/全不选
     handleFieldAllChange(fieldAll, index, item, subIndex) {
-      this.actionList[index].child[subIndex].fieldAll = fieldAll;
-      this.$set(this.actionList, index, item);
+      this.actionList[index].child[subIndex].fieldAll = fieldAll
+      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) => String(findItem) === String(element.id));
+        ].fieldList.findIndex((findItem) => String(findItem) === String(element.id))
         if (fieldAll && findindex == -1) {
-          this.actionList[index].child[subIndex].fieldList.push(String(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);
+          this.actionList[index].child[subIndex].fieldList.splice(findindex, 1)
         }
-      });
+      })
     },
     // 复选框组内的选中/不选中
     handleCheckedGroupChange(event, index, item, subIndex) {
@@ -450,8 +443,8 @@ export default {
           this.actionList[index].child[subIndex].checkList.findIndex(
             (finditem) => String(finditem) === String(evitem.id)
           ) > -1
-      );
-      this.$set(this.actionList, index, item);
+      )
+      this.$set(this.actionList, index, item)
     },
     // 复选框组内的选中/不选中
     handleFieldGroupChange(event, index, item, subIndex) {
@@ -462,8 +455,8 @@ export default {
           this.actionList[index].child[subIndex].fieldList.findIndex(
             (finditem) => String(finditem) === String(evitem.id)
           ) > -1
-      );
-      this.$set(this.actionList, index, item);
+      )
+      this.$set(this.actionList, index, item)
     },
 
     // 单项复选框选中/不选中
@@ -473,17 +466,17 @@ export default {
       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.push(id)
       } else {
         const find = this.actionList[index].child[subIndex].checkList.findIndex(
           (e) => String(e) == String(id)
-        );
+        )
         if (find > -1) {
-          this.actionList[index].child[subIndex].checkList.splice(find, 1);
+          this.actionList[index].child[subIndex].checkList.splice(find, 1)
         }
-        this.actionList[index].child[subIndex].checkAll = false;
+        this.actionList[index].child[subIndex].checkAll = false
       }
-      this.$set(this.actionList, index, item);
+      this.$set(this.actionList, index, item)
     },
     // 单项复选框选中/不选中
     handleFieldChange(checked, id, index, subIndex, item) {
@@ -491,210 +484,211 @@ export default {
       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.push(id)
       } else {
         const find = this.actionList[index].child[subIndex].fieldList.findIndex(
           (e) => e == id
-        );
+        )
         if (find > -1) {
-          this.actionList[index].child[subIndex].fieldList.splice(find, 1);
+          this.actionList[index].child[subIndex].fieldList.splice(find, 1)
         }
-        this.actionList[index].child[subIndex].fieldAll = false;
+        this.actionList[index].child[subIndex].fieldAll = false
       }
-      this.$set(this.actionList, index, item);
+      this.$set(this.actionList, index, item)
       // console.log(this.actionList[index].child[subIndex]);
     },
 
     async initForm() {
-      this.loading = true;
-      if (this.id === "add") {
-        this.title = "添加角色";
+      this.loading = true
+      if (this.id === 'add') {
+        this.title = '添加角色'
         // this.ruleForm.isAdmin = 0;
-        this.rulesThis = this.rules;
-        await this.resetForm();
-        await this.initActionList();
-        this.loading = false;
+        this.rulesThis = this.rules
+        await this.resetForm()
+        await this.initActionList()
+        this.loading = false
       } else {
         if (this.isDetail) {
-          this.title = "角色";
-          this.rulesThis = {};
+          this.title = '角色'
+          this.rulesThis = {}
         } else {
-          this.title = "修改角色";
-          this.rulesThis = this.rules;
+          this.title = '修改角色'
+          this.rulesThis = this.rules
         }
-        await this.resetForm();
-        await this.initActionList();
-        await this.initData();
-        this.loading = false;
+        await this.resetForm()
+        await this.initActionList()
+        await this.initData()
+        this.loading = false
       }
     },
     async initData() {
-      const res = await asyncRequest.detail({ roleid: this.id });
+      const res = await asyncRequest.detail({ roleid: this.id })
       if (res && res.code === 0 && res.data) {
-        let resD = res.data;
-        console.log(resD)
+        const resD = res.data
+
+        resD.private_field = !resD.private_field ? [] : resD.private_field.split(',')
 
-        resD.private_field =
-          resD.private_field === "" ? [] : resD.private_field;
-        this.ruleForm = resD;
+        this.ruleForm = resD
+
+        console.log(this.ruleForm)
 
         if (resD.action && resD.action.length > 0) {
-          this.action = resD.action;
+          this.action = resD.action
         } else {
-          this.action = [];
+          this.action = []
         }
         if (resD.action_data && resD.action_data.length > 0) {
-          this.action_data = resD.action_data;
+          this.action_data = resD.action_data
         } else {
-          this.action_data = [];
+          this.action_data = []
         }
-        if (resD.private_data === "") {
-          resD.private_data = [];
+        if (resD.private_data === '') {
+          resD.private_data = []
         }
         if (resD.private_data && resD.private_data.length > 0) {
-          this.private_data = resD.private_data;
+          this.private_data = resD.private_data
         } else {
-          this.private_data = [];
+          this.private_data = []
         }
 
-        this.ruleForm.is_allow_see_price = String(resD.is_allow_see_price);
+        this.ruleForm.is_allow_see_price = String(resD.is_allow_see_price)
 
-        const arr = JSON.parse(JSON.stringify(this.actionList));
+        const arr = JSON.parse(JSON.stringify(this.actionList))
         arr.map((x) => {
           if (x.child && x.child.length > 0) {
             x.child.map((y) => {
               if (y.action && y.action.length > 0) {
                 y.action.map((z) => {
-                  const Aindex = this.action.findIndex((a) => String(a) === String(z.id));
+                  const Aindex = this.action.findIndex((a) => String(a) === String(z.id))
                   if (Aindex !== -1) {
-                    y.checkList.push(this.action[Aindex]);
+                    y.checkList.push(this.action[Aindex])
                   }
-                  return z;
-                });
+                  return z
+                })
                 if (y.action.length === y.checkList.length) {
-                  y.checkAll = true;
+                  y.checkAll = true
                 }
               }
               if (y.action_data && y.action_data.length > 0) {
                 y.action_data.map((z) => {
-                  const Bindex = this.action_data.findIndex((a) => String(a) === String(z.id));
+                  const Bindex = this.action_data.findIndex((a) => String(a) === String(z.id))
                   if (Bindex !== -1) {
-                    y.fieldList.push(this.action_data[Bindex]);
+                    y.fieldList.push(this.action_data[Bindex])
                   }
-                  return z;
-                });
+                  return z
+                })
                 if (y.action_data.length === y.fieldList.length) {
-                  y.fieldAll = true;
+                  y.fieldAll = true
                 }
               }
               if (y.private && y.private.length === 2) {
-                let Cindex = this.private_data.findIndex((a) => String(a) === String(y.id));
+                const Cindex = this.private_data.findIndex((a) => String(a) === String(y.id))
                 if (Cindex !== -1) {
-                  y.is_private_change = "1";
+                  y.is_private_change = '1'
                 } else {
-                  y.is_private_change = "0";
+                  y.is_private_change = '0'
                 }
               } else {
-                y.is_private_change = "0";
+                y.is_private_change = '0'
               }
-              return y;
-            });
+              return y
+            })
           }
-          return x;
-        });
+          return x
+        })
 
-        if(!this.ruleForm.private_field) this.ruleForm.private_field = []
+        if (!this.ruleForm.private_field) this.ruleForm.private_field = []
 
-        this.actionList = arr;
+        this.actionList = arr
       } else if (res && res.code >= 100 && res.code <= 104) {
-        await this.logout();
+        await this.logout()
       } else {
-        this.$message.warning(res.message);
+        this.$message.warning(res.message)
       }
     },
     async initActionList() {
-      const res = await asyncRequest.actionList({});
+      const res = await asyncRequest.actionList({})
       if (res && res.code === 0) {
-        const list = res.data;
-        let arr = list.filter((item) => item.child && item.child.length > 0);
+        const list = res.data
+        let arr = list.filter((item) => item.child && item.child.length > 0)
         arr = arr.map((x) => {
           x.child.map((y) => {
-            y.checkAll = false;
-            y.checkList = [];
-            y.fieldAll = false;
-            y.fieldList = [];
-            y.is_private_change = "0";
-            if (y.is_private === "0") {
-              y.private = [];
+            y.checkAll = false
+            y.checkList = []
+            y.fieldAll = false
+            y.fieldList = []
+            y.is_private_change = '0'
+            if (y.is_private === '0') {
+              y.private = []
             } else {
               y.private = [
                 {
-                  id: "0",
-                  label: "公有数据",
+                  id: '0',
+                  label: '公有数据'
                 },
                 {
-                  id: "1",
-                  label: "私有数据",
-                },
-              ];
+                  id: '1',
+                  label: '私有数据'
+                }
+              ]
             }
-            return y;
-          });
-          return x;
-        });
+            return y
+          })
+          return x
+        })
 
-        this.actionList = arr;
+        this.actionList = arr
       } else if (res && res.code >= 100 && res.code <= 104) {
-        await this.logout();
+        await this.logout()
       } else {
-        this.$message.warning(res.message);
+        this.$message.warning(res.message)
       }
     },
     async resetForm() {
       // 重置
       await this.$nextTick(() => {
         if (this.$refs.ruleForm) {
-          this.$refs.ruleForm.resetFields();
-          this.$refs.ruleForm.clearValidate();
-          
+          this.$refs.ruleForm.resetFields()
+          this.$refs.ruleForm.clearValidate()
+
           this.ruleForm = {
-            role_name: "",
+            role_name: '',
             private_field: [],
-            is_allow_see_price: "",
-            level: "1",
-          };
+            is_allow_see_price: '',
+            level: '1'
+          }
         }
-      });
+      })
     },
     async submitForm() {
-      if(!this.currentCompany){
-        this.$message.warning('请在右上角选择一家公司');
+      if (!this.currentCompany) {
+        this.$message.warning('请在右上角选择一家公司')
         return
       }
 
-      await this.$refs.ruleForm.validate(async (valid) => {
+      await this.$refs.ruleForm.validate(async(valid) => {
         if (valid) {
           if (this.loading) {
-            return;
+            return
           }
-          this.action_data = []; // 字段数据
-          this.action = []; // 功能数据
-          let arr = [];
+          this.action_data = [] // 字段数据
+          this.action = [] // 功能数据
+          const arr = []
           this.actionList.forEach((x) => {
             x.child.forEach((y) => {
-              this.action_data.push(...y.fieldList);
-              this.action.push(...y.checkList);
-              if (y.is_private_change === "1") {
-                arr.push(y.id);
+              this.action_data.push(...y.fieldList)
+              this.action.push(...y.checkList)
+              if (y.is_private_change === '1') {
+                arr.push(y.id)
               }
-            });
-          });
+            })
+          })
           // this.action_data.length === 0 ||和字段
           if (this.action.length === 0) {
-            this.$message.warning("请选择功能!");
+            this.$message.warning('请选择功能!')
           } else {
-            this.loading = true;
-            
+            this.loading = true
+
             const model = {
               roleid: this.id,
               role_name: this.ruleForm.role_name,
@@ -705,43 +699,42 @@ export default {
               action: this.action,
               action_data: this.action_data,
               private_data: arr,
-              is_allow_see_price:this.ruleForm.is_allow_see_price
-            };
-
+              is_allow_see_price: this.ruleForm.is_allow_see_price
+            }
 
-            let res = {};
-            if (this.id === "add") {
-              delete model["roleid"];
-              model.companyNo = this.currentCompany;
-              res = await asyncRequest.add(model);
+            let res = {}
+            if (this.id === 'add') {
+              delete model['roleid']
+              model.companyNo = this.currentCompany
+              res = await asyncRequest.add(model)
             } else {
-              model.companyNo = this.ruleForm.companyNo;
-              res = await asyncRequest.update(model);
+              model.companyNo = this.ruleForm.companyNo
+              res = await asyncRequest.update(model)
             }
-            this.loading = false;
+            this.loading = false
             if (res && res.code === 0) {
-              const title = this.id === "add" ? "添加成功" : "修改成功";
+              const title = this.id === 'add' ? '添加成功' : '修改成功'
               this.$notify.success({
                 title,
-                message: "",
-              });
-              this.showModelThis = false;
+                message: ''
+              })
+              this.showModelThis = false
               // 刷新
-              this.$emit("refresh");
+              this.$emit('refresh')
             } else if (res && res.code >= 100 && res.code <= 104) {
-              await this.logout();
+              await this.logout()
             } else {
-              this.$message.warning(res.message);
+              this.$message.warning(res.message)
             }
           }
         } else {
-          console.log("error submit!!");
-          return false;
+          console.log('error submit!!')
+          return false
         }
-      });
-    },
-  },
-};
+      })
+    }
+  }
+}
 </script>
 
    <style lang="scss" scoped>

src/views/interest/role/index.vue

@@ -45,28 +45,6 @@
                   />
                 </el-select>
               </el-col>
-
-              <el-col :span="3" style="width: 130px; padding: 0 0 0 10px">
-                <el-select
-                  :size="searchSize"
-                  v-model="parmValue.level"
-                  filterable
-                  placeholder="角色等级"
-                  style="width: 100%"
-                  @change="
-                    pageInfo.curr = 1;
-                    parmValue.page = 1;
-                    searchList();
-                  "
-                >
-                  <el-option
-                    v-for="item in roleLevel"
-                    :key="'ruleid' + item.code"
-                    :label="item.name"
-                    :value="item.code"
-                  />
-                </el-select>
-              </el-col>
               <el-col :span="3" style="width: 150px; padding: 0 0 0 10px">
                 <el-input
                   :size="searchSize"
@@ -169,6 +147,7 @@
       </template>
     </ex-table>
     <no-auth v-else></no-auth>
+
     <!-- 弹窗 新增/修改 -->
     <add-edit
       :id="modelId"
@@ -225,10 +204,10 @@ export default {
         { id: 1, label: "启用" }
       ],
       // 角色等级
-      authOptions: [
-        { id: "1", label: "管理员" },
-        { id: "2", label: "非管理员" }
-      ],
+      // authOptions: [
+      //   { id: "2", label: "管理员" },
+      //   { id: "3", label: "专员" }
+      // ],
       // 表格 - 数据
       tableData: [],
       // 表格 - 参数
@@ -249,17 +228,17 @@ export default {
           prop: "role_name",
           label: "角色名称"
         },
-        {
-          prop: "level",
-          label: "角色等级",
-          _format_: d => {
-            return (
-              this.authOptions.find(item => {
-                return item.id == d.level;
-              }) || {}
-            ).label;
-          }
-        },
+        // {
+        //   prop: "level",
+        //   label: "角色等级",
+        //   _format_: d => {
+        //     return (
+        //       this.authOptions.find(item => {
+        //         return item.id == d.level;
+        //       }) || {}
+        //     ).label;
+        //   }
+        // },
         {
           prop: "companyNo",
           label: "公司编号"
@@ -312,7 +291,7 @@ export default {
     },
     // 新建/编辑/详情
     openModal(id, isDetail) {
-      if (!this.currentCompany) {
+      if (!this.currentCompany && !isDetail) {
         this.$message.warning("请在右上角选择一家公司");
         return;
       }
@@ -358,10 +337,6 @@ export default {
         });
     },
 
-    *getFullData() {
-      console.log(11);
-    },
-
     // 刷新表格
     async searchList() {
       this.loading = true;

src/views/system/menuOperator/addEdit.vue

@@ -51,7 +51,7 @@
               </el-select>
             </el-form-item>
             <el-row>
-              <el-col :span="12" v-if="level < 3">
+              <el-col v-if="level < 3" :span="12">
                 <el-form-item label="路由：" prop="route">
                   <el-input
                     v-model="ruleForm.route"
@@ -61,7 +61,7 @@
                   />
                 </el-form-item>
               </el-col>
-              <el-col :span="12" v-if="level < 3">
+              <el-col v-if="level < 3" :span="12">
                 <el-form-item label="图标：" prop="img">
                   <el-row :gutter="10">
                     <el-col v-if="ruleForm.img" :span="3" style="width: 45px">
@@ -122,8 +122,8 @@
               </el-col>
               <el-col :span="12">
                 <el-form-item
-                  label="页面状态："
                   v-if="level < 3"
+                  label="页面状态："
                   prop="is_display"
                 >
                   <el-radio
@@ -150,7 +150,7 @@
                   <el-input
                     v-model.number="ruleForm.weight"
                     type="number"
-                      maxlength="10"
+                    maxlength="10"
                     :disabled="isDetail"
                   />
                 </el-col>
@@ -185,30 +185,30 @@
 </template>
 
 <script>
-import asyncRequest from "@/apis/service/system/menu";
-import btnList from "@/assets/js/btnList";
-import iconDialog from "@/views/system/menuOperator/iconDialog";
-import resToken from "@/mixins/resToken";
+import asyncRequest from '@/apis/service/system/menu'
+import btnList from '@/assets/js/btnList'
+import iconDialog from '@/views/system/menuOperator/iconDialog'
+import resToken from '@/mixins/resToken'
 export default {
   components: {
-    iconDialog,
+    iconDialog
   },
   mixins: [resToken],
   props: [
-    "showModel",
-    "id",
-    "isDetail",
-    "parentIds",
-    "level",
-    "isAdd",
-    "type",
-    "formData",
+    'showModel',
+    'id',
+    'isDetail',
+    'parentIds',
+    'level',
+    'isAdd',
+    'type',
+    'formData'
   ],
   data() {
     return {
       loading: false,
       showIconModel: false,
-      title: "",
+      title: '',
       btnList,
       showModelThis: this.showModel,
       ruleForm: {},
@@ -217,159 +217,159 @@ export default {
         name: [
           {
             required: true,
-            message: "请输入名称",
-            trigger: "blur",
+            message: '请输入名称',
+            trigger: 'blur'
           },
           {
             min: 1,
             max: 50,
-            message: "长度在 1 到 50 个字符",
-            trigger: "blur",
-          },
+            message: '长度在 1 到 50 个字符',
+            trigger: 'blur'
+          }
         ],
         code: [
           {
             required: true,
-            message: "请输入按钮标识编码（用于判断按钮是否显示）",
-            trigger: "change",
-          },
+            message: '请输入按钮标识编码（用于判断按钮是否显示）',
+            trigger: 'change'
+          }
         ],
         level: [
           {
             required: true,
-            message: "请选择菜单等级",
-            trigger: "change",
-          },
+            message: '请选择菜单等级',
+            trigger: 'change'
+          }
         ],
         img: [
           {
             required: true,
-            message: "请选择图标",
-            trigger: "blur",
-          },
+            message: '请选择图标',
+            trigger: 'blur'
+          }
         ],
         route: [
           {
             required: true,
-            message: "请输入路由",
-            trigger: "blur",
+            message: '请输入路由',
+            trigger: 'blur'
           },
           {
             min: 1,
             max: 50,
-            message: "长度在 1 到 50 个字符",
-            trigger: "blur",
-          },
+            message: '长度在 1 到 50 个字符',
+            trigger: 'blur'
+          }
         ],
         component: [
           {
             required: true,
-            message: "请输入页面组件路径",
-            trigger: "blur",
+            message: '请输入页面组件路径',
+            trigger: 'blur'
           },
           {
             min: 1,
             max: 100,
-            message: "长度在 1 到 100 个字符",
-            trigger: "blur",
-          },
+            message: '长度在 1 到 100 个字符',
+            trigger: 'blur'
+          }
         ],
         weight: [
           {
             required: true,
-            message: "请输入权重，数值越大排名越靠前",
-            trigger: "blur",
-          },
+            message: '请输入权重，数值越大排名越靠前',
+            trigger: 'blur'
+          }
         ],
         is_show: [
           {
             required: true,
-            message: "请选择状态",
-            trigger: "change",
-          },
+            message: '请选择状态',
+            trigger: 'change'
+          }
         ],
         is_display: [
           {
             required: true,
-            message: "请选择页面状态",
-            trigger: "change",
-          },
-        ],
-      },
-    };
+            message: '请选择页面状态',
+            trigger: 'change'
+          }
+        ]
+      }
+    }
   },
   watch: {
-    showModel: function (val) {
-      this.showModelThis = val;
+    showModel: function(val) {
+      this.showModelThis = val
       if (val) {
-        this.initForm();
+        this.initForm()
       }
     },
     showModelThis(val) {
       if (!val) {
-        this.$emit("cancel");
+        this.$emit('cancel')
       }
-    },
+    }
   },
   methods: {
     codeChange(code) {
       for (let i = 0; i < this.btnList.length; i++) {
         if (this.btnList[i].code === code) {
-          this.ruleForm.name = this.btnList[i].name;
-          break;
+          this.ruleForm.name = this.btnList[i].name
+          break
         }
       }
     },
     setVal(val) {
-      this.ruleForm.img = val;
-      this.$refs.ruleForm.validateField("img");
+      this.ruleForm.img = val
+      this.$refs.ruleForm.validateField('img')
     },
     async initForm() {
       if (this.isAdd) {
         if (this.level === 1) {
-          this.title = "添加一级菜单";
+          this.title = '添加一级菜单'
         } else if (this.level === 2) {
-          this.title = "添加二级菜单";
+          this.title = '添加二级菜单'
         } else {
-          this.title = "添加按钮";
+          this.title = '添加按钮'
         }
-        this.loading = false;
-        this.rulesThis = this.rules;
-        await this.resetForm();
+        this.loading = false
+        this.rulesThis = this.rules
+        await this.resetForm()
       } else {
         if (this.isDetail) {
           if (this.level === 1) {
-            this.title = "一级菜单详情";
+            this.title = '一级菜单详情'
           } else if (this.level === 2) {
-            this.title = "二级菜单详情";
+            this.title = '二级菜单详情'
           } else {
-            this.title = "按钮详情";
+            this.title = '按钮详情'
           }
-          this.rulesThis = {};
+          this.rulesThis = {}
         } else {
           if (this.level === 1) {
-            this.title = "修改一级菜单";
+            this.title = '修改一级菜单'
           } else if (this.level === 2) {
-            this.title = "修改二级菜单";
+            this.title = '修改二级菜单'
           } else {
-            this.title = "修改按钮";
+            this.title = '修改按钮'
           }
-          this.rulesThis = this.rules;
+          this.rulesThis = this.rules
         }
-        await this.initData();
+        await this.initData()
       }
     },
     async initData() {
-      this.loading = true;
-      let parentIds = "";
+      this.loading = true
+      let parentIds = ''
       if (this.isAdd) {
         if (this.id === 0) {
-          parentIds = "0";
+          parentIds = '0'
         } else {
-          parentIds = this.parentIds;
+          parentIds = this.parentIds
         }
       } else {
-        parentIds = this.parentIds;
+        parentIds = this.parentIds
       }
       const {
         menu_name,
@@ -384,93 +384,93 @@ export default {
         action_code,
         is_display,
         level
-      } = this.formData;
+      } = this.formData
 
       if (this.level !== 3) {
         // 重置
         this.ruleForm = {
-          parentId: this.id + "", // 父级ID（一级为0）
-          parentIds: parentIds + "", // 所有父级编号（用逗号分隔）
-          name: menu_name + "", // 名称
-          code: "", // 编码（用于按钮是否显示）
-          img: menu_img + "", // 图标（导航图标）
-          route: menu_route + "", // 路由
-          component: this.level === 1 ? "" : menu_url + "", // 页面组件
-          menuCategory: 1 + "", // 菜单类别（1.导航菜单 2.按钮）
-          type: this.type + "", // 类型（1.运营菜单 2.物业菜单）
-          is_show: is_show + "", // 状态（1启用 0禁用）
-          is_display: is_display + "",
-          weight: parseInt(weight + ""), // 权重，越大越靠前
-          level:String(level)
-        };
+          parentId: this.id + '', // 父级ID（一级为0）
+          parentIds: parentIds + '', // 所有父级编号（用逗号分隔）
+          name: menu_name + '', // 名称
+          code: '', // 编码（用于按钮是否显示）
+          img: menu_img + '', // 图标（导航图标）
+          route: menu_route + '', // 路由
+          component: this.level === 1 ? '' : menu_url + '', // 页面组件
+          menuCategory: 1 + '', // 菜单类别（1.导航菜单 2.按钮）
+          type: this.type + '', // 类型（1.运营菜单 2.物业菜单）
+          is_show: is_show + '', // 状态（1启用 0禁用）
+          is_display: is_display + '',
+          weight: parseInt(weight + ''), // 权重，越大越靠前
+          level: String(level)
+        }
         if (this.level === 1) {
-          delete this.ruleForm["parentIds"];
+          delete this.ruleForm['parentIds']
         }
       } else {
         this.ruleForm = {
-          parentId: this.id + "", // 父级ID（一级为0）
-          parentIds: menuid + "", // 所有父级编号（用逗号分隔）
-          name: action_name + "", // 名称
-          code: action_code + "", // 编码（用于按钮是否显示）
-          img: "", // 图标（导航图标）
-          route: "", // 路由
-          component: "", // 页面组件
-          menuCategory: 2 + "", // 菜单类别（1.导航菜单 2.按钮）
-          type: this.type + "", // 类型（1.运营菜单 2.物业菜单）
-          is_show: status + "", // 状态（1启用 0禁用）
-          weight: 1 + "", // 权重，越大越靠前
-        };
+          parentId: this.id + '', // 父级ID（一级为0）
+          parentIds: menuid + '', // 所有父级编号（用逗号分隔）
+          name: action_name + '', // 名称
+          code: action_code + '', // 编码（用于按钮是否显示）
+          img: '', // 图标（导航图标）
+          route: '', // 路由
+          component: '', // 页面组件
+          menuCategory: 2 + '', // 菜单类别（1.导航菜单 2.按钮）
+          type: this.type + '', // 类型（1.运营菜单 2.物业菜单）
+          is_show: status + '', // 状态（1启用 0禁用）
+          weight: 1 + '' // 权重，越大越靠前
+        }
       }
-      this.loading = false;
+      this.loading = false
       await this.$nextTick(() => {
         if (this.$refs.ruleForm) {
-          this.$refs.ruleForm.clearValidate();
+          this.$refs.ruleForm.clearValidate()
         }
-      });
+      })
     },
     async resetForm() {
-      let parentIds = "";
+      let parentIds = ''
       if (this.isAdd) {
         if (this.id === 0) {
-          parentIds = "0";
+          parentIds = '0'
         } else {
-          parentIds = this.parentIds;
+          parentIds = this.parentIds
         }
       } else {
-        parentIds = this.parentIds;
+        parentIds = this.parentIds
       }
 
       // 重置
       this.ruleForm = {
         parentId: this.id, // 父级ID（一级为0）
         parentIds, // 所有父级编号（用逗号分隔）
-        name: "", // 名称
-        code: "", // 编码（用于按钮是否显示）
-        img: "", // 图标（导航图标）
-        route: "", // 路由
-        component: "", // 页面组件
+        name: '', // 名称
+        code: '', // 编码（用于按钮是否显示）
+        img: '', // 图标（导航图标）
+        route: '', // 路由
+        component: '', // 页面组件
         menuCategory: this.level < 3 ? 1 : 2, // 菜单类别（1.导航菜单 2.按钮）
-        type: this.type + "", // 类型（1.运营菜单 2.物业菜单）
-        is_show: "1", // 状态（1启用 0禁用）
-        is_display: "1", // 页面状态（1显示 0隐藏）
-        weight: 1, // 权重，越大越靠前
-      };
+        type: this.type + '', // 类型（1.运营菜单 2.物业菜单）
+        is_show: '1', // 状态（1启用 0禁用）
+        is_display: '1', // 页面状态（1显示 0隐藏）
+        weight: 1 // 权重，越大越靠前
+      }
       await this.$nextTick(() => {
         if (this.$refs.ruleForm) {
-          this.$refs.ruleForm.clearValidate();
+          this.$refs.ruleForm.clearValidate()
         }
-      });
+      })
     },
     async submitForm() {
       if (this.loading) {
-        return false;
+        return false
       }
-      this.loading = true;
+      this.loading = true
 
-      await this.$refs.ruleForm.validate(async (valid) => {
+      await this.$refs.ruleForm.validate(async(valid) => {
         if (valid) {
-          let model = {};
-          let res = {};
+          let model = {}
+          let res = {}
           const {
             name,
             img,
@@ -481,13 +481,14 @@ export default {
             component,
             code,
             level
-          } = this.ruleForm;
+          } = this.ruleForm
 
           model = {
             id: this.id,
             pid: this.parentIds,
             menuid: this.parentIds,
             action_name: name,
+            name,
             img: img,
             is_show: is_show,
             weight: weight,
@@ -497,70 +498,71 @@ export default {
             action_code: code,
             status: is_show,
             level
-          };
+          }
 
           if (this.level === 1) {
-            delete model["pid"];
-            delete model["menuid"];
-            delete model["url"];
-            delete model["action_code"];
-            delete model["status"];
-            delete modael['action_name']
+            delete model['pid']
+            delete model['menuid']
+            delete model['url']
+            delete model['action_code']
+            delete model['action_name']
+            delete model['status']
           } else if (this.level === 2) {
-            delete model["menuid"];
-            delete model["action_code"];
-            delete modael['action_name']
-            delete model["status"];
+            delete model['menuid']
+            delete model['action_code']
+            delete model['action_name']
+            delete model['status']
           } else {
-            delete model["pid"];
-            delete model["img"];
-            delete model["is_show"];
-            delete model["weight"];
-            delete model["route"];
-            delete model["is_display"];
-            delete model["url"];
+            delete model['pid']
+            delete model['img']
+            delete model['is_show']
+            delete model['weight']
+            delete model['route']
+            delete model['is_display']
+            delete model['url']
+            delete model['name']
           }
 
           if (this.isAdd) {
-            delete model["id"];
+            delete model['id']
           }
-          
+
           if (this.level < 3) {
-            res = await asyncRequest.update(model);
+            res = await asyncRequest.update(model)
           } else {
             if (this.isAdd) {
-              res = await asyncRequest.actionadd(model);
+              res = await asyncRequest.actionadd(model)
             } else {
-              res = await asyncRequest.actionedit(model);
+              res = await asyncRequest.actionedit(model)
             }
           }
-          this.loading = false;
+          this.loading = false
           if (res && res.code === 0) {
-            this.ruleForm = {};
-            const title = this.isAdd ? "添加成功" : "修改成功";
+            this.ruleForm = {}
+            const title = this.isAdd ? '添加成功' : '修改成功'
             this.$notify.success({
               title,
-              message: "",
-            });
-            this.showModelThis = false;
-            let pids = this.parentIds;
+              message: ''
+            })
+            this.showModelThis = false
+            let pids = this.parentIds
             if (this.id === 0) {
-              pids = "0";
+              pids = '0'
             }
-            this.$emit("refresh", this.id, pids, this.level);
+            this.$emit('refresh', this.id, pids, this.level)
           } else if (res && res.code >= 100 && res.code <= 104) {
-            await this.logout();
+            await this.logout()
           } else {
-            this.$message.warning(res.message);
+            this.$message.warning(res.message)
           }
         } else {
-          this.loading = false;
-          return false;
+          this.loading = false
+          return false
         }
-      });
-    },
-  },
-};
+      })
+    }
+  }
+}
 </script>
 
 <style lang="scss" scoped>

src/views/system/operationAccount/index.vue

@@ -50,9 +50,9 @@
                 <el-col :span="4" style="width: 150px; padding: 0 0 0 10px">
                   <el-input
                     :size="searchSize"
-                    v-model="parmValue.name"
+                    v-model="parmValue.nickname"
                     :maxlength="40"
-                    placeholder="业务员姓名"
+                    placeholder="真实姓名"
                   />
                 </el-col>
                 <el-col :span="4" style="width: 160px; padding: 0 0 0 10px">
@@ -239,7 +239,7 @@ export default {
       isDetail: false,
       modelId: 0,
       parmValue: {
-        name: "", // 业务员名字
+        nickname: "", // 业务员名字
         username: "", // 账号
         status: "", //
         page: 1, // 页码
@@ -292,7 +292,7 @@ export default {
           label: "操作",
           fixed: "right",
           _noset_: true,
-          width: "80px",
+          width: "60px",
           _slot_: "operation",
         },
       ],
@@ -304,7 +304,7 @@ export default {
   methods: {
     restSearch() {
       this.parmValue = {
-        name: "", // 业务员名字
+        nickname: "", // 真实姓名
         username: "", // 账号
         status: "", //
         page: 1, // 页码