Merge branch 'master' of https://gitea.xinyuxi.com/zhanggaoming/xh-medical-sign-web

clinical-web/src/views/auth/ChangePasswordView.vue

@@ -1,9 +1,10 @@
 <script setup lang="ts">
 import { ref } from 'vue'
-import { useRouter } from 'vue-router'
+import { useRoute, useRouter } from 'vue-router'
 
 import { useLoginStore } from '@/stores/login'
 
+const route = useRoute()
 const router = useRouter()
 const loginStore = useLoginStore()
 
@@ -13,6 +14,19 @@ const confirmPassword = ref('')
 const errorMessage = ref('')
 const isSubmitting = ref(false)
 
+function getAfterChangeRedirect() {
+  const redirect = route.query.redirect
+  if (
+    typeof redirect === 'string' &&
+    redirect.startsWith('/') &&
+    !redirect.startsWith('//') &&
+    redirect !== '/change-password'
+  ) {
+    return redirect
+  }
+  return '/workbench/home'
+}
+
 function validatePassword() {
   if (!currentPassword.value || !newPassword.value || !confirmPassword.value) {
     return '请完整填写当前密码、新密码和确认密码'
@@ -51,7 +65,10 @@ async function handleSubmit() {
       currentPassword: currentPassword.value,
       newPassword: newPassword.value,
     })
-    await router.replace({ name: 'login', query: { passwordChanged: '1' } })
+    await router.replace({
+      name: 'login',
+      query: { passwordChanged: '1', redirect: getAfterChangeRedirect() },
+    })
   } catch (error: unknown) {
     errorMessage.value =
       error instanceof Error && error.message ? error.message : '密码修改失败，请稍后重试'
@@ -74,8 +91,14 @@ async function handleLogout() {
   <main class="password-page">
     <form class="password-card" novalidate @submit.prevent="handleSubmit">
       <div class="password-brand">医签通</div>
-      <h1>首次登录，请修改密码</h1>
-      <p class="password-description">为保护患者信息，设置新密码后需要重新登录。</p>
+      <h1>{{ loginStore.user?.passwordChangeRequired ? '首次登录，请修改密码' : '修改密码' }}</h1>
+      <p class="password-description">
+        {{
+          loginStore.user?.passwordChangeRequired
+            ? '为保护患者信息，设置新密码后需要重新登录。'
+            : '修改密码后需要重新登录。'
+        }}
+      </p>
 
       <label>
         <span>当前密码</span>

clinical-web/src/views/auth/LoginView.vue

@@ -1,5 +1,5 @@
 <script setup lang="ts">
-import { onMounted, ref } from 'vue'
+import { computed, onMounted, ref } from 'vue'
 import { useRoute, useRouter } from 'vue-router'
 
 import { getAuthErrorMessage, getCaptcha } from '@/api/auth'
@@ -18,6 +18,7 @@ const captchaLoading = ref(false)
 const errorMessage = ref('')
 const isSubmitting = ref(false)
 const passwordChanged = route.query.passwordChanged === '1'
+const passwordChangeRequested = computed(() => route.query.redirect === '/change-password')
 
 async function loadCaptcha() {
   captchaLoading.value = true
@@ -41,6 +42,13 @@ function getRedirectPath() {
     : '/workbench/home'
 }
 
+function requestPasswordChange() {
+  void router.replace({
+    name: 'login',
+    query: { ...route.query, redirect: '/change-password' },
+  })
+}
+
 async function handleLogin() {
   const normalizedUsername = username.value.trim()
 
@@ -70,9 +78,12 @@ async function handleLogin() {
     }
 
     const session = await loginStore.login(payload)
+    const redirect = getRedirectPath()
 
     await router.replace(
-      session.user.passwordChangeRequired ? { name: 'change-password' } : getRedirectPath(),
+      session.user.passwordChangeRequired
+        ? { name: 'change-password', query: { redirect } }
+        : redirect,
     )
   } catch (error: unknown) {
     errorMessage.value = getAuthErrorMessage(error)
@@ -175,6 +186,12 @@ onMounted(() => {
         {{ isSubmitting ? '登录中…' : '登 录' }}
       </button>
       <p class="login-tip">请使用医院分配的账号登录</p>
+      <p v-if="passwordChangeRequested" class="login-change-hint" role="status">
+        登录后将进入修改密码页面
+      </p>
+      <button class="login-change-link" type="button" @click="requestPasswordChange">
+        修改密码
+      </button>
     </form>
 
     <p class="login-footer">© 2026 医签通 MEDISIGN · 患者电子签署系统 V1.1 原型</p>
@@ -348,6 +365,27 @@ onMounted(() => {
   border-radius: 8px;
 }
 
+.login-change-hint {
+  margin: 8px 0 0;
+  color: var(--brand);
+  font-size: 12px;
+  text-align: center;
+}
+
+.login-change-link {
+  display: block;
+  padding: 7px 12px;
+  margin: 5px auto 0;
+  color: var(--brand);
+  font-size: 12px;
+  background: transparent;
+  border: 0;
+}
+
+.login-change-link:hover {
+  text-decoration: underline;
+}
+
 .login-footer {
   position: absolute;
   bottom: 18px;