Merge remote-tracking branch 'origin/api' into api

jyy

2021-01-19 0a67d6a24417507a27e03d53da82bbd802257148

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

@@ -951,17 +951,30 @@
                            }
                            if (item.uuid == achieve.orderItem.uuid) {
                                let achieveNew = {
                                    uuid:item.uuid,
                                    beaultId: achieve.saleId,
                                    t1: achieve.achieveMoney,
                                    t3: achieve.t3,
                                    projPercentage: achieve.commission,
                                };
                                item.achaeveList.push(achieveNew);

                                var flag = true;
                                for(var j = 0; j < item.achaeveList.length; j++) {
                                    if(item.achaeveList[j].uuid == achieveNew.uuid && item.achaeveList[j].beaultId == achieveNew.beaultId) {
                                        flag = false;
                                        break;
                                    }
                                }

                                if (flag) {
                                    item.achaeveList.push(achieveNew);
                                }
                                break;
                            }
                        }
                    })

                    console.log(_this.order);
                    //校验业绩金额
                    if (_this.checkAchieve()) {
                        let url = basePath + "/admin/order/payOrder";
@@ -982,7 +995,7 @@
                                    if (_this.printPaper) {
                                        _this.print();
                                    }
                                    _this.closeFram();
                                    // _this.closeFram();
                                    // _this.$confirm('结算成功，是否立刻打印小票?', '提示', {
                                    //     confirmButtonText: '打印',
                                    //     cancelButtonText: '取消',
@@ -1222,6 +1235,13 @@
                            }
                        } else {
                            Vue.set(item,'isActive',true);
                            var hasAmount = 0;
                            for(var i = 0; i < payMoneys.length; i++) {
                                hasAmount += parseFloat(payMoneys[i].money);
                            }
                            if (_this.order.payMoney - hasAmount > 0) {
                                Vue.set(item, 'money', _this.order.payMoney - hasAmount);
                            }
                            _this.payMoneys.push(item);
                        }
                    });