Merge branch 'master' of zyh/kmall-haikong into master

kmall-admin/src/main/webapp/js/sale/sale.js

@@ -1740,7 +1740,7 @@ function parsedate(value){
 }
 
 function getPrintContentOrder(ticket, callback) {
-    var content = "<div style=\"width: 270px;font-family: 微软雅黑;font-size: 8px;\">";
+    var content = "<div style=\"width: 290px;font-family: 微软雅黑;font-size: 8px;\">";
     // 打印ogo
     content += "<div style=\"text-align: center;width: 100%;height: 260px;\">";
     content += "<img src='/statics/img/zmhk.png' style='width: 100%;height: 100%;' />";
@@ -1761,24 +1761,24 @@ function getPrintContentOrder(ticket, callback) {
     content += "<div style=\"width: 100%;\">";
     content += "交易时间:" + ticket.ticketHead.tradeTime;
     content += "</div>";
-    content += "<div style=\"width: 100%;overflow:hidden;white-space: nowrap;\">-------------------------------------------------------</div>";
+    content += "<div style=\"width: 100%;overflow:hidden;white-space: nowrap;\"><hr style='border-top: 1px dashed black;'/></div>";
     //商品信息
     content += "<table style=\"width: 100%;\" border=\"0\" cellspacing=\"0\" cellpadding=\"0\">";
     content += "<tr>";
-    content += "<td style=\"width: 40%;text-align: left;font-size: 10px;font-weight: bold;\">商品名称</td>";
-    content += "<td style=\"width: 17%;text-align: right;font-size: 10px;font-weight: bold;\">单价</td>";
-    content += "<td style=\"width: 17%;text-align: right;font-size: 10px;font-weight: bold;\">优惠</td>";
-    content += "<td style=\"width: 17%;text-align: right;font-size: 10px;font-weight: bold;\">优惠后单价</td>";
+    content += "<td style=\"width: 30%;text-align: left;font-size: 10px;font-weight: bold;\">商品名称</td>";
+    content += "<td style=\"width: 12%;text-align: right;font-size: 10px;font-weight: bold;\">单价</td>";
+    content += "<td style=\"width: 12%;text-align: right;font-size: 10px;font-weight: bold;\">优惠</td>";
+    content += "<td style=\"width: 22%;text-align: right;font-size: 10px;font-weight: bold;\">优惠后单价</td>";
     // content += "<td style=\"width: 16%;text-align: right;font-size: 10px;font-weight: bold;\">税费</td>";
-    content += "<td style=\"width: 15%;text-align: right;font-size: 10px;font-weight: bold;\">数量</td>";
-    content += "<td style=\"width: 18%;text-align: right;font-size: 10px;font-weight: bold;\">小计</td>";
+    content += "<td style=\"width: 12%;text-align: right;font-size: 10px;font-weight: bold;\">数量</td>";
+    content += "<td style=\"width: 12%;text-align: right;font-size: 10px;font-weight: bold;\">小计</td>";
     content += "</tr>";
     content += "</table>";
-    content += "<div style=\"width: 100%;overflow:hidden;white-space: nowrap;\">-------------------------------------------------------</div>";
+    content += "<div style=\"width: 100%;overflow:hidden;white-space: nowrap;\"><hr style='border-top: 1px dashed black;'/></div>";
     content += "<table style=\"width: 100%;\" border=\"0\" cellspacing=\"0\" cellpadding=\"0\">";
     for (var i=0;i< ticket.goods.length;i++){
         content += "<tr>";
-        content += "<td style=\"width: 40%;text-align: left;font-size: 8px;padding-top: 8px;\">";
+        content += "<td style=\"width: 30%;text-align: left;font-size: 8px;padding-top: 8px;\">";
         content += "<table style=\"width: 100%;\" border=\"0\" cellspacing=\"0\" cellpadding=\"0\">";
         content += "<tr>";
         content += "<td style=\"text-align: left;font-size: 8px;vertical-align:top;\">#</td>";
@@ -1786,17 +1786,17 @@ function getPrintContentOrder(ticket, callback) {
         content += "</tr>";
         content += "</table>";
         content += "</td>";
-        content += "<td style=\"width: 17%;text-align: right;font-size: 8px;vertical-align:bottom;padding-top: 8px;\">" + ticket.goods[i].uprice + "</td>";
-        content += "<td style=\"width: 17%;text-align: right;font-size: 8px;vertical-align:bottom;padding-top: 8px;\">" + ticket.goods[i].discountPrice + "</td>";
-        content += "<td style=\"width: 17%;text-align: right;font-size: 8px;vertical-align:bottom;padding-top: 8px;\">" + ticket.goods[i].afterDiscountPrice + "</td>";
+        content += "<td style=\"width: 12%;text-align: right;font-size: 8px;vertical-align:bottom;padding-top: 8px;\">" + ticket.goods[i].uprice + "</td>";
+        content += "<td style=\"width: 12%;text-align: right;font-size: 8px;vertical-align:bottom;padding-top: 8px;\">" + ticket.goods[i].discountPrice + "</td>";
+        content += "<td style=\"width: 22%;text-align: right;font-size: 8px;vertical-align:bottom;padding-top: 8px;\">" + ticket.goods[i].afterDiscountPrice + "</td>";
         // content += "<td style=\"width: 17%;text-align: right;font-size: 8px;vertical-align:bottom;padding-top: 8px;\">" + ticket.goods[i].taxation + "</td>";
-        content += "<td style=\"width: 15%;text-align: center;font-size: 8px;vertical-align:bottom;padding-top: 8px;\">" + ticket.goods[i].num + "</td>";
-        content += "<td style=\"width: 18%;text-align: right;font-size: 8px;vertical-align:bottom;padding-top: 8px;\">" + ticket.goods[i].subtotal + "</td>";
+        content += "<td style=\"width: 12%;text-align: center;font-size: 8px;vertical-align:bottom;padding-top: 8px;\">" + ticket.goods[i].num + "</td>";
+        content += "<td style=\"width: 12%;text-align: right;font-size: 8px;vertical-align:bottom;padding-top: 8px;\">" + ticket.goods[i].subtotal + "</td>";
         content += "</tr>";
 
     }
     content += "</table>";
-    content += "<div style=\"width: 100%;overflow:hidden;white-space: nowrap;\">--------------------------------------------------</div>";
+    content += "<div style=\"width: 100%;overflow:hidden;white-space: nowrap;\"><hr style='border-top: 1px dashed black;'/></div>";
     //收银信息
     content += "<div style=\"width: 100%;\">";
     content += "<span style=\"float: left;width: 50%;text-align: left;\">商品合计:</span>";
@@ -1837,7 +1837,7 @@ function getPrintContentOrder(ticket, callback) {
     // 后期改成从系统中取
     content += "<span style=\"float: right;width: 50%;text-align: right;\">" + ticket.cashInfo.paymentMode + "</span>";
     content += "</div>";
-    content += "<div style=\"width: 100%;overflow:hidden;white-space: nowrap;\">--------------------------------------------------</div>";
+    content += "<div style=\"width: 100%;overflow:hidden;white-space: nowrap;\"><hr style='border-top: 1px dashed black;'/></div>";
     //海关清单信息
     // content += "<div style=\"width: 100%;\">";
     // content += "订单号:" + ticket.cusListing.orderId;
@@ -1860,7 +1860,7 @@ function getPrintContentOrder(ticket, callback) {
     // content += "<div style=\"width: 100%;\">";
     // content += "交货地:" + ticket.cusListing.deliveryAddress;
     // content += "</div>";
-    content += "<div style=\"width: 100%;overflow:hidden;white-space: nowrap;\">--------------------------------------------------</div>";
+    content += "<div style=\"width: 100%;overflow:hidden;white-space: nowrap;\"><hr style='border-top: 1px dashed black;'/></div>";
 
     content += "<div style=\"width: 100%;text-align: center;\">";
     content += "购买跨境商品须知:"
@@ -1868,7 +1868,7 @@ function getPrintContentOrder(ticket, callback) {
     content += "<div style=\"width: 100%;\">";
     content += "1、凡购买跨境商品均不提供发票；<br> 2、单笔限购5000元，年交易限额2.6万元； <br> 3、所有订单在海关放行后进行发货； <br> 4、凭小票领取您的订单商品； <br> 5、非产品质量问题，跨境商品不支持无理由退换货，请及时检查。 "
     content += "</div>";
-    content += "<div style=\"width: 100%;overflow:hidden;white-space: nowrap;\">--------------------------------------------------</div>";
+    content += "<div style=\"width: 100%;overflow:hidden;white-space: nowrap;\"><hr style='border-top: 1px dashed black;'/></div>";
     content += "<div style=\"width: 100%;\">";
     // content += ticket.ticketFoot.summary;
     content += "</div>";
@@ -1889,13 +1889,13 @@ function getPrintContentOrder(ticket, callback) {
     content += "请保管好收银小票。";
     content += "</div>";
     // 打印二维码
-    content += "<div style=\"text-align: center;width: 100%;height: 250px;\">";
+    content += "<div style=\"text-align: center;width: 100%;height: 290px;\">";
     content +=  `<img src='${ticket.ticketMailInfo.storeImgUrl}' style='width: 100%;height: 100%;' />`;
     content += "</div>";
     content += "<div style=\"width: 100%;text-align: center;\">";
     content += "关注公众号，获取更多优惠信息"
     content += "</div>";
-    content += "<div style=\"width: 100%;overflow:hidden;white-space: nowrap;\">--------------------------------------------------</div>";
+    content += "<div style=\"width: 100%;overflow:hidden;white-space: nowrap;\"><hr style='border-top: 1px dashed black;'/></div>";
     content += "<div style=\"width: 100%;height: 50px;\"></div>";
 
     // var strategies = {