报价单详情的bug等

src/views/ecw/offer/detail.vue

@@ -501,15 +501,6 @@
       },
       // 预计费用(原价 - 优惠金额)
       estimatedCosts(){
-          // let arr = []
-          // this.originalFeeList.forEach(item => {
-          //     let it = {...item}
-          //     let coupon = this.couponList.find(coupon => coupon.reduceCurrencyId == item.currencyId)
-          //     if(coupon){
-          //         it.amount -= coupon.reduceAmount
-          //     }
-          //     arr.push(it)
-          // })
           let arr = []
           let withInsuranceFee = false
           let withOtherFee = false
@@ -528,7 +519,7 @@
               // }
               let otherFee = this.otherFeeList.find(fee => fee.currencyId == item.currencyId)
               if(otherFee){
-                  it.amount += otherFee.amount
+                  it.amount = it.amount.plus(otherFee.amount || 0)
                   withOtherFee = true
               }
               // 保价费（美元）
@@ -550,7 +541,7 @@
               if(!withInsuranceFee && this.fee && this.fee.insuranceFee && this.list.otherFeeCurrencyId == 1){
                   fee.amount = fee.amount.plus(this.fee.insuranceFee)
               }
-            arr.push(fee)
+              arr.push(fee)
             }
             // 没有累加保价费(没有美元计价)但是有保价费则需要加上去
             if(!withInsuranceFee && this.fee && this.fee.insuranceFee){

src/views/ecw/order/components/PrintTag.vue

@@ -40,7 +40,7 @@
                         {{item.marks}}
                     </p>
 
-                    <p style=" padding: 0px; border-bottom: 0.2mm solid #333; text-align: center; line-height: 6mm; padding: 0px; margin: 0px; font-size: 5mm; text-transform: uppercase; padding-top: 3.5mm; padding-bottom: 2.5mm; " >
+                    <p style=" white-space: nowrap; padding: 0px; border-bottom: 0.2mm solid #333; text-align: center; line-height: 6mm; padding: 0px; margin: 0px; font-size: 5mm; text-transform: uppercase; padding-top: 3.5mm; padding-bottom: 2.5mm; " >
                         {{item.startTitleEn}} --&gt;
                         <label style="font-weight: 600; font-size: 5.5mm">{{item.destTitleEn}} </label>
                     </p>
@@ -142,7 +142,7 @@ export default {
 
                 LODOP.SET_PRINT_PAGESIZE(0, 800, 600, "TAG");
                 for(let i in items){
-                    LODOP.ADD_PRINT_HTM(0,0,800,600, items[i].innerHTML);
+                    LODOP.ADD_PRINT_HTM("5mm",0,800,600, items[i].innerHTML);
                     if(i < items.length){
                         LODOP.NewPage()
                     }