Merge branch 'score_shop' into api_score_meger

935090232@qq.com

2022-01-24 6d78f8ab222498d727e91983d0511d8119d95aa3

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

@@ -911,7 +911,7 @@
                        this.achieveList.push({
                            orderItem: item,
                            staff: this.loginUser,
                            saleId: this.loginUser.suId,
                            saleId: _this.loginUser.suUserType === 'admin' ? '' : this.loginUser.suId,
                            goodsCash: item.payMoney,
                            achieveType : _this.achieveTypeList[0].value,
                            commission: 0,
@@ -1103,6 +1103,7 @@
                                //结算打印提示
                                if (submitType == 1) {
                                    if (_this.printPaper) {
                                        _this.$message.success(data.info);
                                        _this.print();
                                    } else {
                                        _this.$message.success({