diff --git a/src/components/setting/ModifyPwd.vue b/src/components/setting/ModifyPwd.vue
index 9643284..b06af25 100644
--- a/src/components/setting/ModifyPwd.vue
+++ b/src/components/setting/ModifyPwd.vue
@@ -1,9 +1,9 @@
 <script lang="ts" setup>
 import { syncSendCmd } from 'apis/system'
 import SoftKeyboard from 'components/common/SoftKeyboard/index.vue'
-import type { FormInstance } from 'element-plus'
+import type { FormInstance, FormRules } from 'element-plus'
 import { FtMessage } from 'libs/message'
-import { ref, watchEffect } from 'vue'
+import { reactive, ref, watchEffect } from 'vue'
 
 import { useSettingStore } from '@/stores/settingStore'
 
@@ -23,11 +23,10 @@ const userForm = ref<Record<string, any>>({
   newpasswd: '',
   confirmPasswd: '',
 })
-
 watchEffect(() => {
   modalType.value = settingStore.userModalState
   visible.value = settingStore.modifyPwdVisible
-  if (settingStore.currentEditUser) {
+  if (settingStore.currentEditUser && settingStore.currentEditUser.id !== userForm.value.id) {
     userForm.value = settingStore.currentEditUser
   }
   if (focusedInput.value) {
@@ -61,6 +60,10 @@ const doSave = () => {
   const passwd = userForm.value.passwd
   const newpasswd = userForm.value.newpasswd
   const confirmNewPasswd = userForm.value.confirmNewPasswd
+  if (settingStore.currentEditUser && passwd !== settingStore.currentEditUser.passwd) {
+    FtMessage.error('输入的旧密码不对')
+    return
+  }
   if (newpasswd !== confirmNewPasswd) {
     FtMessage.error('输入的密码不一致')
     return
@@ -84,19 +87,54 @@ const doSave = () => {
   })
 }
 const onClose = () => {
+  userForm.value = {}
   settingStore.updatePwdVisible(false)
 }
 const handleConfirm = (value: string) => {
   console.log('确认输入:', value)
 }
+
+// 密码
+const validatePasswd = (rule: any, value: string, callback: any) => {
+  if (/[\u4E00-\u9FA5]/.test(value)) {
+    callback(new Error('密码不能包含汉字！'))
+  }
+  else if (!value) {
+    callback(new Error('请输入密码'))
+  }
+  else {
+    callback()
+  }
+}
+// 确认密码
+const validateConfirmPasswd = (rule: any, value: string, callback: any) => {
+  if (/[\u4E00-\u9FA5]/.test(value)) {
+    callback(new Error('确认密码不能包含汉字！'))
+  }
+  else if (!value) {
+    callback(new Error('请再次输入密码'))
+  }
+  else if (value !== userForm.value.passwd) {
+    callback(new Error('两次输入密码不一致!'))
+  }
+  else {
+    callback()
+  }
+}
+const rules = reactive<FormRules>({
+  passwd: [{ required: true, message: '输入旧密码', trigger: 'blur' }, { min: 4, max: 10, message: '长度4-10', trigger: 'blur' }, { validator: validatePasswd, trigger: 'blur' }],
+  newpasswd: [{ required: true, message: '输入新密码', trigger: 'blur' }, { min: 4, max: 10, message: '长度4-10', trigger: 'blur' }, { validator: validatePasswd, trigger: 'blur' }],
+  confirmPasswd: [{ required: true, message: '输入新密码', trigger: 'blur' }, { min: 4, max: 10, message: '长度4-10', trigger: 'blur' }, { validator: validateConfirmPasswd, trigger: 'blur' }],
+})
 </script>
 
 <template>
   <FtDialog v-model="visible" :title="modalTitle" :ok-handle="() => { onSave(userFormRef) }" @cancel="onClose">
     <div>
-      <el-form ref="userFormRef" :model="userForm" label-width="auto" style="max-width: 400px">
+      <el-form ref="userFormRef" :model="userForm" label-width="auto" style="max-width: 400px" :rules="rules">
         <div>
           <el-form-item
+            v-show="false"
             label="旧密码："
             prop="passwd"
             :rules="{
diff --git a/src/components/setting/User.vue b/src/components/setting/User.vue
index 73b99d6..32452ee 100644
--- a/src/components/setting/User.vue
+++ b/src/components/setting/User.vue
@@ -31,7 +31,7 @@ const queryUserList = () => {
   })
 }
 const updatePwd = (userItem: User.UserItem) => {
-  // 判断登录是否管理员，非管理员不可修改密码
+  // 判断登录是否管理员，非管理员仅可以修改自己的密码
   if (userInfo.roleType !== 'admin' && userInfo.id !== userItem.id) {
     FtMessage.error('无权限修改密码')
     return