增加PDF打印功能，主要是面对申通

watero-rst-web/src/main/webapp/WEB-INF/views/cm/customer/custome_detail.ftl

@@ -299,7 +299,7 @@
                             <#list listPostageInfo as postageInfo>
                             <tr id="deleteId${(postageInfo.postageId)!''}">
                                 <td>${(postageInfo.postageId)!''}</td>
-                                <td>${(postageInfo.postageAmount)!''}</td>
+                                <td>${(postageInfo.postageAmount/100)!''}</td>
                                 <td>${(postageInfo.postageAlipayName)!''}</td>
                                 <td>${(postageInfo.postageAlipay)!''}</td>
                                 <#if postageInfo.postageStatus??>

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

@@ -290,6 +290,7 @@
     }
 
     $(function () {
+
         $("#print-order-send").click(function() {
             var inputs = $(".salesid-input:checked");
             if (inputs == null || inputs.length <= 0) {
@@ -505,11 +506,18 @@
     }
 
     function re_print_order(orderId,salesId) {
+        // 初始化
+        var LODOP = getLodop();
+        var printIndex = LODOP.SELECT_PRINTER();
+        if (printIndex == -1) {
+            return;
+        }
+
         $("#orderId").val(orderId);
         $("#salesId").val(salesId);
-        var LODOP=getLodop();
         // 选择打印设备,注意：选择打印机时，需要区别IE类浏览器和非IE浏览器
         var isIE = (navigator.userAgent.indexOf('MSIE')>=0) || (navigator.userAgent.indexOf('Trident')>=0);
+        console.log(isIE)
         if (!isIE) {
             // 非IE类浏览器
             $.ajax({
@@ -628,31 +636,63 @@
             });
         } else {
             // IE浏览器
-            /*var printIndex = LODOP.SELECT_PRINTER();
-            // 如果返回-1表示不打印
-            if (printIndex!==-1) {*/
-                $.ajax({
-                    type: "POST",
-                    data: {
-                        "orderId":orderId,
-                        "salesId":salesId
-                    },
-                    async: true,
-                    url: "${path}/admin/await_send/rePrintOrder",
-                    success: function(data){
+            $.ajax({
+                type: "POST",
+                data: {
+                    "orderId":orderId,
+                    "salesId":salesId
+                },
+                async: true,
+                url: "${path}/admin/await_send/rePrintOrder",
+                success: function(data){
+                    // 请求成功
+                    var res = $.parseJSON(data.returnMsg.json);
+                    if (data.resultMsg && res.Success) {
                         // 请求成功
-                        var res = $.parseJSON(data.returnMsg.json);
-                            if (data.resultMsg && res.Success) {
-                                // 请求成功
-                                if(data.returnMsg.isSub){
-                                    $("#subOrderUl").html('');
-                                    var SubOrders = res.SubOrders;
-                                    var LogisticCode = res.Order.LogisticCode;
-                                    //查询主订单
+                        if(data.returnMsg.isSub){
+                            $("#subOrderUl").html('');
+                            var SubOrders = res.SubOrders;
+                            var LogisticCode = res.Order.LogisticCode;
+                            //查询主订单
+                            $.ajax({
+                                "type" : "post",
+                                data: {
+                                    "salesPostNum":LogisticCode
+                                },
+                                "url" : "${path}/admin/salesOrder/getSalesOrderByPostNum",
+                                async:false,
+                                "success" : function(data) {
+                                    if(data.returnCode != 200){
+                                        return;
+                                    }
+                                    let salesOrder = data.returnMsg.salesOrder;
+                                    if(salesOrder != null){
+                                        for(var i=0;i<salesOrder.salesOrderItemList.length;i++){
+                                            product += salesOrder.salesOrderItemList[i].itemProductName +"("+ salesOrder.salesOrderItemList[i].itemProductColor +"*"+ salesOrder.salesOrderItemList[i].itemNum+")<br>"
+                                        }
+                                        $("#subOrderUl").append(
+                                            '<tr class="text-c order_tr">' +
+                                            '<td><input type="checkbox" class="main_index" value="0" ></td>' +
+                                            '<td>'+LogisticCode+'</td>' +
+                                            '<td><span class="label label-success radius">'+product+'</span></td>' +
+                                            '<td>'+salesOrder.salesAddressName +"/"+salesOrder.salesAddressTel+'</td>' +
+                                            '</tr>'
+                                        );
+                                        product = "";
+                                        salesOrder = null;
+                                    }
+                                },
+                                "error":function(data){
+                                }
+                            });
+
+                            //查询子订单
+                            if(SubOrders != null){
+                                SubOrders.map(function (item,index,ary ) {
                                     $.ajax({
                                         "type" : "post",
                                         data: {
-                                            "salesPostNum":LogisticCode
+                                            "salesPostNum":item
                                         },
                                         "url" : "${path}/admin/salesOrder/getSalesOrderByPostNum",
                                         async:false,
@@ -661,85 +701,49 @@
                                                 return;
                                             }
                                             let salesOrder = data.returnMsg.salesOrder;
+                                            let product = '';
                                             if(salesOrder != null){
                                                 for(var i=0;i<salesOrder.salesOrderItemList.length;i++){
                                                     product += salesOrder.salesOrderItemList[i].itemProductName +"("+ salesOrder.salesOrderItemList[i].itemProductColor +"*"+ salesOrder.salesOrderItemList[i].itemNum+")<br>"
                                                 }
-                                                $("#subOrderUl").append(
-                                                        '<tr class="text-c order_tr">' +
-                                                        '<td><input type="checkbox" class="main_index" value="0" ></td>' +
-                                                        '<td>'+LogisticCode+'</td>' +
-                                                        '<td><span class="label label-success radius">'+product+'</span></td>' +
-                                                        '<td>'+salesOrder.salesAddressName +"/"+salesOrder.salesAddressTel+'</td>' +
-                                                        '</tr>'
-                                                );
-                                                product = "";
-                                                salesOrder = null;
                                             }
+                                            $("#subOrderUl").append(
+                                                '<tr class="text-c order_tr">' +
+                                                '<td><input type="checkbox" class="sub_index" value="'+index+'" ></td>' +
+                                                '<td>'+item+'</td>' +
+                                                '<td><span class="label label-success radius">'+product+'</span></td>' +
+                                                '<td>'+salesOrder.salesAddressName +"/"+salesOrder.salesAddressTel+'</td>' +
+                                                '</tr>'
+                                            );
                                         },
                                         "error":function(data){
                                         }
                                     });
-
-                                    //查询子订单
-                                    if(SubOrders != null){
-                                        SubOrders.map(function (item,index,ary ) {
-                                            $.ajax({
-                                                "type" : "post",
-                                                data: {
-                                                    "salesPostNum":item
-                                                },
-                                                "url" : "${path}/admin/salesOrder/getSalesOrderByPostNum",
-                                                async:false,
-                                                "success" : function(data) {
-                                                    if(data.returnCode != 200){
-                                                        return;
-                                                    }
-                                                    let salesOrder = data.returnMsg.salesOrder;
-                                                    let product = '';
-                                                    if(salesOrder != null){
-                                                        for(var i=0;i<salesOrder.salesOrderItemList.length;i++){
-                                                            product += salesOrder.salesOrderItemList[i].itemProductName +"("+ salesOrder.salesOrderItemList[i].itemProductColor +"*"+ salesOrder.salesOrderItemList[i].itemNum+")<br>"
-                                                        }
-                                                    }
-                                                    $("#subOrderUl").append(
-                                                            '<tr class="text-c order_tr">' +
-                                                            '<td><input type="checkbox" class="sub_index" value="'+index+'" ></td>' +
-                                                            '<td>'+item+'</td>' +
-                                                            '<td><span class="label label-success radius">'+product+'</span></td>' +
-                                                            '<td>'+salesOrder.salesAddressName +"/"+salesOrder.salesAddressTel+'</td>' +
-                                                            '</tr>'
-                                                    );
-                                                },
-                                                "error":function(data){
-                                                }
-                                            });
-                                        });
-                                    }
-                                    layer.closeAll();
-                                    toDoShow3();
-                            }else{
-                                    LODOP.PRINT_INIT('打印订单' + orderId);
-                                    if (res.hasOwnProperty("pdf")) {
-                                        LODOP.SET_PRINT_PAGESIZE(0, 0, 0, "");
-                                        LODOP.ADD_PRINT_PDF(0,0,"100%","100%",demoDownloadPDF("https://rst.iamberry.com"+res.pdf));
-                                    } else {
-                                        var html = res.PrintTemplate;
-                                        $("#temp-print-order").html(html);
-                                        LODOP.SET_PRINT_PAGESIZE(0, 0, 0,"");
-                                        LODOP.ADD_PRINT_HTM("0mm","0mm","100%","100%", $("#temp-print-order").html());
-                                    }
-                                    var flag = LODOP.PRINT();
-                                    if (flag) {
-                                        layer.msg("打印成功",{icon: 6,time:3000});
-                                    }
-                              }
+                                });
+                            }
+                            layer.closeAll();
+                            toDoShow3();
+                        }else{
+                            LODOP.PRINT_INIT('打印订单' + orderId);
+                            if (res.hasOwnProperty("pdf")) {
+                                LODOP.SET_PRINT_PAGESIZE(0, 0, 0, "");
+                                LODOP.ADD_PRINT_PDF(0,0,"100%","100%",demoDownloadPDF("https://rst.iamberry.com"+res.pdf));
                             } else {
-                                layer.msg(res.Reason,{icon: 2,time:3000});
+                                var html = res.PrintTemplate;
+                                $("#temp-print-order").html(html);
+                                LODOP.SET_PRINT_PAGESIZE(0, 0, 0,"");
+                                LODOP.ADD_PRINT_HTM("0mm","0mm","100%","100%", $("#temp-print-order").html());
+                            }
+                            var flag = LODOP.PRINT();
+                            if (flag) {
+                                layer.msg("打印成功",{icon: 6,time:3000});
                             }
+                        }
+                    } else {
+                        layer.msg(res.Reason,{icon: 2,time:3000});
                     }
-                });
-            /*}*/
+                }
+            });
         }
     }