订单优惠等bug

src/views/ecw/coupon/edit.vue

@@ -534,7 +534,7 @@ export default {
 		checkPositive(object, field){
 			const lastChar = object[field].split('').pop()
 			object[field] = parseFloat(object[field])
-			if(!object[field] || object[field] < 0) object[field] = ''
+			if(isNaN(object[field]) || object[field] < 0) object[field] = ''
 			else object[field] = object[field].toString()
 
 			// 如果最后一位是.且没有其他点则补上

src/views/ecw/order/detail.vue

@@ -390,7 +390,7 @@ export default {
       });
     },
     getChannel(){
-      if(!this.order || !this.order.channelId) return
+      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
       })

src/views/ecw/order/edit.vue

@@ -698,6 +698,7 @@ export default {
             totalWorth: new Decimal(0),
             totalQuatity: new Decimal(0)
         }
+        if(!this.form || !this.form.orderItemVOList) return sum
         this.form.orderItemVOList.forEach(item => {
             sum.totalNum = sum.totalNum.plus(item.num || 0)
             sum.totalVolume = sum.totalVolume.plus(item.volume || 0)
@@ -767,6 +768,11 @@ export default {
             this.$set(this.form, 'lineId', undefined)
         }
 
+        // 选择海运拼柜和海运整柜清空渠道值
+        if(transportId == 1 || transportId == 2){
+            this.$set(this.form, 'channelId', null)
+        }
+        
         this.getOpenedRouterList()
     },
     'form.channelId'(){

src/views/ecw/order/index.vue

@@ -139,7 +139,8 @@
       <el-table-column :label="$t('唛头')" align="center" prop="marks" />
       <el-table-column :label="$t('总箱数/入仓箱数')" align="center" prop="sumNum">
         <template slot-scope="{row}">
-          {{row.totalNum}}{{$t('箱')}}/{{row.sumNum}}{{$t('箱')}}
+          <div style="color:red">{{row.totalNum}}{{$t('箱')}}/{{row.sumNum}}{{$t('箱')}}</div>
+          <dict-tag  style="color:red" :type="DICT_TYPE.ECW_CUSTOMS_TYPE" :value="row.customsType"></dict-tag>
         </template>
       </el-table-column>
       <el-table-column :label="$t('体积/重量')" align="center" prop="sumWeight">

src/views/ecw/order/special/Preferential.vue

@@ -13,7 +13,7 @@
       </template>
       <template v-else>
         <el-form-item :label="$t('原泡货标准')">
-          {{form.orgWVolume}} kg
+          {{form.orgVWeight}} kg
         </el-form-item>
         <el-form-item :label="$t('现泡货标准')" style="width: 400px" prop="clearanceFreight">
           <el-input v-model="form.vweight" type="number" class="w-100" /> kg