添加用户类型修改

attendance-performance-manager-ui/admin/src/views/system/user/dialogshow.vue

@@ -24,7 +24,7 @@
             placeholder="请输入密码"
             :type="passw"
             clearable
-            v-if="pageInfo.type == 'add'"
+            disabled
             @blur="onBlur"
           >
             <!-- input中加图标必须要有slot="suffix"属性，不然无法显示图标 -->

attendance-performance-manager-ui/admin/src/views/system/user/list.vue

@@ -344,7 +344,7 @@ export default {
                     分配角色
                   </el-button>
                   */}
-
+                  <span> </span>
                   <el-button
                       size="mini"
                       type="text"
@@ -353,6 +353,15 @@ export default {
                   >
                     分配部门
                   </el-button>
+<span> </span>
+                  <el-button
+                      size="mini"
+                      type="text"
+                      icon="el-icon-share"
+                      onClick={() => this.distributeDept(row)}
+                  >
+                    修改密码
+                  </el-button>
 
                 </div>
               );

attendance-performance-manager/src/main/java/com/mortals/xhx/base/system/user/web/UserController.java

@@ -3,7 +3,6 @@ package com.mortals.xhx.base.system.user.web;
 
 import com.alibaba.fastjson.JSONObject;
 import com.mortals.framework.common.IBaseEnum;
-import com.mortals.framework.common.code.UserType;
 import com.mortals.framework.exception.AppException;
 import com.mortals.framework.model.Context;
 import com.mortals.framework.web.BaseCRUDJsonBodyMappingController;
@@ -17,6 +16,7 @@ import com.mortals.xhx.base.system.role.service.RoleUserService;
 import com.mortals.xhx.base.system.user.model.UserEntity;
 import com.mortals.xhx.base.system.user.service.UserService;
 import com.mortals.xhx.common.code.UserStatus;
+import com.mortals.xhx.common.code.UserType;
 import com.mortals.xhx.module.dept.model.DeptQuery;
 import com.mortals.xhx.module.dept.service.DeptService;
 import io.jsonwebtoken.Claims;
@@ -60,7 +60,7 @@ public class UserController extends BaseCRUDJsonBodyMappingController<UserServic
 
     @Override
     protected void init(Map<String, Object> model, Context context) {
-        this.addDict(model, "userType", IBaseEnum.getEnumMap(UserType.class));
+        this.addDict(model, "userType", UserType.getEnumMap());
         this.addDict(model, "status", UserStatus.getEnumMap());
         this.addDict(model, "roleIds", roleService.find(new RoleQuery()).stream().collect(Collectors.toMap(x -> x.getId().toString(), y -> y.getName())));
         this.addDict(model, "deptId", deptService.find(new DeptQuery()).stream().collect(Collectors.toMap(x -> x.getId().toString(), y -> y.getDeptName(), (o, n) -> n)));