modify

Helius

2021-03-12 6b19c95198431912cbc1792553353c14ac2993ab

modify

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

@@ -509,7 +509,7 @@
        if (balanceverifyResult.isError()) {
            return new AjaxResult(AjaxResult.STATUS_FAIL, balanceverifyResult.getMsg());
        }
        sysProjServices.setState(Dictionary.SERVICE_STATU_YYCG);
        sysProjServices.setState(Dictionary.SERVICE_STATU_DYY);
        SysProjServices newSysProjServices = sysProjServicesService.addSysProjServices(sysProjServices);
        if (newSysProjServices != null) {
            return AjaxResult.buildSuccessInstance(Arrays.asList(newSysProjServices));

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

@@ -220,7 +220,7 @@
    function cancelOrder() {
        var id=myGrid.getSelectItemId();
        layer.confirm('确定取消此订单？', {
            btn: ['确认', '取消并删除', '取消'] //可以无限个按钮
            btn: ['确认', '取消'] //可以无限个按钮
        }, function(index, layero){
            $.post(basePath+'/admin/order/cancelOrder?id='+id+'&del=0', {}, function(data){
                if (data.status == '200') {
@@ -231,13 +231,15 @@
                layer.closeAll();
                myGrid.serchData();
            });
        }, function(index){
            $.post(basePath+'/admin/order/cancelOrder?id='+id+'&del=1', {}, function(data){
                parent.layer.msg(data.info,{icon: 1});
                layer.closeAll();
                myGrid.serchData();
            });
        }, function(index){
        },
        //     function(index){
        //     $.post(basePath+'/admin/order/cancelOrder?id='+id+'&del=1', {}, function(data){
        //         parent.layer.msg(data.info,{icon: 1});
        //         layer.closeAll();
        //         myGrid.serchData();
        //     });
        // },
            function(index){
            //按钮【按钮二】的回调
        });
    }