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

* 'master' of http://gitlab.house365.com/xuzhou/njzsb:
  打印

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

@@ -643,7 +643,7 @@
     <script>
         function doPrint(id) {
 
-            createSimpleWindow("win_paymentVoucher","打印缴费凭证","${ctx}/jsp/jfzm/print.action?id="+id,850,700);
+            createSimpleWindow("win_paymentVoucher","打印缴费凭证","${ctx}/jsp/jfzm/print.action?id="+id,350,100);
             // var jatoolsPrinter = document.getElementById("jatoolsPrinter");
             <%--$.ajax({--%>
             <%--    url : "${ctx}/jsp/jfzm/queryDetail.action",--%>

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

@@ -426,7 +426,12 @@
     <%@include file="/common/jsLib.jsp"%>
     <script type="text/javascript" src="${ctx}/webResources/js/jatoolPrinter.js"></script>
     <script>
-        function doPrint(type) {
+
+        $(function(){
+            doPrint()
+            parent.close_win('win_paymentVoucher')
+        })
+        function doPrint() {
             myDoc = {
                 settings: {
                     pageWidth: 2100,
@@ -439,14 +444,10 @@
                 classesReplacedWhenPrint: new Array('.only_for_print{display:block}'),
                 copyrights: "杰创软件拥有版权  www.jatools.com"
             }
-            var jatoolsPrinter = document.getElementById("jatoolsPrinter");
-            if("pre"==type){
-                updateZslxdbh();
-                jatoolsPrinter.printPreview(myDoc);
-            }else if("print"==type){
-                updateZslxdbh();
-                jatoolsPrinter.print(myDoc,true);
-            }
+            var jatoolsPrinter = document.getElementById("jatoolsPrinter")
+            jatoolsPrinter.printPreview(myDoc);
+
+
         }
     </script>
 </head>
@@ -458,8 +459,7 @@
                 <table width="100%">
                     <tr>
                         <td colspan="4" height="100px" style="text-align:center">
-                            <a href="#" class="btn_01" onclick="doPrint('print')">打印${xmxxb.jsdw}<b></b></a>
-                            <a href="#" class="btn_01" onclick="doPrint('pre')">打印预览<b></b></a>
+                            <a href="#" class="btn_01" onclick="doPrint()">打印预览<b></b></a>
                             <a href="#" class="btn_01" onclick="parent.close_win('win_paymentVoucher');">关闭<b></b></a>
                         </td>
                     </tr>
@@ -512,7 +512,7 @@
         <div id='33' draggable='true' class='f33'>${paymentItemHis.zslxdbh}</div>
 <%--        <div id='34' draggable='true' class='f34'>${jbr}</div>--%>
         <c:if test="${rfxm.isRfyz=='1'}">
-            <div id='36' draggable='true' class='f36'><img src="${ctx}/images/img/zhang1.png" alt=""></div>
+            <div id='36' draggable='true' class='f36'><img src="${ctx}/images/img/zhang3.png" alt=""></div>
             <div id='37' draggable='true' class='f37'><img src="${ctx}/images/img/zhang1.png" alt=""></div>
         </c:if>
         <c:if test="${rfxm.isSbj=='1'}">