Merge remote-tracking branch 'origin/api' into hive2.0

jyy

2021-01-25 be98bd60f3332f4960d8a5a27778e2d6c2cdcb7f

 zq-erp/src/main/resources/templates/views/admin/hive/beautySalon/order-form.html

@@ -558,6 +558,7 @@
            direction: 'rtl',
            //当前登录用户
            loginUser: {},
            staffUser:{},
            //业绩用户列表
            userList: [],
            order: {
@@ -655,64 +656,7 @@
        created: function () {
            let _this = this;

            //获取登录用户信息
            AjaxProxy.requst({
                app: _this,
                url: basePath + '/admin/getLoginUser',
                callback: function (data) {
                    _this.loginUser = data.mapInfo.user;

                    if (id) {
                        //加载订单信息
                        AjaxProxy.requst({
                            app: _this,
                            url: basePath + '/admin/order/findOrderById/' + id,
                            callback: function (data) {
                                _this.order = data.rows[0];
                                //修改支付金额
                                _this.changeVip(_this.order.vipId);
                                let items = _this.order.items;
                                let orderPayMoney = 0;
                                //设置欠款订单设置欠款金额等于支付金额，非欠款订单设置折扣金额等于支付金额
                                items.forEach(item => {
                                    if (item.arrears > 0) {
                                        item.payMoney = item.arrears;
                                    } else {
                                        item.payMoney = item.zkPrice;
                                    }
                                    orderPayMoney += item.payMoney;
                                    item.uuid = MTools.uuid();
                                    //业绩设置
                                    _this.achieveList.push({
                                        orderItem: item,
                                        staff: _this.loginUser,
                                        saleId: _this.loginUser.suId,
                                        achieveMoney: item.payMoney,
                                        commission : 0,
                                        t3 : '现金业绩',
                                        isShare: false,
                                    });
                                });
                                _this.order.payMoney = orderPayMoney;
                            }
                        });

                    } else {
                        //获取门店信息
                        AjaxProxy.requst({
                            app: _this,
                            url: basePath + '/admin/shopInfo/findUserShop',
                            callback: function (data) {
                                _this.order.shopName = data.rows[0].shopName;

                            }
                        });
                    }


                }
            });

            _this.initMethod()
            if (vipId) {
                _this.changeVip(vipId);
            }
@@ -728,6 +672,76 @@
        },

        methods: {
            initMethod() {
                let _this = this;

                //获取登录用户信息
                AjaxProxy.requst({
                    app: _this,
                    url: basePath +  '/admin/getLoginUser',
                    callback: function (data) {
                        _this.loginUser = data.mapInfo.user;

                        if (id) {
                            //加载订单信息
                            AjaxProxy.requst({
                                app: _this,
                                url: basePath + '/admin/order/findOrderById/' + id,
                                callback: function (data) {
                                    _this.order = data.rows[0];
                                    //修改支付金额
                                    _this.changeVip(_this.order.vipId);

                                    AjaxProxy.requst({
                                        app: _this,
                                        url: basePath + '/admin/getUserById?id='+_this.order.staffId,
                                        callback: function (data) {
                                            _this.staffUser = data.mapInfo.user;

                                            let items = _this.order.items;
                                            let orderPayMoney = 0;
                                            //设置欠款订单设置欠款金额等于支付金额，非欠款订单设置折扣金额等于支付金额
                                            items.forEach(item => {
                                                if (item.arrears > 0) {
                                                    item.payMoney = item.arrears;
                                                } else {
                                                    item.payMoney = item.zkPrice;
                                                }
                                                orderPayMoney += item.payMoney;
                                                item.uuid = MTools.uuid();
                                                //业绩设置
                                                _this.achieveList.push({
                                                    orderItem: item,
                                                    staff: _this.staffUser,
                                                    saleId: _this.staffUser.suId,
                                                    achieveMoney: item.payMoney,
                                                    commission : 0,
                                                    t3 : '现金业绩',
                                                    isShare: false,
                                                });
                                            });
                                            _this.order.payMoney = orderPayMoney;
                                        }
                                    });
                                }
                            });

                        } else {
                            //获取门店信息
                            AjaxProxy.requst({
                                app: _this,
                                url: basePath + '/admin/shopInfo/findUserShop',
                                callback: function (data) {
                                    _this.order.shopName = data.rows[0].shopName;

                                }
                            });
                        }


                    }
                });
            },

            //取消订单
            closeFram() {
@@ -994,8 +1008,16 @@
                                if (submitType == 1) {
                                    if (_this.printPaper) {
                                        _this.print();
                                    } else {
                                        _this.$message.success({
                                            message : data.info,
                                            duration : 1000,
                                            onClose() {
                                                _this.closeFram();
                                            }
                                        });
                                    }
                                    // _this.closeFram();

                                    // _this.$confirm('结算成功，是否立刻打印小票?', '提示', {
                                    //     confirmButtonText: '打印',
                                    //     cancelButtonText: '取消',
@@ -1009,6 +1031,7 @@
                                } else {
                                    _this.$message.success(data.info);
                                }

                                if(parent.myGrid) {
                                    parent.myGrid.serchData();
                                }