jyy
2021-06-19 756e16e090b15c7fd8648f55f5451367face6abc
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;
@@ -1044,28 +1044,29 @@
                            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){
                                    //如果是储值卡支付,则业绩自动切换到划扣金额
                                    achieve.payMethod="划扣";
                                }
                                        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;
@@ -1171,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();
            },