From 3e049efc6eb3970bb200058e41468f0a38de1a7e Mon Sep 17 00:00:00 2001
From: chenhaozhe <cgz@hz-kingdee.com>
Date: 星期二, 20 一月 2026 16:14:09 +0800
Subject: [PATCH] Merge branch 'master' of http://101.37.171.70:10101/r/MES-WEB-VUEUI
---
src/views/warehouse/barcodeMaster/Gy_BarCodeBill_JinLong_AutoLogin.vue | 72 ++++++++++++++++++------------------
1 files changed, 36 insertions(+), 36 deletions(-)
diff --git a/src/views/warehouse/barcodeMaster/Gy_BarCodeBill_JinLong_AutoLogin.vue b/src/views/warehouse/barcodeMaster/Gy_BarCodeBill_JinLong_AutoLogin.vue
index 694dd7d..587d8a0 100644
--- a/src/views/warehouse/barcodeMaster/Gy_BarCodeBill_JinLong_AutoLogin.vue
+++ b/src/views/warehouse/barcodeMaster/Gy_BarCodeBill_JinLong_AutoLogin.vue
@@ -726,58 +726,62 @@
var HPwdWord = params[params[6]]; //鐧诲綍瀵嗙爜
var HOrgID = params[params[7]]; //缁勭粐id
var HOrgName = "";
-
+
if (HOrgID == 0) {
//鍒ゆ柇鏄惁鐧诲綍 鏈櫥褰曞垯璺冲埌鐧诲綍椤�
- // if (sessionStorage.login != "login") {
- // this.$modal.msgError("鐧诲綍澶辨晥锛岃閲嶆柊鐧诲綍锛�!");
- // this.$router.push({ path: "/" }).catch(() => { })
- // }
- // return;
+ if (sessionStorage.login != "login") {
+ this.$modal.msgError("鐧诲綍澶辨晥锛岃閲嶆柊鐧诲綍锛�!");
+ this.$router.push({ path: "/" }).catch(() => { })
+ }
+ return;
}
var sql_getHOrgName = "select HName from Xt_Organizations where HItemID = " + HOrgID;
var ModRightNameCheck = "";
- axios.get(this.$baseUrl + "/CommonModel/searchMethod", {
+ try{
+ let response = await axios.get(this.$baseUrl + "/CommonModel/searchMethod", {
params: {
"sql": sql_getHOrgName
, "user": HUserName
, "ModRightNameCheck": ModRightNameCheck
}
- }).then(response => {
- var data1 = response.data
- if (data1.count == 1) {
- if (data1.data.length > 0) {
- HOrgName = data1.data[0]["HName"];
- } else {
- this.$modal.msgError("鐧诲綍澶辫触锛侊紒缁勭粐涓嶅瓨鍦紝璇烽噸鏂扮櫥褰曪紒锛�");
- this.$router.push({ path: "/" }).catch(() => { })
- }
- }
- else {
- this.$modal.msgError(data1.code + data1.Message);
+ })
+
+ var data1 = response.data
+ if (data1.count == 1) {
+ if (data1.data.length > 0) {
+ HOrgName = data1.data[0]["HName"];
+ } else {
+ this.$modal.msgError("鐧诲綍澶辫触锛侊紒缁勭粐涓嶅瓨鍦紝璇烽噸鏂扮櫥褰曪紒锛�");
this.$router.push({ path: "/" }).catch(() => { })
}
- }).catch(error => {
+ }
+ else {
+ this.$modal.msgError(data1.code + data1.Message);
+ this.$router.push({ path: "/" }).catch(() => { })
+ }
+ }catch(error){
this.$modal.msgError("鎺ュ彛璇锋眰澶辫触!");
this.$router.push({ path: "/" }).catch(() => { })
- });
+ };
// 鍐欏叆sessionStorage 闇�瑕佹椂闂达紝鍚庣画鎿嶄綔闇�瑕佺瓑寰� 鍐欏叆sessionStorage瀹屾垚鍚庡啀鎵ц
var sql_login = "select * from h_v_Gy_Czygl_Login where Czymc = '" + HUserName + "'";
- axios.get(this.$baseUrl + "/CommonModel/searchMethod", {
- params: {
- "sql": sql_login
- , "user": HUserName
- , "ModRightNameCheck": ""
- }
- }).then(response => {
- var data1 = response.data
+ try{
+ let res = await axios.get(this.$baseUrl + "/CommonModel/searchMethod", {
+ params: {
+ "sql": sql_login
+ , "user": HUserName
+ , "ModRightNameCheck": ""
+ }
+ })
+
+
+ var data1 = res.data
if (data1.count == 1) {
if (data1.data.length > 0) {
HUserName = data1.data[0]["Czybm"];
-
var result = data1;
sessionStorage["HCloudUserName"] = result.data[0].HCloudUserName;//閲戣澏浜戣处鍙�
sessionStorage["HCloudUserPsd"] = result.data[0].HCloudUserPsd;
@@ -822,10 +826,6 @@
sessionStorage["HTranSlate"] = "1";
sessionStorage["HAutoLogin"] = "1";
- // 娣诲姞涓�涓欢鏃讹紝淇濊瘉鍐欏叆sessionStorage瀹屾垚鍚庡啀璋冪敤鍚庣画涓氬姟浠ｇ爜
- setTimeout(() => {
-
- }, 1000);
} else {
this.$modal.msgError("鍔犺浇澶辫触锛侊紒璐﹀彿涓嶅瓨鍦紝璇疯仈绯荤鐞嗗憳缁存姢璐﹀彿淇℃伅锛侊紒");
this.$router.push({ path: "/" }).catch(() => { });
@@ -834,10 +834,10 @@
this.$modal.msgError("鐧诲綍澶辫触!!"+result.Message);
this.$router.push({ path: "/" }).catch(() => { })
}
- }).catch(error => {
+ }catch(error){
this.$modal.msgError("鎺ュ彛璇锋眰澶辫触!");
this.$router.push({ path: "/" }).catch(() => { })
- });
+ };
},
//#endregion
}
--
Gitblit v1.9.1