Merge branch 'crm15.0'

src/views/system_manage/enAuthManage.vue

@@ -126,7 +126,7 @@
           <span>部门/组织：{{setAuthData.DepartmentGroup}}</span>
         </div>
         <div class="select-list">
-          <el-checkbox :indeterminate="isIndeterminate" v-model="checkAll" @change="handleCheckAllChange">全选</el-checkbox>
+          <el-checkbox :indeterminate="isIndeterminate" v-model="checkAll" @change="handleCheckAllChange" class="check-all">全选</el-checkbox>
             <el-checkbox-group v-model="setAuthData.selectList" @change="handleCheckedChange">
               <el-checkbox v-for="auth in authOptions" :label="auth.code" :key="auth.code" >{{auth.label}}</el-checkbox>
             </el-checkbox-group>
@@ -205,6 +205,9 @@ export default {
         },{
           code:'english_day_new_admin',
           label: '每日资讯管理员'
+        },{
+            code:'overseas_custorm',
+            label:'海外客户管理员'
         }],//权限设置页面选项
       isIndeterminate:false,//权限设置 全选样式
       checkAll:true,//权限设置 全选值
@@ -447,16 +450,34 @@ export default {
     padding:40px 100px;
     .user-info{
       padding-bottom: 20px;
-      margin-bottom: 20px;
-      border-bottom: 1px solid #DCDFE6;
+      margin-bottom: 30px;
       display: flex;
       justify-content: space-between;
+      span{
+        background-color: #EEF5FE;
+        border:1px solid #0052D9;
+        border-radius: 4px;
+        padding:5px 10px;
+      }
     }
     .select-list{
-      background-color: #F0F2F5;
+      border:1px solid #DCDFE6;
+      border-radius: 4px;
       padding:20px;
+      .check-all{
+        display: block;
+        border-bottom:1px solid #DCDFE6;
+        margin: 0 -20px;
+        padding-left: 20px;
+        padding-bottom: 20px;
+      }
       .el-checkbox-group{
         margin-top: 20px;
+        display: flex;
+        flex-wrap: wrap;
+        .el-checkbox{
+            width:40%;
+        }
       }
     }
   }