Merge branch 'ISV' of http://gitlab.roboming.com/Simon/mingPay-web into ISV

src/components/pages/PaymentManagement/PaymentManagementHome.vue

@@ -36,6 +36,7 @@ export default {
     }
   },
   created () {
+    console.log(this.$store.state.menuList, 11111)
     this.defaultSelectedKeys = this.$route.name
     this.chooseMenuList = this.$route.name
     if (this.$store.state.menuList.indexOf('3100') > -1) {

src/components/pages/rightsManagement/addOrRights.vue

@@ -161,6 +161,7 @@ export default {
           $http.post(`/admin/manager/modifyFullRole`, data).then(res => {
             if (res.data.code === 0) {
               this.$message.success('保存成功')
+              this.$router.push({ name: 'rightsManagement' })
             } else {
               this.$message.error(res.data.msg)
             }

src/components/pages/rightsManagement/rightsManagement.vue

@@ -67,6 +67,7 @@ export default {
       }, {
         title: '拥有该角色的员工',
         dataIndex: 'userHasRoles',
+        width: '30%',
         scopedSlots: { customRender: 'userHasRoles' }
       }, {
         title: '创建时间',
@@ -132,8 +133,8 @@ export default {
     addRole (obj) {
       // console.log(obj, 111)
       // this.chooseMenuList = obj.key
-      if (this.roleList.length > 10) {
-        this.$message.err('最多可添加十个角色')
+      if (this.roleList.length > 9) {
+        this.$message.error('最多可添加十个角色')
       } else {
         this.$router.push({ name: 'addOrRights' })
       }