Merge branch 'master' of http://git.gs-mes.com:8080/r/~tjx/QXPDA

快乐的昕的电脑

3 小时以前 b50ca3ca2cb9f0add65268b324cddd502744f6b2

 H5/Js/My.js

@@ -44,7 +44,11 @@
                    img: "../Images/print.png",
                    path: '/H5/Config.aspx'
                }
            ]
            ],
            actions: [],//列表的值
            orgName: "",//线体名称
            orgId: "",//线体编号
            show: false,//列表展示
        }
    },
    mounted() {
@@ -71,24 +75,67 @@
                    // on cancel
                });
        },
        //goMsg() {
        //    var that = this;
        //    window.location.href = "/H5/Message.aspx";
        //},
        goMsg() {
            var that = this;
            window.location.href = "/H5/Message.aspx";
            uni.navigateTo({
                url: "/pages/index/test/PrintInit?type=1",

            });
        },
        goOrg() {
        changeOrg() {
            this.show = true;
            var that = this;
            this.$dialog.confirm({
                title: '友情提示',
                message: '确定切换当前组织？',
                confirmButtonText: '确定',
                cancelButtonText: '取消'
            })
                .then(() => {
                    window.location.href = "/UserLogin.aspx";
            that.actions = [];
            that.isLoading = true;
            that.AxiosHttp("post", 'Login/changeOrg', {
                userName: that.userInfo.loginAccount
            }, false)
                .then(function (res) {
                    var json = res;
                    if (json.status == 0) {

                        if (json.data.tbBillList.length <= 0) {
                            that.$toast.fail("没有可用的数据");
                            that.$playSound('error');
                        } else {
                            that.itemInfo = json.data.tbBillList;
                            that.actions = json.data.tbBillList.map(item => {
                                return {
                                    name: item.orgName,
                                    orgId: item.orgId,  // 新增
                                    orgNo: item.orgNo  // 新增
                                };
                            });
                        }
                    }
                    else {
                        that.$toast.fail(json.message);
                        that.$playSound('error');
                    }
                    that.isLoading = false;
                })
                .catch(() => {
                    // on cancel
                .catch(function (error) {
                    that.isLoading = false;
                    that.$toast.fail("网络错误，请重试！");
                    that.$playSound('error');
                    console.log(error);
                });
        },

        onSelect(action) {
            //this.xtNum = action.lineNo;  // 绑定line_no到xtNum字段
            //console.log("选择的线体编号：", this.xtNum);
            //this.xtName = action.name;  // 绑定name到xtName字段
            //this.show = false;

            Cookies.set('orgId', action.orgId);
            Cookies.set('orgNo', action.orgNo);
            Cookies.set('orgName', action.name);
            this.show = false;
        },
    }
})