修正自动登录模块 时序混乱的问题

chenhaozhe

昨天 b6c14a8697e5489955c0e2597a4f034964b81926

修正自动登录模块 时序混乱的问题

 src/views/warehouse/barcodeMaster/Gy_BarCodeBill_JinLong_AutoLogin.vue

@@ -726,58 +726,63 @@
            var HPwdWord = params[params[6]];               //登录密码
            var HOrgID = params[params[7]];                 //组织id
            var HOrgName = "";

            console.log("HOrgID", HOrgID);
            
            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 +827,6 @@
                        sessionStorage["HTranSlate"] = "1";
                        sessionStorage["HAutoLogin"] = "1";

                        // 添加一个延时，保证写入sessionStorage完成后再调用后续业务代码
                        setTimeout(() => {
                            
                        }, 1000);
                    } else {
                        this.$modal.msgError("加载失败！！账号不存在，请联系管理员维护账号信息！！");
                        this.$router.push({ path: "/" }).catch(() => { });
@@ -834,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
    }