From 7582a36005ab112a80815454985f2bb9ffe17934 Mon Sep 17 00:00:00 2001
From: 许鹏程 <1821349743@qq.com>
Date: 星期三, 16 八月 2023 11:56:58 +0800
Subject: [PATCH] xn commit
---
product-server-web/src/main/resources/templates/webOffice.html | 20 ++++++++++----------
1 files changed, 10 insertions(+), 10 deletions(-)
diff --git a/product-server-web/src/main/resources/templates/webOffice.html b/product-server-web/src/main/resources/templates/webOffice.html
index 520706f..107cb94 100644
--- a/product-server-web/src/main/resources/templates/webOffice.html
+++ b/product-server-web/src/main/resources/templates/webOffice.html
@@ -121,11 +121,12 @@
* @param formData
*/
function planEditDocument() {
+ console.log(formData)
if (readOnly != 1) {
$.post("/lx/api/office/document-edit-plan/v1", {
'signature': signature,
- 'formData': encodeURI(formData)
+ 'formData': formData
}, function (data, status) {
if (data && data.code == 200) {
setTimeout(openOffice, 500)
@@ -262,11 +263,13 @@
WebOffice.HttpAddPostString('~table~', 'product_sys_attachments');
WebOffice.HttpAddPostString('formData', formData);
WebOffice.HttpAddPostCurrFile("docfile", "");//姝ゅ彞涓哄浐瀹氳鍙ワ紝涓嶇鏄繚瀛榳ord杩樻槸excel,ppt绛夐兘杩欐牱鍐�
-
- //strResults鐢ㄤ簬鑾峰緱缃戦〉鎻愪氦鍚庣殑杩斿洖鏁版嵁锛屽彲鐢ㄤ互璋冭瘯鏈嶅姟鍣ㄧ浠ｇ爜銆�
var strResults = WebOffice.HttpPost(strSaveUrl);
- console.log(strResults)
- if (strResults) {
+
+ if (strResults) { //灏唖trResults杞崲涓哄皬鍐� 鍒ゆ柇瀛楃涓叉槸鍚﹀寘鍚玜ctive 鍜宔vent
+ if (strResults.toLowerCase().indexOf('active') != -1 && strResults.toLowerCase().indexOf('event') != -1) {
+ //淇濆瓨鎴愬姛
+ return;
+ }
var res = JSON.parse(strResults);
if (res && res.code != 200) {
if (res.code == "90021" || res.code == '90044') {
@@ -277,14 +280,11 @@
}
alert(res.msg);
}
- // alert(strResults)
- // JSON.parse()
}
- // alert(strResults);//鐢╝lert璇彞鍙互鏄剧ず鏈嶅姟鍣ㄧ缃戦〉杩斿洖鐨勬暟鎹�
- // strResults;//濡傛灉淇濆瓨鎴愬姛锛岀紪绋嬫椂璁╂湇鍔″櫒鎺ユ敹浠ｇ爜濡倁pload.jsp,upload.aspx,upload.php绛夎繑鍥炵┖鍊兼垨OK瀛椾覆銆�
} catch (e) {
console.error(e);
- alert('鍙戠敓閿欒锛佽浣跨敤鏌ラ槄杩斿洖鍊硷紒');
+ //鑾峰彇閿欒淇℃伅
+ alert('鍙戠敓閿欒锛佽浣跨敤鏌ラ槄杩斿洖鍊硷紒' + e.message);
}
}
--
Gitblit v1.9.2