打印调整

admin-ui/src/utils/index.js

@@ -473,7 +473,7 @@ export function exchangeClothPrinter(LODOP, data, lodopName) {
   LODOP.ADD_PRINT_TEXT(200, 10, 300, 20, `支付方式：${payType}`);
   LODOP.ADD_PRINT_TEXT(220, 10, 300, 20, `订单备注：${data.remark?data.remark:''}`);
   LODOP.ADD_PRINT_LINE(240, 10, 240, 295, 1, 1);
-  LODOP.ADD_PRINT_TEXT(250, 10, 300, 20, `会员余额：${data.memberBeforeBalance || 0}`);
+  LODOP.ADD_PRINT_TEXT(250, 10, 300, 20, `会员金额：${data.memberBeforeBalance || 0}`);
   LODOP.ADD_PRINT_TEXT(270, 10, 300, 20, `本次充值：${data.memberChangeAmount || 0}元`);
   LODOP.ADD_PRINT_TEXT(290, 10, 300, 20, `会员余额：${(data.memberAfterBalance || 0)}元`);
   LODOP.ADD_PRINT_LINE(310, 10, 310, 295, 1, 1);
@@ -555,11 +555,11 @@ export function collectClothPrinter(LODOP, data, lodopName) {
   LODOP.ADD_PRINT_TEXT(height + 15, 160, 150, 20, `总金额：${data.orderAmount}元`);
 
   LODOP.ADD_PRINT_LINE(height + 35, 10, height + 35, 295, 1, 1);
-  LODOP.ADD_PRINT_TEXT(height + 45, 10, 150, 20, `优惠金额：${(data.activityDiscountAmount || 0) + (data.cashDeductAmount || 0) + (data.couponDeductAmount || 0)}`);
-  LODOP.ADD_PRINT_TEXT(height + 45, 160, 150, 20, `实付金额：${(data.payAmount || 0)}`);
-  LODOP.ADD_PRINT_TEXT(height + 65, 10, 150, 20, `优惠券：-${(data.activityDiscountAmount || 0)}`);
-  LODOP.ADD_PRINT_TEXT(height + 65, 160, 150, 20, `折扣活动：${(data.activityDiscountAmount || 0) + (data.cashDeductAmount || 0) + (data.couponDeductAmount || 0)}`);
-  LODOP.ADD_PRINT_TEXT(height + 85, 10, 150, 20, `现金券：${(data.activityDiscountAmount || 0) + (data.cashDeductAmount || 0) + (data.couponDeductAmount || 0)}`);
+  LODOP.ADD_PRINT_TEXT(height + 45, 10, 150, 20, `优惠金额：${(data.activityDiscountAmount || 0) + (data.cashDeductAmount || 0) + (data.couponDeductAmount || 0)}元`);
+  LODOP.ADD_PRINT_TEXT(height + 45, 160, 150, 20, `实付金额：${(data.payAmount || 0)}元`);
+  LODOP.ADD_PRINT_TEXT(height + 65, 10, 150, 20, `优惠券：${(data.couponDeductAmount || 0)}元`);
+  LODOP.ADD_PRINT_TEXT(height + 65, 160, 150, 20, `折扣活动：${(data.activityDiscountAmount || 0)}元`);
+  LODOP.ADD_PRINT_TEXT(height + 85, 10, 150, 20, `现金券：${data.cashDeductAmount || 0}元`);
   LODOP.ADD_PRINT_LINE(height + 105, 10, height + 105, 295, 1, 1);
 
   //金额