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

Junjie

2023-11-08 7f9d058a0e632be6a3daf6f46d26b69742db0720

 src/main/webapp/static/js/plan/plan.js

@@ -279,14 +279,13 @@
        });

        var file = _uploadFile

        var filename = dateToStr2(new Date()) + "_" + file.name
        $("#upload-filename-id-" + file.lastModified).html(filename)
        $("#upload-file-id-" + file.lastModified).html("上传中")

        putObject(file, filename).then((result) => {
        putObject(file).then((result) => {
            var filename = result.name
            layer.msg('上传成功', {icon: 1});
            $("#upload-file-id-" + file.lastModified).html("上传成功")
            $("#upload-filename-id-" + file.lastModified).html(filename)

            $.ajax({
                url: baseUrl+"/plan/insert/file/auth",
@@ -657,7 +656,8 @@
        var downloadUrl = $(this).attr('href');
        let url = getObjectUrl(downloadUrl)
        layer.msg("准备下载中", {icon: 1});
        location.href = url
        // location.href = url
        window.open(url)
        return false;  // 阻止默认的链接跳转行为
    });