Merge branch 'dev' of http://gitlab.jdshangmen.com/jiedao-app/jiedao-app-operator into dev

src/components/RoutersSelector/index.vue

@@ -48,7 +48,7 @@
                                     {{$l(row, 'destTitle')}}
                                 </template>
                             </el-table-column>
-                            <el-table-column :label="$t('渠道')" prop="startTitleZh" v-if="type == 'air'">
+                            <el-table-column :label="$t('渠道')" prop="startTitleZh" v-if="[3,4].indexOf(+item.value) > -1">
                                 <template slot-scope="{row}">
                                     {{$l(row.channel, 'name')}}
                                 </template>
@@ -328,6 +328,8 @@ export default {
         },
         // 运输方式筛选
         transportFilter(item){
+          // 未指定类型则全部可用
+          if(!this.type) return true
           return (this.type == 'sea' ? ['1','2'] : ['3', '4']).indexOf(item.value) > -1
         },
     }