Merge branch 'master' of http://101.37.171.70:10101/r/MES-WEB-VUEUI

wangyi

昨天 76cca4b3bd9d7a1e62f421b215ca5efd8d975ee3

Merge branch 'master' of http://101.37.171.70:10101/r/MES-WEB-VUEUI

 .env.development

@@ -10,7 +10,7 @@
# VUE_APP_BASE_API = 'http://220.189.218.155:9010/API/'
# VUE_APP_BASE_API = 'http://localhost:8082/LuBaoAPI/'
#锦隆
# VUE_APP_BASE_API = 'http://192.168.1.11/API/'
VUE_APP_BASE_API_INNER = 'http://192.168.1.11/API/'
VUE_APP_BASE_API = http://61.174.29.234:8880/API/
#杜贺
# VUE_APP_BASE_API = http://localhost:8082/API/

 .env.production

@@ -5,11 +5,11 @@
ENV = 'production'

# 宁波 四维尔
# VUE_APP_BASE_API = http://192.168.0.236:9010/API/
# VUE_APP_BASE_API = http://220.189.218.155:9010/API/
VUE_APP_BASE_API_INNER = http://192.168.0.236:9010/API/
VUE_APP_BASE_API = http://220.189.218.155:9010/API/
# 余姚 锦隆 智能家居
# VUE_APP_BASE_API = http://192.168.1.11/API/
VUE_APP_BASE_API = http://61.174.29.234:8880/API/
# VUE_APP_BASE_API_INNER = http://192.168.1.11/API/
# VUE_APP_BASE_API = http://61.174.29.234:8880/API/
# 智云迈思L-MOM管理系统/生产环境
# VUE_APP_BASE_API = http://47.96.97.237/API/
#杜贺

 src/views/warehouse/barcodeMaster/Gy_BarCodeBillList.vue

@@ -470,7 +470,7 @@
      if (this.queryParams.HBarCode) {
        this.sWhere += " and 条码编号 like ''%" + this.queryParams.HBarCode + "%''";
      }
      if (this.queryParams.HSupName) {
      if (this.queryParams.HSourceBillNo) {
        this.sWhere += " and 源单单号 like ''%" + this.queryParams.HSourceBillNo + "%''";
      }
      if (this.queryParams.HMaterNumber) {

 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
    }