| 
					
				 | 
			
			
				@@ -1768,7 +1768,7 @@ function getPrintContentOrder(ticket, callback) { 
			 | 
		
	
		
			
				 | 
				 | 
			
			
				     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: 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: 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>"; 
			 | 
		
	
	
		
			
				| 
					
				 | 
			
			
				@@ -1788,7 +1788,7 @@ function getPrintContentOrder(ticket, callback) { 
			 | 
		
	
		
			
				 | 
				 | 
			
			
				         content += "</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: 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: 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>"; 
			 | 
		
	
	
		
			
				| 
					
				 | 
			
			
				@@ -1824,10 +1824,10 @@ function getPrintContentOrder(ticket, callback) { 
			 | 
		
	
		
			
				 | 
				 | 
			
			
				     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;\">" + (new BigNumber(ticket.cashInfo.coupon).subtract(new BigNumber(ticket.cashInfo.scoreDeductionPrice))) + "元</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;\">" + (new BigNumber(ticket.cashInfo.coupon).subtract(new BigNumber(ticket.cashInfo.scoreDeductionPrice))) + "元</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>"; 
			 |