Merge remote-tracking branch 'origin/dev' into dev

src/views/ecw/box/indexFutureBox.vue

@@ -330,7 +330,8 @@ export default {
     }) */
 
     // 查询渠道
-    getChannelList().then((res) => (this.channelList = res.data));
+    getChannelList().then((res) => (
+      this.channelList = res.data));
     /* this.transportTypes = this.getDictDatas(
       this.DICT_TYPE.ECW_TRANSPORT_TYPE
     ).filter((item) => item.value == "1" || item.value == "2"); */
@@ -379,7 +380,7 @@ export default {
         objectiveId: this.form.destWarehouseId
       }
       // 空运才需要渠道
-      if(data.transportId == 4){
+      if(data.transportId == 4 || data.transportId == 3){
         data.channelId = this.form.shippingChannelId
       }
       // 获得已封柜方数