longz
2026-05-07 6fb7c01ece7ac072e652c44250a8b62618d8fd97
退单设置
4个文件已修改
66 ■■■■■ 已修改文件
ManagementYKDTravel/guns-admin/src/main/java/com/stylefeng/guns/modular/system/controller/general/TSysReformistController.java 11 ●●●●● 补丁 | 查看 | 原始文档 | blame | 历史
ManagementYKDTravel/guns-admin/src/main/webapp/WEB-INF/view/system/tOpenCity/tSysReformist.html 27 ●●●●● 补丁 | 查看 | 原始文档 | blame | 历史
ManagementYKDTravel/guns-admin/src/main/webapp/static/js/common/web-upload-image.js 16 ●●●●● 补丁 | 查看 | 原始文档 | blame | 历史
ManagementYKDTravel/guns-admin/src/main/webapp/static/js/common/web-upload-object.js 12 ●●●●● 补丁 | 查看 | 原始文档 | blame | 历史
ManagementYKDTravel/guns-admin/src/main/java/com/stylefeng/guns/modular/system/controller/general/TSysReformistController.java
@@ -322,6 +322,9 @@
                        Integer sjzp1, Integer sjzp2, Integer zuc1, Integer zuc2, Integer mc1, Integer mc2,
                        Integer czgrcl1, Integer czgrcl2, Integer mac1, Integer mac2, Integer sjzx1, Integer sjzx2,
                        Integer dck1, Integer dck2,Integer driverDays,Integer pushType) {
        if (openCityId == null){
            openCityId = ShiroKit.getUser().getObjectId();
        }
        //改派设置
        if("reassigningSet".equals(type)){
            TSysReformist reformist = tSysReformistService.selectOne(new EntityWrapper<TSysReformist>().eq("openCityId", openCityId));
@@ -400,6 +403,10 @@
                sysPushType.setOpenCityId(openCityId);
                sysPushType.setPushType(pushType);
                tSysPushTypeService.updateById(sysPushType);
            }
            if (pushType != null && pushType == 2) {
                return ResultUtil.success();
            }
@@ -516,6 +523,10 @@
        //取消设置
        if("cancelOrderSettings".equals(type)){
            TSysPushType currentPushType = tSysPushTypeService.selectOne(new EntityWrapper<TSysPushType>().eq("openCityId", openCityId));
            if (currentPushType != null && currentPushType.getPushType() != null && currentPushType.getPushType() == 2) {
                return ResultUtil.success();
            }
            //普通取消设置(快车)
            TSysCancleOrder ptCancelOne = tSysCancleOrderService.selectOne(new EntityWrapper<TSysCancleOrder>().eq("openCityId", openCityId).eq("type", 1).eq("orderType", 1));
            if (SinataUtil.isNotEmpty(ptCancelOne)){
ManagementYKDTravel/guns-admin/src/main/webapp/WEB-INF/view/system/tOpenCity/tSysReformist.html
@@ -60,7 +60,7 @@
                        </div>
                        <div style="float: left;width: 1200px;margin-left: 50px;">
                            <div class="pushOrderSettings">
                                <div class="form-group">
                                <div class="form-group pushCarSettings">
                                    <label class="col-sm-2 control-label">推单设置:</label>
                                    <div class="col-sm-10">
                                        <div class="radio radio-danger">
@@ -79,7 +79,7 @@
                                        </div>
                                    </div>
                                </div>
                                <div class="form-group">
                                <div class="form-group pushCarSettings">
                                    <label class="col-sm-2 control-label">快车推单:</label>
@@ -743,8 +743,8 @@
    }
    function checkedLable(e) {
        $(e).attr('class', 'lab checked');
        let tag = $(e).attr('tag');
        $(e).attr('class', 'lab checked');
        $('.' + tag).show();
        $(e).siblings().each(function (i, el) {
            $(el).attr('class', 'lab');
@@ -814,6 +814,13 @@
        var czc8 = null == $("#czc8").val() ? "0" : $("#czc8").val().trim();
        var czc9 = null == $("#czc9").val() ? "0" : $("#czc9").val().trim();
        if(type == 'pushOrderSettings'){
            if (pushType == 2) {
                ajax.set("pushType", pushType);
                ajax.set("type", type);
                ajax.set("openCityId", openCityId);
                ajax.start();
                return;
            }
            if("" == zc1 || "" == zc2 || "" == zc3 || "" == zc4 || "" == zc5 || "" == zc6 || "" == zc7 || "" == zc8 || "" == zc9
                || "" == czc1 || "" == czc2 || "" == czc3 || "" == czc4 || "" == czc5 || "" == czc6 || "" == czc7 || "" == czc8 || "" == czc9){
                Feng.info("输入框不能为空!");
@@ -1074,5 +1081,19 @@
    }
    function syncPushModeDisplay() {
        var pushType = $("input[name='pushOrderMode']:checked").val();
        if (pushType == 2) {
            $(".pushCarSettings").hide();
        } else {
            $(".pushCarSettings").show();
        }
    }
    $("input[name='pushOrderMode']").on("change", syncPushModeDisplay);
    $(function() {
        syncPushModeDisplay();
    });
</script>
@}
ManagementYKDTravel/guns-admin/src/main/webapp/static/js/common/web-upload-image.js
@@ -84,9 +84,19 @@
            // 文件上传成功,给item添加成功class, 用样式标记上传成功。
            bindedObj.on('uploadSuccess', function(file,response) {
                if (response.code == 200) {
                var uploadPath = null;
                if (typeof response === "string") {
                    uploadPath = response;
                } else if (response != null) {
                    if (response.code == 200 || response.status == 200) {
                        uploadPath = response.data || response.str || response.url || response.imgUrl;
                    } else {
                        uploadPath = response.data || response.str || response.url || response.imgUrl;
                    }
                }
                if (uploadPath) {
                    Feng.success("上传成功");
                    $("#" + me.pictureId).val(response.data);
                    $("#" + me.pictureId).val(uploadPath);
                } else {
                    Feng.error("上传失败");
                }
@@ -127,4 +137,4 @@
    window.$WebUploadImage = $WebUploadImage;
}());
}());
ManagementYKDTravel/guns-admin/src/main/webapp/static/js/common/web-upload-object.js
@@ -84,9 +84,15 @@
            // 文件上传成功,给item添加成功class, 用样式标记上传成功。
            bindedObj.on('uploadSuccess', function(file,response) {
                if (response!=null) {
                var uploadPath = null;
                if (typeof response === "string") {
                    uploadPath = response;
                } else if (response != null) {
                    uploadPath = response.data || response.str || response.url || response.imgUrl;
                }
                if (uploadPath) {
                    Feng.success("上传成功");
                    $("#" + me.pictureId).val(response.data);
                    $("#" + me.pictureId).val(uploadPath);
                } else {
                    Feng.error("上传失败");
                }
@@ -127,4 +133,4 @@
    window.$WebUpload = $WebUpload;
}());
}());