Merge branch 'master' of http://gitlab.house365.com/xuzhou/njzsb

WebRoot/WEB-INF/pages/jfzm/Jfzm_List.jsp

@@ -642,7 +642,7 @@
     </script>
     <script>
         function doPrint(id) {
-            var jatoolsPrinter = document.getElementById("jatoolsPrinter");
+            // var jatoolsPrinter = document.getElementById("jatoolsPrinter");
             $.ajax({
                 url : "${ctx}/jsp/jfzm/queryDetail.action",
                 type: 'post',
@@ -650,22 +650,24 @@
                 data:{
                     id : id
                 },
-                async : false,
+                success: function (data) {
+                    alert(JSON.stringify(data))
+                }
             });
-            var tp = '${rfxm.mjyj}' == '002' || '${rfxm.mjyj}' == '004' ? 1 : 2;
-            myDoc = {
-                settings: {
-                    pageWidth: 2100,
-                    pageHeight: 1400,
-                    orientation: tp},
-                documents: document,
-                marginIgnored:true,
-                dragDesigner: {viewSource:true},
-                settingsID: 'mydoc3',
-                classesReplacedWhenPrint: new Array('.only_for_print{display:block}'),
-                copyrights: "杰创软件拥有版权  www.jatools.com"
-            }
-            jatoolsPrinter.printPreview(myDoc);
+            <%--var tp = '${rfxm.mjyj}' == '002' || '${rfxm.mjyj}' == '004' ? 1 : 2;--%>
+            <%--myDoc = {--%>
+            <%--    settings: {--%>
+            <%--        pageWidth: 2100,--%>
+            <%--        pageHeight: 1400,--%>
+            <%--        orientation: tp},--%>
+            <%--    documents: document,--%>
+            <%--    marginIgnored:true,--%>
+            <%--    dragDesigner: {viewSource:true},--%>
+            <%--    settingsID: 'mydoc3',--%>
+            <%--    classesReplacedWhenPrint: new Array('.only_for_print{display:block}'),--%>
+            <%--    copyrights: "杰创软件拥有版权  www.jatools.com"--%>
+            <%--}--%>
+            <%--jatoolsPrinter.printPreview(myDoc);--%>
         }
 
     </script>
@@ -730,7 +732,7 @@
         </div>
     </div>
 <%--  横联  --%>
-    <div>132</div>
+    <div></div>
     <c:if test="${rfxm.mjyj != '002' && rfxm.mjyj != '004'}">
         <div id="page1" class='only_for_print pagestyle' style='width:210mm;height:140mm;position:relative;'>
             <img class='screen-only' src="${ctx}/webResources/images/guihuaju.jpg" style="position:absolute;width:100%;height:100%"/>

src/com/jshx/jfzm/web/JfzmAction.java

 package com.jshx.jfzm.web;
 
+import com.google.gson.Gson;
 import com.jshx.core.base.action.BaseAction;
 import com.jshx.core.base.vo.Pagination;
 import com.jshx.core.json.CodeJsonValueProcessor;
 import com.jshx.core.json.DateJsonValueProcessor;
+import com.jshx.core.utils.Struts2Util;
 import com.jshx.paymentItemHis.entity.PaymentItemHis;
 import com.jshx.paymentItemHis.service.PaymentItemHisService;
 import com.jshx.rfxm.entity.Rfxm;
@@ -12,9 +14,11 @@ import com.jshx.xmxxb.entity.Xmxxb;
 import com.jshx.xmxxb.service.XmxxbService;
 import com.jshx.zsdw.service.ZsdwService;
 import com.neusoft.egov.utils.TextUtils;
+import net.sf.json.JSONObject;
 import net.sf.json.JsonConfig;
 import org.springframework.beans.factory.annotation.Autowired;
 
+import java.io.IOException;
 import java.util.HashMap;
 import java.util.Map;
 
@@ -130,6 +134,16 @@ public class JfzmAction extends BaseAction {
         rfxm = rfxmService.getById(id);
         xmxxb = xmxxbService.getById(rfxm.getXmxxbId());
         paymentItemHis = paymentItemHisService.getById(rfxm.getPaymentHisId());
+        JSONObject jo = new JSONObject();
+        jo.put("rfxm",rfxm);
+        jo.put("xmxxb",xmxxb);
+        jo.put("paymentItemHis",paymentItemHis);
+        try {
+            this.getResponse().getWriter().write(jo.toString());
+            this.getResponse().getWriter().flush();
+        } catch (IOException e) {
+            e.printStackTrace();
+        }
     }
 
     public Pagination getPagination() {
@@ -211,4 +225,28 @@ public class JfzmAction extends BaseAction {
     public void setId(String id) {
         this.id = id;
     }
+
+    public Rfxm getRfxm() {
+        return rfxm;
+    }
+
+    public void setRfxm(Rfxm rfxm) {
+        this.rfxm = rfxm;
+    }
+
+    public Xmxxb getXmxxb() {
+        return xmxxb;
+    }
+
+    public void setXmxxb(Xmxxb xmxxb) {
+        this.xmxxb = xmxxb;
+    }
+
+    public PaymentItemHis getPaymentItemHis() {
+        return paymentItemHis;
+    }
+
+    public void setPaymentItemHis(PaymentItemHis paymentItemHis) {
+        this.paymentItemHis = paymentItemHis;
+    }
 }