Explorar el Código

fix(login): 修复登录参数传递问题

- 修复登录时用户名参数传递逻辑,统一使用username字段
- 移除条件判断,确保参数正确传递

refactor(user): 优化用户管理界面角色筛选功能

- 将身份筛选改为角色筛选,使用roleId进行查询
- 更新下拉选项数据源,使用roleList替代identityTypeList
- 移除不再使用的identityTypeMap和identityTypeList变量
- 简化角色数据获取逻辑,直接调用getRoles方法
dazhaxie hace 1 día
padre
commit
f358903ee1
Se han modificado 2 ficheros con 6 adiciones y 11 borrados
  1. 1 1
      src/views/Login.vue
  2. 5 10
      src/views/upms/user/User.vue

+ 1 - 1
src/views/Login.vue

@@ -171,7 +171,7 @@ export default {
           }
           this.password = loginParams.password
           delete loginParams.username
-          loginParams[!state.loginType ? 'email' : 'username'] = values.username
+          loginParams.username = values.username
           // loginParams.password = md5(values.password)
           Login(loginParams)
             .then((res) => this.loginSuccess(res))

+ 5 - 10
src/views/upms/user/User.vue

@@ -22,13 +22,12 @@
                 </a-form-item>
               </a-col>
               <a-col :md="8" :sm="24">
-                <a-form-item label="身份">
-                  <a-select v-model="queryParam.identityType" placeholder="请选择">
+                <a-form-item label="角色">
+                  <a-select v-model="queryParam.roleId" placeholder="请选择" allowClear>
                     <a-select-option
-                      v-for="(item,index) in identityTypeList"
-                      :key="index"
-                      :label="item.label"
-                      :value="parseInt(item.value)">{{ item.label }}
+                      v-for="item in roleList"
+                      :key="item.roleId"
+                      :value="item.roleId">{{ item.roleName }}
                     </a-select-option>
                   </a-select>
                 </a-form-item>
@@ -136,8 +135,6 @@ export default {
       treeData: [],
       expandedKeys: [],
       autoExpandParent: true,
-      identityTypeMap: {},
-      identityTypeList: [],
       jobTypeMap: {},
       rightSelectDept: null,
       // 查询参数
@@ -234,8 +231,6 @@ export default {
   created () {
     this.tableOption()
     this.getRoles()
-    this.identityTypeMap = this.DictCache.getLabelByValueMapByType(this.DictCache.TYPE.SYS_USER_IDENTITY_TYPE)
-    this.identityTypeList = this.DictCache.getChildrenList(this.DictCache.TYPE.SYS_USER_IDENTITY_TYPE)
     this.jobTypeMap = this.DictCache.getLabelByValueMapByType(this.DictCache.TYPE.SYS_USER_JOB_TYPE)
     getDeptTree().then(res => {
       this.treeData = res.data