From 92bc105281c33d0e6b85177a2b5739f93a590924 Mon Sep 17 00:00:00 2001
From: wangxiaoshuang <825034831@qq.com>
Date: Mon, 29 Jun 2026 16:09:28 +0800
Subject: [PATCH] =?UTF-8?q?=E7=AE=A1=E7=90=86=E5=91=98=E9=87=8D=E7=BD=AE?=
 =?UTF-8?q?=E8=B4=A6=E5=8F=B7=E5=AF=86=E7=A0=81=E5=90=8E=EF=BC=8C=E7=94=A8?=
 =?UTF-8?q?=E6=88=B7=E7=99=BB=E5=BD=95=E5=90=8E=E9=87=8D=E6=96=B0=E8=AE=BE?=
 =?UTF-8?q?=E7=BD=AE=E5=AF=86=E7=A0=81=E7=9A=84=E9=A1=B5=E9=9D=A2=E5=AD=98?=
 =?UTF-8?q?=E5=9C=A8=E9=97=AE=E9=A2=98?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/store/modules/user.js |  2 +-
 src/views/login/index.vue | 11 ++++++++++-
 2 files changed, 11 insertions(+), 2 deletions(-)

diff --git a/src/store/modules/user.js b/src/store/modules/user.js
index 3ecc4eab..8a932720 100644
--- a/src/store/modules/user.js
+++ b/src/store/modules/user.js
@@ -121,7 +121,7 @@ const actions = {
           localStorage.setItem('CompanyInfo', JSON.stringify(response.Result.CompanyInfo))
           const data = response.Result
           commit('SET_ROLES', data.BasicInfo.AccountList)
-          if (data.BasicInfo.IsFirstAdd || data.BasicInfo.LoginState === 1) {
+          if (data.BasicInfo.IsFirstAdd || data.BasicInfo.LoginState === 1 || data.BasicInfo.IsNeedResetPwd) {
             try {
               zzSessionStorage.setItem('userId', data.BasicInfo.Id)
               commit('SET_TOKEN', data.JWTStr)
diff --git a/src/views/login/index.vue b/src/views/login/index.vue
index 89dbf290..ed041659 100644
--- a/src/views/login/index.vue
+++ b/src/views/login/index.vue
@@ -156,7 +156,7 @@
           <!-- {{ $t('login:title:system_title_about') }} -->
           <img src="@/assets/system.png" alt=""
             :style="{ width: isEN ? '180px' : '200px', height: isEN ? '60px' : '65px' }" />
-        <p style="margin-bottom: 0px">{{ $t('login:title:system') }}</p>
+          <p style="margin-bottom: 0px">{{ $t('login:title:system') }}</p>
         </div>
         <p style="margin-bottom: 20px; margin-top: 0">
           V{{ $version.IsEnv_US ? $version.Version_US : $version.Version }}
@@ -374,6 +374,15 @@ export default {
               })
             }, 500)
             return
+          } else if (res.BasicInfo.IsNeedResetPwd) {
+            // 当前用户管理员重置密码,请先修改密码之后再次登录
+            this.$message.success(this.$t('login:message:login5'))
+            setTimeout(() => {
+              this.$router.push({
+                path: `/user-recompose?UserId=${res.BasicInfo.IdentityUserId}&Email=${res.BasicInfo.EMail}&UserName=${res.BasicInfo.UserName}&lang=${this.$i18n.locale}&access_token=${res.JWTStr}&isUpdate=1`,
+              })
+            }, 500)
+            return
           } else if (res.BasicInfo.NeedChangePassWord) {
             // 请先修改密码后再登录！
             this.$alert(