diff --git a/components/print/index.js b/components/print/index.js index 0a1b4ea..f6606d0 100644 --- a/components/print/index.js +++ b/components/print/index.js @@ -89,7 +89,7 @@ export default { data1.deliveryType == 1 && data1.orderType == 3 ? data1.deliveryInfo.numberCode : data1.numberCode ); printerJobs.setAlign('ct').setSize(2, 2).setLineSpacing(60).print( - (data1.deliveryInfo && data1.deliveryInfo.appointmentDelivery == 1 && data1.status != 7 && data1.status != 11 && data1.status != 8 && data1.status != 12) ? '预约单' : + (data1.deliveryInfo && data1.deliveryInfo.appointmentDelivery == 1 && data1.mallRefundRecord == null) ? '预约单' : (data1.deliveryInfo && data1.deliveryInfo.transferDelivery == 1 && data1.status != 7 && data1.status != 11) ? '取餐码(' + data1.deliveryInfo.transferPickupCode +')' : (data1.status == 7 || data1.status == 11) ? '申请退款' : (data1.deliveryType == 1 && data1.orderType == 3) ? '面对面配送' : @@ -104,7 +104,7 @@ export default { ); if (data1.deliveryInfo && data1.deliveryInfo.appointmentDelivery == 1) { - printerJobs.setAlign('lt').print( + printerJobs.setAlign('lt').setSize(2, 2).setLineSpacing(60).print( '要求送达时间:' + (data1.deliveryInfo == null ? ' ' : this.formatTime(data1.deliveryInfo .mustFinishTime)) ); @@ -252,7 +252,7 @@ export default { return '平台退款'; }, isFaceToFaceDelivery(order) { - return order && order.deliveryType == 1 && (order.orderType == 3 || (order.deliveryInfo && order.deliveryInfo.numberCode)); + return order && order.deliveryType == 1 && order.orderType == 3; }, // 去除字符串中的 Emoji 表情 removeEmojis(str) {