Helius
2021-04-06 997831bb8c314d781e6cc5533898ffbe077dd3b6
modify
3 files modified
14 ■■■■ changed files
zq-erp/src/main/java/com/matrix/system/hive/action/ProjServiceController.java 8 ●●●● patch | view | raw | blame | history
zq-erp/src/main/resources/static/js/function/vip.js 4 ●●●● patch | view | raw | blame | history
zq-erp/src/main/resources/templates/views/admin/hive/beautySalon/vip.html 2 ●●● patch | view | raw | blame | history
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/vip.html
@@ -1535,7 +1535,7 @@
                    return;
                }
                vipId = this.vipInfo.id;
                openAddService();
                openAddService(vipId);
            },
            // 开订单
            addOrder() {