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

jyy

2021-04-06 abe25c659140b8c3f4db90ce943f4143a7d7f40f

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

 zq-erp/src/main/java/com/matrix/system/hive/action/ProjServiceController.java

@@ -186,13 +186,7 @@
        AjaxResult result = AjaxResult.buildSuccessInstance("查询成功");

        SysProjUse queryUse = new SysProjUse();
        if(Objects.nonNull(vipId)){
            queryUse.setVipId(vipId);
        }else{
            SysVipInfo vipInfo = getCurrentVioInfo();
            queryUse.setVipId(vipInfo.getId());
        }

        queryUse.setVipId(vipId);
        queryUse.setType(Dictionary.SHOPPING_GOODS_TYPE_XM);
        queryUse.setTaocanId(-1L);
        queryUse.setStatus(Dictionary.TAOCAN_STATUS_YX);

 zq-erp/src/main/resources/static/js/function/vip.js

@@ -222,13 +222,13 @@
}


function openAddService() {
function openAddService(id) {
    layer.full(layer.open({
        type: 2,
        title: "添加服务单",
        maxmin: true,
        area: [MUI.SIZE_L, '500px'],
        content: [basePath + '/admin/redirect/hive/beautySalon/servicceAddForm']
        content: [basePath + '/admin/redirect/hive/beautySalon/servicceAddForm?id='+id]
    }));
}


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

@@ -928,10 +928,10 @@
                                let count = parseFloat(item.count);
                                let zkPrice = parseFloat(item.zkPrice);

                                if (optionType != 1) {
                                // if (optionType != 1) {
                                    //直接修改支付金额不重置支付金额
                                    item.payMoney = zkPrice * count;
                                }
                                // }
                                _this.order.payMoney += parseFloat(item.payMoney);

                                //重新计算业绩金额

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

@@ -1535,7 +1535,7 @@
                    return;
                }
                vipId = this.vipInfo.id;
                openAddService();
                openAddService(vipId);
            },
            // 开订单
            addOrder() {