Merge branch 'bug-fix-4591' into custom

src/utils/buttonConfig.js

@@ -689,6 +689,7 @@ export const sysDepartPermission = {
     sysDepart_enable:'sysDepart:enable',//启用禁用
     sysDepart_del:'sysDepart:del',//用户删除
     sysDepart_saveUser_researchGroup:'sysDepart:saveUser:researchGroup',//添加/编辑用户表单中,研究方向的按钮
+    sysDepart_userType:'sysDepart:userType',//添加/编辑用户表单中,用户类型按钮
     sysDepart_saveUser_LabelVal:'sysDepart:saveUser:LabelVal',//姓名角色的标签
     sysDepart_classifyOpt_edit:'sysDepart:classifyOpt:edit',//添加/编辑部门
     sysDepart_classifyOpt_delete:'sysDepart:classifyOpt:delete',//删除部门

src/views/system_manage/components/addUserDialog.vue

@@ -30,7 +30,7 @@
                         :label="item.Name" :value="item.Value" />
                 </el-select>
             </el-form-item>
-            <el-form-item label="用户类型" prop="IsLdap">
+            <el-form-item label="用户类型" prop="IsLdap" v-permission="permissionBtn.sysDepartPermission.sysDepart_userType">
                 <el-select v-model="userForm.IsLdap" placeholder="请选择用户类型">
                     <el-option label="系统用户" :value="0"></el-option>
                     <el-option label="域用户" :value="1"></el-option>