Ver código fonte

打印订单页面支持IE和非IE浏览器

xian 5 anos atrás
pai
commit
1fa56b7e3d

+ 2 - 2
watero-rst-web/src/main/webapp/WEB-INF/views/cm/inspection/detect_list.ftl

@@ -480,10 +480,9 @@
 </div>
 <div style="padding-top: 10px;"></div>
 <#include "/base/page_util.ftl">
-<script type="text/javascript" src="https://s.iamberry.com/js/LodopFuncs_v_2_0.js"></script>
+<script type="text/javascript" src="https://s.iamberry.com/js/LodopFuncs_v_5_0.js"></script>
 <script type="text/javascript" src="${path}/common/lib/jquery.PrintArea/jquery.PrintArea.js"></script>
 <script type="text/javascript">
-    var LODOP=getLodop();
 
     function to_detectState(state) {
         window.location.href= "${path}/admin/detect/select_detect_list?state="+state;
@@ -514,6 +513,7 @@
 
     // 选择打印设备
     function printPageMaintenance(detectId) {
+        var LODOP=getLodop();
         //获取打印数据
         $.ajax({
             cache: true,

+ 2 - 2
watero-rst-web/src/main/webapp/WEB-INF/views/order/salesOrder/list_wait_send_order.ftl

@@ -9,7 +9,7 @@
     <link rel="Bookmark" href="/favicon.ico" >
     <link rel="Shortcut Icon" href="/favicon.ico" />
     <#include "/base/list_base.ftl">
-    <script type="text/javascript" src="//s.iamberry.com/js/LodopFuncs_v_2_0.js"></script>
+    <script type="text/javascript" src="//s.iamberry.com/js/LodopFuncs_v_5_0.js"></script>
     <link href="${path}/common/lib/lightbox2/2.8.1/css/lightbox.css" rel="stylesheet" type="text/css" >
     <title>待发货订单列表</title>
     <style>
@@ -242,7 +242,6 @@
 </div>
 <#include "/base/page_util.ftl">
 <script type="text/javascript">
-    var LODOP=getLodop();
     $(function () {
         $("#print-order-send").click(function() {
             var inputs = $(".salesid-input:checked");
@@ -283,6 +282,7 @@
     });
 
     function re_print_order(orderId) {
+        var LODOP=getLodop();
         // 选择打印设备,注意:选择打印机时,需要区别IE类浏览器和非IE浏览器
         var isIE = (navigator.userAgent.indexOf('MSIE')>=0) || (navigator.userAgent.indexOf('Trident')>=0);
         if (!isIE) {

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

@@ -9,7 +9,7 @@
     <link rel="Bookmark" href="/favicon.ico" >
     <link rel="Shortcut Icon" href="/favicon.ico" />
     <#include "/base/add_base.ftl">
-    <script type="text/javascript" src="https://s.iamberry.com/js/LodopFuncs_v_2_0.js"></script>
+    <script type="text/javascript" src="https://s.iamberry.com/js/LodopFuncs_v_5_0.js"></script>
     <title>打单发货</title>
 
 </head>
@@ -92,7 +92,6 @@
 
 <script type="text/javascript">
     // 选择打印设备
-    var LODOP=getLodop();
     var selPrinter = -1;
     $(function () {
         $.Huitab("#tab_demo .tabBar span","#tab_demo .tabCon","current","click","0");
@@ -114,6 +113,7 @@
                 layer.msg("未选中订单",{icon: 2,time:3000});
                 return;
             }
+            var LODOP=getLodop();
             // 选择打印设备,注意:选择打印机时,需要区别IE类浏览器和非IE浏览器
             var isIE = (navigator.userAgent.indexOf('MSIE')>=0) || (navigator.userAgent.indexOf('Trident')>=0);
             if (!isIE) {