From 7f9d058a0e632be6a3daf6f46d26b69742db0720 Mon Sep 17 00:00:00 2001
From: Junjie <fallin.jie@qq.com>
Date: 星期三, 08 十一月 2023 13:13:25 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/zycrm' into zycrm
---
src/main/webapp/static/js/plan/plan.js | 10 +++++-----
1 files changed, 5 insertions(+), 5 deletions(-)
diff --git a/src/main/webapp/static/js/plan/plan.js b/src/main/webapp/static/js/plan/plan.js
index cbc6d4b..4aad49b 100644
--- a/src/main/webapp/static/js/plan/plan.js
+++ b/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; // 闃绘榛樿鐨勯摼鎺ヨ烦杞涓�
});
--
Gitblit v1.9.1