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 |   16 ++++++++--------
 1 files changed, 8 insertions(+), 8 deletions(-)

diff --git a/product-server-web/src/main/resources/templates/webOffice.html b/product-server-web/src/main/resources/templates/webOffice.html
index dd92f9b..107cb94 100644
--- a/product-server-web/src/main/resources/templates/webOffice.html
+++ b/product-server-web/src/main/resources/templates/webOffice.html
@@ -259,14 +259,17 @@
             var signature = [[${signature}]];
             let data = JSON.parse([[${requestParaTemp}]]);
             var formData = JSON.stringify(data);
-            alert(formData)
             WebOffice.HttpAddPostString('signature', signature);
             WebOffice.HttpAddPostString('~table~', 'product_sys_attachments');
             WebOffice.HttpAddPostString('formData', formData);
             WebOffice.HttpAddPostCurrFile("docfile", "");//姝ゅ彞涓哄浐瀹氳鍙ワ紝涓嶇鏄繚瀛榳ord杩樻槸excel,ppt绛夐兘杩欐牱鍐�
             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;//濡傛灉淇濆瓨鎴愬姛锛岀紪绋嬫椂璁╂湇鍔″櫒鎺ユ敹浠g爜濡倁pload.jsp,upload.aspx,upload.php绛夎繑鍥炵┖鍊兼垨OK瀛椾覆銆�
         } catch (e) {
             console.error(e);
-            alert('鍙戠敓閿欒锛佽浣跨敤鏌ラ槄杩斿洖鍊硷紒');
+            //鑾峰彇閿欒淇℃伅
+            alert('鍙戠敓閿欒锛佽浣跨敤鏌ラ槄杩斿洖鍊硷紒' + e.message);
         }
     }
 

--
Gitblit v1.9.2