提交代码

kmall-admin/src/main/resources/mybatis/mapper/GoodsDao.xml

@@ -209,7 +209,7 @@
             mall_goods a
         LEFT JOIN mall_product_store_rela r ON r.goods_id = a.id
         inner join mall_store s on r.store_id=s.id
-        where a.prod_barcode = #{prodBarcode}  and r.store_id = #{storeId
+        where a.prod_barcode = #{prodBarcode}  and r.store_id = #{storeId}
         and r.stock_num > 0
         limit 1
     </select>

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

@@ -570,6 +570,7 @@ let vm = new Vue({
                             })
                             // 打印取货码小票
                             var content = getPrintContent(r.resultObj);
+                            console.log(content);
                             printArea2(content);
                             vm.goodsList = [];
                             vm.customname = '' ;
@@ -841,6 +842,12 @@ let vm = new Vue({
 
 function getPrintContent(ticket) {
     var content = "<div style=\"width: 250px;font-family: 微软雅黑;font-size: 15px;\">";
+    // 打印ogo
+    content += "<div style=\"text-align: center;width: 100%;height: 50px;\">";
+    // content += "<img src='./../../statics/img/cw_logo.png' />";
+    content += "2222222222";
+    content += "<img src='/statics/img/cw_logo.png' style='width: 100%;height: 100%;' />";
+    content += "</div>";
     //小票头
     content += "<div style=\"text-align: center;width: 100%;font-weight:bold;font-size: 15px;\">";
     content += ticket.shopName
@@ -864,6 +871,7 @@ function getPrintContent(ticket) {
     content += "<div style=\"width: 100%;margin:5px 0px;font-size: 13px;\">";
     content += "该取货单号只有当天有效"
     content += "</div>";
+    content += "</div>";
 
     return content;
 }
@@ -1094,18 +1102,18 @@ function getPrintContentOrder(ticket) {
     content += "<span style=\"float: left;width: 50%;text-align: left;\">实收:</span>";
     content += "<span style=\"float: right;width: 50%;text-align: right;\">" + ticket.cashInfo.receipts + "元</span>";
     content += "</div>";
-    content += "<div style=\"width: 100%;\">";
-    content += "<span style=\"float: left;width: 50%;text-align: left;\">找零:</span>";
-    content += "<span style=\"float: right;width: 50%;text-align: right;\">" + ticket.cashInfo.oddChange + "元</span>";
-    content += "</div>";
+    // content += "<div style=\"width: 100%;\">";
+    // content += "<span style=\"float: left;width: 50%;text-align: left;\">找零:</span>";
+    // content += "<span style=\"float: right;width: 50%;text-align: right;\">" + ticket.cashInfo.oddChange + "元</span>";
+    // content += "</div>";
     content += "<div style=\"width: 100%;\">";
     content += "<span style=\"float: left;width: 50%;text-align: left;\">优惠券:</span>";
     content += "<span style=\"float: right;width: 50%;text-align: right;\">" + ticket.cashInfo.coupon + "元</span>";
     content += "</div>";
-    content += "<div style=\"width: 100%;\">";
-    content += "<span style=\"float: left;width: 50%;text-align: left;\">运费:</span>";
-    content += "<span style=\"float: right;width: 50%;text-align: right;\">" + ticket.cashInfo.freight + "元</span>";
-    content += "</div>";
+    // content += "<div style=\"width: 100%;\">";
+    // content += "<span style=\"float: left;width: 50%;text-align: left;\">运费:</span>";
+    // content += "<span style=\"float: right;width: 50%;text-align: right;\">" + ticket.cashInfo.freight + "元</span>";
+    // content += "</div>";
     content += "<div style=\"width: 100%;\">";
     content += "<span style=\"float: left;width: 50%;text-align: left;\">支付渠道:</span>";
     // 后期改成从系统中取