Merge branch 'score_shop' into api_score_meger

jyy

2021-06-19 e522e4d40451b4e46ec79b3d8a3891899196f14f

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

@@ -767,7 +767,7 @@
                                                    commission : 0,
                                                    achieveType : _this.achieveTypeList[0].value,
                                                    isShare: false,
                                                    payMethod:item.payMethod,
                                                    payMethod:"现金",
                                                });
                                            });
                                            _this.order.payMoney = orderPayMoney;
@@ -999,9 +999,14 @@

                if (this.checkSubmitOrder()) {
                    let _this = this;
                    //是否全部为储值卡支付
                    let isCardPay=true;

                    if(submitType == 1) {
                        //校验支付方式



                        if (_this.payMoneys.length > 0) {
                            let flows = []
                            var total = 0;
@@ -1019,6 +1024,8 @@
                                if (item.type == '储值卡'){
                                    flow.isGift = item.isGift;
                                    flow.cardId = item.id;
                                }else{
                                    isCardPay=false;
                                }
                                total += parseFloat(item.money);
                                flows.push(flow)
@@ -1028,27 +1035,38 @@
                                return false;
                            }
                            _this.order.flows = flows;




                        } else {
                            this.$message.warning("请选择支付方式");
                            return false;
                        }
                    }
                    console.log("isCardPay",isCardPay);

                    //匹配业绩
                    _this.order.items.forEach(item=>{
                        item.achieveList = [];
                    })
                    _this.achieveList.forEach(achieve => {
                        for (let i = 0; i < _this.order.items.length; i++) {
                            let item = _this.order.items[i];
                            if (!item.achieveList){
                                item.achieveList = [];
                            }
                            if (item.uuid == achieve.orderItem.uuid) {

                                let payMethod=achieve.payMethod;
                                    if(isCardPay){
                                    //如果是储值卡支付，则业绩自动切换到划扣金额
                                        payMethod="划扣";
                                    }
                                let achieveNew = {
                                    uuid:item.uuid,
                                    beaultId: achieve.saleId,
                                    projPercentage: achieve.commission,
                                    achieveType: achieve.achieveType,
                                    goodsCash: achieve.goodsCash,
                                    payMethod: achieve.payMethod,
                                    payMethod: payMethod,
                                };
                               item.achieveList.push(achieveNew);
                                break;
@@ -1154,9 +1172,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();
            },