打印标签bug和订单详情支持空运价格

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

@@ -119,7 +119,7 @@ export default {
                 this.$set(this, 'tags', res.data)
                 // this.form.start = res.data[0].num
                 // 起始标签为入仓数 + 1
-                this.form.start = this.warehouseInNum + 1
+                this.form.start = (this.warehouseInNum || 0) + 1
                 this.form.end = res.data[res.data.length-1].num
             })
         },

src/views/ecw/order/detail.vue

@@ -404,7 +404,12 @@
           </div>
         </el-col>
         <el-col :span="12" v-if="feeDetail.charging != 1">
-          <div>{{$t('清关费')}}</div>
+          <div>
+            {{$t('清关费')}}
+            <template v-if="order.transportId == 3 || order.transportId == 4">
+              {{$t('来自{source}', {source: feeDetail.airClearanceSource + feeDetail.sourceName})}}
+            </template>
+          </div>
           <div v-for="item in feeDetail.clearance">
             {{item.label}}: {{item.value}}
             <template v-if="item.currency">
@@ -506,7 +511,7 @@ export default {
       currencyList: [],
       unitList:[],
       feeList: [],
-      channelName: '/',
+      channel: null,
       region: '',
       orderWarehouseIn: null, // 入仓详情
       showWarehouseInItemId: null, // 当前显示的入仓
@@ -552,6 +557,10 @@ export default {
         return JSON.parse(this.order.departureVO.departure)
       }
       return {}
+    },
+    channelName(){
+      if(!this.channel) return '/'
+      return this.$l(this.chanel, 'name')
     }
   },
   watch:{
@@ -687,7 +696,16 @@ export default {
         label: this.$t('价格更新时间'),
         value: parseTime(row.updateTime)
       })
-      this.feeDetail = {freight, clearance, charging: row.charging, coupons: row.couponInfoVOList}
+      this.feeDetail = {
+        freight,
+        clearance,
+        charging:
+        row.charging,
+        coupons: row.couponInfoVOList,
+        airClearanceSource: row.airClearanceSource == 1 ? this.$t('商品') : this.$t('渠道'), // 空运清关费来源：1 商品 2 渠道
+        airClearanceInfo: JSON.parse(row.airClearanceInfo), //空运清关费来源数据详情,
+        sourceName: row.airClearanceSource == 1 ? this.$l(row, 'prodTitle') : this.channelName
+      }
 
     },
     closeFeeDetail(){
@@ -720,7 +738,7 @@ export default {
     getChannel(){
       if(!this.order || !this.order.channelId || this.order.transportId == 1 || this.order.transportId == 2) return
       getChannel(this.order.channelId).then(res => {
-        this.channelName = res.data.nameZh
+        this.channel = res.data
       })
     },
     loadFeeList(){