Merge branch 'ty_urgent' into test

Helius

2020-12-19 a9bb3348487c4a75c6a74a4d84f3a8afe9858d0c

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

@@ -818,7 +818,13 @@
                                } else {
                                    _this.$message.success(data.info);
                                }
                                parent.myGrid.serchData();
                                if(parent.myGrid) {
                                    parent.myGrid.serchData();
                                }

                                if (parent.app) {
                                    parent.app.orderQuery();
                                }
                            }
                        });
                    }
@@ -888,9 +894,9 @@
             */
            chouseGoods() {
                let _this = this;
                this.multipleSelection.forEach(item => {
                    _this.pushToSelectGoods(item, BUY_TYPE_NOT_FREE);
                });
                // this.multipleSelection.forEach(item => {
                //     _this.pushToSelectGoods(item, BUY_TYPE_NOT_FREE);
                // });
                this.closeXm();
                this.calculationTotal();
            },