From 76cca4b3bd9d7a1e62f421b215ca5efd8d975ee3 Mon Sep 17 00:00:00 2001
From: wangyi <2946747746@qq.com>
Date: 星期二, 20 一月 2026 16:11:37 +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 | 68 +++++++++++++++++++---------------
1 files changed, 38 insertions(+), 30 deletions(-)
diff --git a/src/views/warehouse/barcodeMaster/Gy_BarCodeBill_JinLong_AutoLogin.vue b/src/views/warehouse/barcodeMaster/Gy_BarCodeBill_JinLong_AutoLogin.vue
index 25fc7de..8f75d67 100644
--- a/src/views/warehouse/barcodeMaster/Gy_BarCodeBill_JinLong_AutoLogin.vue
+++ b/src/views/warehouse/barcodeMaster/Gy_BarCodeBill_JinLong_AutoLogin.vue
@@ -291,13 +291,13 @@
},
async created() {
await this.loging(); //鑷姩鐧诲綍
- this.judgeIsLoging(); //鍒ゆ柇鏄惁鐧诲綍锛屾湭鐧诲綍鍒欒烦杞洖鐧诲綍椤甸潰
+ await this.judgeIsLoging(); //鍒ゆ柇鏄惁鐧诲綍锛屾湭鐧诲綍鍒欒烦杞洖鐧诲綍椤甸潰
await this.get_OrganizationList(); //椤甸潰鍒濆鍖� 鑾峰彇缁勭粐涓嬫媺鍒楄〃鏁版嵁
await this.initPageData(); //椤甸潰鍒濆鍖�
},
methods: {
//#region 鍒ゆ柇鏄惁鐧诲綍锛屾湭鐧诲綍鍒欒烦杞洖鐧诲綍椤甸潰
- judgeIsLoging(){
+ async judgeIsLoging(){
if (sessionStorage["login"] != "login") {
this.$modal.msgError("鐧诲綍澶辨晥锛岃閲嶆柊鐧诲綍锛侊紒");
this.$router.push({ path: "/" }).catch(() => { })
@@ -306,7 +306,7 @@
//#endregion
//#region 椤甸潰鍒濆鍖�
- initPageData(){
+ async initPageData(){
var params = this.get_UrlVars();
var OperationType = params[params[0]]; //鎿嶄綔绫诲瀷
@@ -726,7 +726,8 @@
var HPwdWord = params[params[6]]; //鐧诲綍瀵嗙爜
var HOrgID = params[params[7]]; //缁勭粐id
var HOrgName = "";
-
+ console.log("HOrgID", HOrgID);
+
if (HOrgID == 0) {
//鍒ゆ柇鏄惁鐧诲綍 鏈櫥褰曞垯璺冲埌鐧诲綍椤�
if (sessionStorage.login != "login") {
@@ -738,44 +739,50 @@
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;
@@ -819,6 +826,7 @@
sessionStorage["Organization"] = HOrgName;
sessionStorage["HTranSlate"] = "1";
sessionStorage["HAutoLogin"] = "1";
+
} else {
this.$modal.msgError("鍔犺浇澶辫触锛侊紒璐﹀彿涓嶅瓨鍦紝璇疯仈绯荤鐞嗗憳缁存姢璐﹀彿淇℃伅锛侊紒");
this.$router.push({ path: "/" }).catch(() => { });
@@ -827,10 +835,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