Merge branch 'api' into hive2.0

jyy

2021-01-26 5e43281d1d7a103c8f211ae5c86df7c89466e13b

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

@@ -382,7 +382,7 @@
            title="业绩设置"
            :visible.sync="drawer"
            :direction="direction"
            size="50%"
            size="90%"
    >
        <el-row>
            <el-col :span="24">
@@ -835,7 +835,18 @@
                    }
                    item.count = 1;


                    if (this.staffUser.suId) {
                        //加入业绩
                        this.achieveList.push({
                            orderItem: item,
                            staff: this.staffUser,
                            saleId: this.staffUser.suId,
                            achieveMoney: item.payMoney,
                            t3: '现金业绩',
                            commission: 0,
                            isShare: false,
                        });
                    } else {
                    //加入业绩
                    this.achieveList.push({
                        orderItem: item,
@@ -846,6 +857,7 @@
                        commission : 0,
                        isShare: false,
                    });
                    }
                    this.order.items.push(item);
                }

@@ -887,7 +899,14 @@
                                    item.payMoney = zkPrice * count;
                                }
                                _this.order.payMoney += parseFloat(item.payMoney);

                                _this.achieveList.forEach(achieve=>{
                                    if(achieve.orderItem==item){
                                        achieve.achieveMoney=item.payMoney;
                                    }
                                })
                            });

                            //计算欠款
                            // _this.order.arrears = _this.order.zkTotal - _this.order.payMoney;
                            // if (_this.order.arrears < 0) {