From bb71b47a43244e6db57cbc3cd0223bc5a64023d7 Mon Sep 17 00:00:00 2001
From: Junjie <fallin.jie@qq.com>
Date: 星期五, 10 十一月 2023 10:40:12 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/zycrm' into zycrm
---
src/main/webapp/static/js/plan/plan.js | 10 +++++++---
1 files changed, 7 insertions(+), 3 deletions(-)
diff --git a/src/main/webapp/static/js/plan/plan.js b/src/main/webapp/static/js/plan/plan.js
index 531ab26..eb46181 100644
--- a/src/main/webapp/static/js/plan/plan.js
+++ b/src/main/webapp/static/js/plan/plan.js
@@ -204,8 +204,9 @@
,{field: 'center', align: 'left',title: '鍏宠仈娴佺▼', toolbar: '#tbLook', minWidth: 160, hide: false}
,{field: 'assistantHostSign$', align: 'left',title: '涓诲壇鏍囪', hide: false}
,{field: 'assistantHostSign', align: 'left',title: '涓诲壇鏍囪', hide: true}
- ,{field: 'hostPlanId', align: 'left',title: '涓籌D', hide: false}
- ,{field: 'assistantPlanId', align: 'left',title: '鍓疘D', hide: false}
+ ,{field: 'hostPlanId', align: 'left',title: '涓籌D', hide: true}
+ ,{field: 'assistantPlanId', align: 'left',title: '鍓疘D', hide: true}
+ // ,{field: 'assistantPlanIdSignType', align: 'left',title: '闆嗘垚璐ф灦鏍囧織', hide: true}
,{fixed: 'right', title:'鎿嶄綔', align: 'center', toolbar: '#operate', width: 340}
]],
request: {
@@ -285,7 +286,10 @@
var file = _uploadFile
$("#upload-file-id-" + file.lastModified).html("涓婁紶涓�")
- putObject(file).then((result) => {
+ putObject(file,(p) => {
+ // console.log(p)
+ $("#upload-file-id-" + file.lastModified).html("涓婁紶涓細" + (Math.round(p * 100)) + "%")
+ }).then((result) => {
var filename = result.name
layer.msg('涓婁紶鎴愬姛', {icon: 1});
$("#upload-file-id-" + file.lastModified).html("涓婁紶鎴愬姛")
--
Gitblit v1.9.1