From d6f1c45753a418eb9ae191d9841d10ca1c71b51b Mon Sep 17 00:00:00 2001
From: huqi <hq_1980@hotmail.com>
Date: Thu, 6 Aug 2020 10:08:56 +0800
Subject: [PATCH] =?UTF-8?q?=E4=BF=AE=E6=94=B9=E8=8E=B7=E5=8F=96=E6=B5=81?=
 =?UTF-8?q?=E8=BD=AC=E5=AE=8C=E6=88=90=E5=90=8E=E9=99=84=E4=BB=B6=E7=9A=84?=
 =?UTF-8?q?=E6=9C=8D=E5=8A=A1=E5=9C=B0=E5=9D=80?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../services/x_processplatform_assemble_surface.json |  2 +-
 .../Module/Documenteditor/templete/standard.html     | 12 +-----------
 .../x_component_process_Xform/Documenteditor.js      |  1 -
 3 files changed, 2 insertions(+), 13 deletions(-)

diff --git a/o2web/source/o2_core/o2/xAction/services/x_processplatform_assemble_surface.json b/o2web/source/o2_core/o2/xAction/services/x_processplatform_assemble_surface.json
index 8ee0895e76..37f61e4d30 100644
--- a/o2web/source/o2_core/o2/xAction/services/x_processplatform_assemble_surface.json
+++ b/o2web/source/o2_core/o2/xAction/services/x_processplatform_assemble_surface.json
@@ -230,7 +230,7 @@
   "getWorkcompletedAttachmentStream": {"uri": "/jaxrs/attachment/download/{id}/workcompleted/{workCompletedId}/stream", "method": "GET"},
 
   "getAttachment": {"uri": "/jaxrs/attachment/{id}/work/{workid}"},
-  "getAttachmentWorkcompleted": {"uri": "/jaxrs/attachment/{id}/workCompletedId/{workCompletedId}"},
+  "getAttachmentWorkcompleted": {"uri": "/jaxrs/attachment/{id}/workcompleted/{workCompletedId}"},
   "deleteAttachment": {"uri": "/jaxrs/attachment/{id}/work/{workid}", "method": "DELETE"},
   "deleteWorkCompletedAttachment": {"uri": "/jaxrs/attachment/{id}/workcompleted/{workCompletedId}", "method": "DELETE"},
 
diff --git a/o2web/source/x_component_process_FormDesigner/Module/Documenteditor/templete/standard.html b/o2web/source/x_component_process_FormDesigner/Module/Documenteditor/templete/standard.html
index 59135337ab..0741b6aee5 100644
--- a/o2web/source/x_component_process_FormDesigner/Module/Documenteditor/templete/standard.html
+++ b/o2web/source/x_component_process_FormDesigner/Module/Documenteditor/templete/standard.html
@@ -1,12 +1,4 @@
 <style>
-    @page
-    {mso-page-border-surround-header:no;
-        mso-page-border-surround-footer:no;
-        mso-footnote-separator:url("http://develop.o2oa.net/x_component_process_FormDesigner/Module/Documenteditor/templete/header.htm") fs;
-        mso-footnote-continuation-separator:url("http://develop.o2oa.net/x_component_process_FormDesigner/Module/Documenteditor/templete/header.htm") fcs;
-        mso-endnote-separator:url("http://develop.o2oa.net/x_component_process_FormDesigner/Module/Documenteditor/templete/header.htm") es;
-        mso-endnote-continuation-separator:url("http://develop.o2oa.net/x_component_process_FormDesigner/Module/Documenteditor/templete/header.htm") ecs;
-        mso-facing-pages:yes;}
     @page WordSection1
     {size:595.3pt 841.9pt;
         margin:104.9pt 73.7pt 99.25pt 79.4pt;
@@ -17,8 +9,6 @@
         letter-spacing:-0.4pt;
         mso-header-margin:42.55pt;
         mso-footer-margin:70.9pt;
-        mso-even-footer:url("http://develop.o2oa.net/x_component_process_FormDesigner/Module/Documenteditor/templete/header.htm") ef1;
-        mso-footer:url("http://develop.o2oa.net/x_component_process_FormDesigner/Module/Documenteditor/templete/header.htm") f1;
         mso-paper-source:0;
     }
     div.WordSection1
@@ -130,7 +120,7 @@
 
     <!--  红头  -->
     <div class="doc_block">
-        <p class="MsoRedHeader" align=center style='text-align:center;line-height:auto;  mso-line-height-rule:exactly;'><b>
+        <p class="MsoRedHeader" align=center style='text-align:center;line-height:16pt; height: 160pt; mso-line-height-rule:exactly;'><b>
             <span class="doc_layout_redHeader" style='font-size:42.0pt;font-family:宋体;color:red;letter-spacing:normal'>红头文件</span>
         </b></p>
     </div>
diff --git a/o2web/source/x_component_process_Xform/Documenteditor.js b/o2web/source/x_component_process_Xform/Documenteditor.js
index be3859498f..75d225e706 100644
--- a/o2web/source/x_component_process_Xform/Documenteditor.js
+++ b/o2web/source/x_component_process_Xform/Documenteditor.js
@@ -1520,7 +1520,6 @@ MWF.xApplication.process.Xform.Documenteditor = MWF.APPDocumenteditor =  new Cla
         if (layout.mobile) this.doublePageAction.hide();
 
 
-
         this.zoomActionArea =  new Element("div", {"styles": {"float": "right", "margin-right": "10px"}}).inject(this.toolbarNode);
         if (this.json.isScale !== "y") this.zoomActionArea.hide();
         this.zoomAddAction = new Element("div", {
-- 
GitLab