Merge branch 'api_score_meger'

935090232@qq.com

2022-02-20 c253b555c7905c5136d47cd615ef545fa50cc6ad

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

@@ -160,7 +160,7 @@
            title: "打印服务单",
            area: ['250px', '550px'],
            maxmin: true,
            content: [basePath + '/admin/redirect/hive/beautySalon/print-service?id=' + id]
            content: [basePath + '/admin/projService/printOrder?id=' + id]
        });
    }

@@ -176,7 +176,13 @@
                c : false
            }).invoke(basePath+"/admin/projService/hkService?id="+id, function(loj) {
                layer.msg(loj.getValue("info"),{icon:1,time:2000},function(){
                    if (parent.myGrid) {
                    parent.myGrid.serchData();
                    }

                    if (parent.app) {
                        parent.app.serviceOrderQuery();
                    }
                    MTools.closeForm()
                });
            });