fix: 优化

src/views/system/role/index.vue

@@ -165,7 +165,7 @@ getMenuTreeSelect()
 // 根据角色ID查询菜单树结构
 const getRoleMenuTreeSelect = (roleId: any) => {
   return roleMenuTreeSelectApi(roleId).then((res: any) => {
-    menuOptions.value = res.menus
+    menuOptions.value = res.data.menus
     return res
   })
 }
@@ -174,7 +174,7 @@ const getRoleMenuTreeSelect = (roleId: any) => {
 const getDeptTree = (roleId: string) => {
   return deptTreeSelectApi(roleId).then((res: any) => {
     if (res.code === 200) {
-      deptOptions.value = res.depts
+      deptOptions.value = res.data.depts
       return res
     }
   })
@@ -233,7 +233,7 @@ const openDialog = async (type: number, title: string, row?: any) => {
   formDialogRef.value?.openDialog(params)
   if (row?.roleId) {
     getRoleMenuTreeSelect(row?.roleId).then(res => {
-      let checkedKeys = res.checkedKeys
+      let checkedKeys = res.data.checkedKeys
       checkedKeys.forEach((v: any) => {
         nextTick(() => {
           menuRef.value.setChecked(v, true, false)
@@ -264,7 +264,7 @@ const openDataDialog = async (type: number, title: string, row?: any) => {
       getDeptTree(row?.roleId).then(res => {
         nextTick(() => {
           if (deptRef.value) {
-            deptRef.value.setCheckedKeys(res.checkedKeys)
+            deptRef.value.setCheckedKeys(res.data.checkedKeys)
           }
         })
       })
@@ -452,17 +452,22 @@ const setItemsOptions = () => {
     {
       label: '显示顺序',
       prop: 'roleSort',
+      span: 12,
       rules: [{ required: true, message: '显示顺序不能为空', trigger: 'blur' }],
       compOptions: {
-        placeholder: '请输入显示顺序'
+        elTagName: 'input-number'
       }
     },
     {
       label: '角色状态',
       prop: 'status',
+      span: 12,
       rules: [{ required: true, message: '角色状态不能为空', trigger: 'blur' }],
       compOptions: {
-        placeholder: '请输入角色状态'
+        elTagName: 'radio-group',
+        enum: () => getDictsApi('sys_normal_disable'),
+        labelKey: 'dictLabel',
+        valueKey: 'dictValue'
       }
     },
     {

src/views/system/user/index.vue

@@ -117,11 +117,12 @@ function handleResetPwd(row: any) {
     cancelButtonText: '取消',
     closeOnClickModal: false,
     inputPattern: /^.{5,20}$/,
-    inputErrorMessage: '/^.{5,20}$/,'
+    inputErrorMessage: '用户密码长度必须介于 5 和 20 之间'
   })
     .then(({ value }: any) => {
       resetUserPwdApi({ userId: row.userId, password: value }).then(res => {
         if (res.code == 200) ElMessage.success('修改成功，新密码是：' + value)
+        else ElMessage.error(res.msg)
       })
     })
     .catch((e: any) => {
@@ -274,8 +275,8 @@ const openDialog = async (type: number, title: string, row?: any) => {
     )
   }
   if (row?.userId) {
-    res.data.postIds = res.data.postIds
-    res.data.roleIds = res.data.roleIds
+    res.data.user.postIds = res.data.postIds
+    res.data.user.roleIds = res.data.roleIds
   }
 
   const params = {
@@ -328,6 +329,6 @@ const columns = reactive<ColumnProps<User.ResUserList>[]>([
     }
   },
   { prop: 'createTime', label: '创建时间', width: 180 },
-  { prop: 'operation', label: '操作', width: 230, fixed: 'right' }
+  { prop: 'operation', label: '操作', width: 240, fixed: 'right' }
 ])
 </script>