From 74a103a40c71e230d4e4fe2e59335cd2d2b81f45 Mon Sep 17 00:00:00 2001
From: anthonywj <yewenjie20@vip.qq.com>
Date: Fri, 14 Jun 2024 14:43:44 +0800
Subject: [PATCH] =?UTF-8?q?=E7=99=BB=E5=BD=95=E5=AF=86=E7=A0=81=E6=A0=A1?=
 =?UTF-8?q?=E9=AA=8C?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/store/modules/user.js                     |  1 -
 src/views/inout/DialogCreateOrder.vue         |  1 -
 .../inventory/count/InvCountOrderModify.vue   |  1 -
 src/views/myLogin.vue                         | 74 +++++++++++++------
 .../thirdSys/invOrder/thrInvOrderGenerate.vue |  1 -
 5 files changed, 50 insertions(+), 28 deletions(-)

diff --git a/src/store/modules/user.js b/src/store/modules/user.js
index d5394d74..38d090e6 100644
--- a/src/store/modules/user.js
+++ b/src/store/modules/user.js
@@ -71,7 +71,6 @@ const user = {
   actions: {
     // 登录
     Login({commit}, userInfo) {
-      debugger
       const username = userInfo.username.trim()
       const password = sha256(userInfo.password)
       const code = userInfo.code
diff --git a/src/views/inout/DialogCreateOrder.vue b/src/views/inout/DialogCreateOrder.vue
index 4cb765e0..419fc960 100644
--- a/src/views/inout/DialogCreateOrder.vue
+++ b/src/views/inout/DialogCreateOrder.vue
@@ -1821,7 +1821,6 @@ export default {
     this.getConfig();
     if (this.$isNotBlank(this.orderQuery.billNo)) {
       //编辑页面
-      debugger
       this.corpOrderIdDisabled = true;
       this.orderFormData = this.orderQuery;
       this.actionEnable = true;
diff --git a/src/views/inventory/count/InvCountOrderModify.vue b/src/views/inventory/count/InvCountOrderModify.vue
index 800ad1c9..c7dcb6b9 100644
--- a/src/views/inventory/count/InvCountOrderModify.vue
+++ b/src/views/inventory/count/InvCountOrderModify.vue
@@ -600,7 +600,6 @@ export default {
     getList() {
       let params = {orderIdFk: this.formData.orderId};
       getCountOrderDetailList(params).then((res) => {
-        debugger
         if (res.code === 20000) {
           console.log(res.data)
           this.countProductList = res.data.list || [];
diff --git a/src/views/myLogin.vue b/src/views/myLogin.vue
index d3715736..0f67e157 100644
--- a/src/views/myLogin.vue
+++ b/src/views/myLogin.vue
@@ -53,25 +53,25 @@
               @click="hidePassword"
             ></i>
           </el-input>
-<!--          <el-input-->
-<!--            placeholder="密码"-->
-<!--            name="password"-->
-<!--            :type="isShowPwd ? 'text' : 'password'"-->
-<!--            @keyup.enter.native="handleLogin"-->
-<!--            v-model="loginForm.password"-->
-<!--            autocomplete="on"-->
-<!--          >-->
-<!--            <i slot="prefix" class="el-input__icon">-->
-<!--              <icon-svg icon-class="pwd"/>-->
-<!--            </i>-->
-<!--            <i-->
-<!--              slot="suffix"-->
-<!--              class="el-input__icon"-->
-<!--              @click="isShowPwd = !isShowPwd"-->
-<!--            >-->
-<!--              <icon-svg icon-class="eye"/>-->
-<!--            </i>-->
-<!--          </el-input>-->
+          <!--          <el-input-->
+          <!--            placeholder="密码"-->
+          <!--            name="password"-->
+          <!--            :type="isShowPwd ? 'text' : 'password'"-->
+          <!--            @keyup.enter.native="handleLogin"-->
+          <!--            v-model="loginForm.password"-->
+          <!--            autocomplete="on"-->
+          <!--          >-->
+          <!--            <i slot="prefix" class="el-input__icon">-->
+          <!--              <icon-svg icon-class="pwd"/>-->
+          <!--            </i>-->
+          <!--            <i-->
+          <!--              slot="suffix"-->
+          <!--              class="el-input__icon"-->
+          <!--              @click="isShowPwd = !isShowPwd"-->
+          <!--            >-->
+          <!--              <icon-svg icon-class="eye"/>-->
+          <!--            </i>-->
+          <!--          </el-input>-->
         </el-form-item>
         <el-form-item
           prop="verificationCode"
@@ -155,8 +155,8 @@ export default {
       }
     };
     return {
-      password:"",
-      pwdCover:"",
+      password: "",
+      pwdCover: "",
       ruleForm: {
         userName: "",
         pwd: "",
@@ -315,6 +315,7 @@ export default {
             this.$store
               .dispatch("Login", this.loginForm)
               .then((res) => {
+                console.log(res)
                 if (res.data.needChangePwd == true) {
                   this.$confirm('系统检测到您的密码长时间未修改，为保证您的账号安全建议立即修改密码?', '提示', {
                     confirmButtonText: '立即修改',
@@ -328,6 +329,9 @@ export default {
                       confirmPassword: "",
                     };
                   }).catch(() => {
+                    this.$store.dispatch('LogOut').then(() => {
+                      location.href = process.env.VUE_APP_CONTEXT_PATH;
+                    })
                     this.$router
                       .push({path: this.redirect || "/"})
                       .catch((res) => {
@@ -343,10 +347,32 @@ export default {
               })
               .catch((res) => {
                 this.loading = false;
-                this.$message.error(res);
-                if (this.captchaEnabled) {
-                  this.getCode();
+                if (res == "密码已过期，请修改密码") {
+                  this.$confirm('密码已过期请立即修改密码?', '提示', {
+                    confirmButtonText: '立即修改',
+                    type: 'warning'
+                  }).then(() => {
+                    this.passwordFormVisible = true;
+                    this.passwordFormData = {
+                      oldPassword: "",
+                      newPassword: "",
+                      confirmPassword: "",
+                    };
+                  }).catch(() => {
+                    this.$router
+                      .push({path: this.redirect || "/"})
+                      .catch((res) => {
+                      });
+                  });
+                } else {
+                  this.$message.error(res);
+                  if (this.captchaEnabled) {
+                    this.getCode();
+                  }
+
                 }
+
+
               });
           } else {
             this.$message({
diff --git a/src/views/thirdSys/invOrder/thrInvOrderGenerate.vue b/src/views/thirdSys/invOrder/thrInvOrderGenerate.vue
index 6833aa4a..d4794886 100644
--- a/src/views/thirdSys/invOrder/thrInvOrderGenerate.vue
+++ b/src/views/thirdSys/invOrder/thrInvOrderGenerate.vue
@@ -276,7 +276,6 @@ export default {
     },
     //获取往来单位候选列表
     findMethod(query) {
-      debugger
       this.fromOptions = []
       let cQuery = {
         key: query,