Merge branch 'feature/order_edit' into pre-release

# Conflicts:
#	src/views/ecw/order/index.vue

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

@@ -142,7 +142,7 @@ export default {
     <el-table-column prop="specificationType" :label="$t('包装')"  width="120px"/>
     <el-table-column prop="worth" :label="$t('货值')"  width="120px"/>
     <el-table-column prop="warehouseRecordRemark" :label="$t('入仓备注')"  width="120px"/>
-    <el-table-column prop="TODO" :label="$t('快递单号')" />
+    <el-table-column prop="warehouseInInfoVO.expressNo" :label="$t('快递单号')" />
     <el-table-column prop="sumNum" :label="$t('收费数据')"  width="90px">
       <template slot-scope="{row}">
         <div v-if="row.warehouseInInfoVO">

src/views/ecw/order/edit.vue

@@ -511,7 +511,7 @@
                 </el-select>
               </el-form-item>
             </div>
-            <div class="form-section" v-if="showAdress">
+            <div class="form-section" v-if="form.harvestMethod == 2">
               <el-form-item :label="$t('收货地区')" prop="country">
                 <area-selector
                   :country="form.consigneeVO ? form.consigneeVO.country : undefined"

src/views/ecw/order/index.vue

@@ -2049,12 +2049,12 @@ export default {
         page: 1,
         rows: 10,
         packageTypeArr: [],
+        channelId: ''
       };
       this.destCountryId = null
       this.destWarehouseId = null
       this.objectiveId = null
 
-      this.queryParams.channelIds = null;
       this.noParam.value = "";
       this.prodParam.value = "";
       this.dateFilter = [];