From dee29d3d5c7a8faa839f8754ef272778c2a10e38 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=E6=9D=8E=E5=BC=BA?= <1206709430@qq.com>
Date: Sat, 26 Nov 2022 21:01:59 +0800
Subject: [PATCH] =?UTF-8?q?=E5=8A=9F=E8=83=BD=E5=8F=98=E5=8C=96:=20?=
 =?UTF-8?q?=E4=BC=98=E5=8C=96=E7=94=A8=E6=88=B7=E4=BF=A1=E6=81=AF?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 backend/dvadmin/system/views/user.py          |  1 +
 .../components/header-user/userinfo.vue       | 35 +++++++++++--------
 2 files changed, 22 insertions(+), 14 deletions(-)

diff --git a/backend/dvadmin/system/views/user.py b/backend/dvadmin/system/views/user.py
index 9592c41..151f05c 100644
--- a/backend/dvadmin/system/views/user.py
+++ b/backend/dvadmin/system/views/user.py
@@ -308,6 +308,7 @@ class UserViewSet(CustomModelViewSet):
         user = request.user
         result = {
             "id": user.id,
+            "username": user.username,
             "name": user.name,
             "mobile": user.mobile,
             "user_type": user.user_type,
diff --git a/web/src/layout/header-aside/components/header-user/userinfo.vue b/web/src/layout/header-aside/components/header-user/userinfo.vue
index eb5a53d..b46522e 100644
--- a/web/src/layout/header-aside/components/header-user/userinfo.vue
+++ b/web/src/layout/header-aside/components/header-user/userinfo.vue
@@ -19,22 +19,9 @@
               <el-form-item prop="name" required label="昵称">
                 <el-input v-model="userInfo.name" clearable></el-input>
               </el-form-item>
-              <el-form-item label="电话号码" prop="mobile">
+              <el-form-item label="电话号码" required prop="mobile">
                 <el-input v-model="userInfo.mobile" clearable></el-input>
               </el-form-item>
-              <el-form-item label="所属部门" prop="dept">
-                <el-input :value="userInfo.dept_info && userInfo.dept_info.dept_name" clearable disabled></el-input>
-              </el-form-item>
-              <el-form-item label="当前角色" prop="role">
-                <el-select :value="userInfo.role" multiple placeholder="请选择" size="mini" disabled>
-                  <el-option
-                    v-for="item in userInfo.role_info"
-                    :key="item.id"
-                    :label="item.name"
-                    :value="item.id">
-                  </el-option>
-                </el-select>
-              </el-form-item>
               <el-form-item label="邮箱" prop="email">
                 <el-input v-model="userInfo.email" clearable></el-input>
               </el-form-item>
@@ -45,6 +32,22 @@
                   <el-radio :label="-1">未知</el-radio>
                 </el-radio-group>
               </el-form-item>
+              <el-form-item label="用户名" prop="dept">
+                <el-input :value="userInfo.username" clearable disabled></el-input>
+              </el-form-item>
+              <el-form-item label="所属部门" prop="dept">
+                <el-input :value="userInfo.dept_info && userInfo.dept_info.dept_name" clearable disabled></el-input>
+              </el-form-item>
+              <el-form-item label="当前角色" prop="role">
+                <el-select :value="userInfo.role" multiple placeholder="请选择" disabled style="width: 100%;">
+                  <el-option
+                    v-for="item in userInfo.role_info"
+                    :key="item.id"
+                    :label="item.name"
+                    :value="item.id">
+                  </el-option>
+                </el-select>
+              </el-form-item>
               <el-form-item>
                 <el-button @click="updateInfo" type="primary">
                   <i class="fa fa-check"></i>
@@ -66,6 +69,7 @@
               ref="userPasswordForm"
               :model="userPasswordInfo"
               required-asterisk
+              label-width="100px"
               :label-position="position"
               :rules="passwordRules"
               center
@@ -73,6 +77,7 @@
               <el-form-item label="原密码" required prop="oldPassword">
                 <el-input
                   v-model="userPasswordInfo.oldPassword"
+                  placeholder="请输入原始密码"
                   clearable
                 ></el-input>
               </el-form-item>
@@ -80,6 +85,7 @@
                 <el-input
                   type="password"
                   v-model="userPasswordInfo.newPassword"
+                  placeholder="请输入新密码"
                   clearable
                 ></el-input>
               </el-form-item>
@@ -87,6 +93,7 @@
                 <el-input
                   type="password"
                   v-model="userPasswordInfo.newPassword2"
+                  placeholder="请再次输入新密码"
                   clearable
                 ></el-input>
               </el-form-item>