Browse Source

审批代码

liujiankang 6 years ago
parent
commit
b93e3ce2af

File diff suppressed because it is too large
+ 39 - 82
watero-rst-web/src/main/webapp/WEB-INF/views/order/salesOrder/list_wait_send_order.ftl


+ 7 - 4
watero-rst-web/src/main/webapp/WEB-INF/views/order/salesOrder/print_order.ftl

@@ -8,7 +8,7 @@
     <meta http-equiv="Cache-Control" content="no-siteapp" />
     <link rel="Bookmark" href="/favicon.ico" >
     <link rel="Shortcut Icon" href="/favicon.ico" />
-    <#include "/base/add_base.ftl">
+<#include "/base/add_base.ftl">
     <script type="text/javascript" src="https://s.iamberry.com/js/LodopFuncs.js"></script>
     <title>打单发货</title>
 
@@ -31,7 +31,7 @@
                 </#list>
                 </div>
 
-            <!-- 选项卡 内容 -->
+                <!-- 选项卡 内容 -->
             <#assign x = 0>
             <#list page?values as value>
                 <div class="tabCon">
@@ -80,6 +80,8 @@
             <button type="button" class="btn btn-primary" style="background: #32a3d8;color: #fff;margin-left: -0.7%" id="sub-post">开始打印</button>
         </div>
 
+        <div id="temp-print-order" style="zoom:0.95;display:none"></div>
+
         <div id="print-pageview-div" style="display: none"></div>
     </div>
 
@@ -93,7 +95,7 @@
     var LODOP=getLodop();
     $(function () {
         $.Huitab("#tab_demo .tabBar span","#tab_demo .tabCon","current","click","0");
-         // 获取系统的打印机
+        // 获取系统的打印机
         //setPrintMachine();
         function setPrintMachine() {
             var count = LODOP.GET_PRINTER_COUNT() - 1;
@@ -169,9 +171,10 @@
                             var res = $.parseJSON(data.returnMsg.json);
                             if (data.resultMsg && res.Success) {
                                 var html = res.PrintTemplate;
+                                $("#temp-print-order").html(html);
                                 LODOP.PRINT_INIT('打印订单');
                                 LODOP.SET_PRINT_PAGESIZE(0, 0, 0,"");
-                                LODOP.ADD_PRINT_HTM("0mm","0mm","100%","100%", html);
+                                LODOP.ADD_PRINT_HTM("0mm","0mm","100%","100%", $("#temp-print-order").html());
                                 var flag = LODOP.PRINT();
                                 $(order.find("td")[0]).html("<span style='color: blue'>打印完成</span>");
                                 if (flag) {