Merge branch 'dev' into test

src/views/ecw/order/detail.vue

@@ -144,7 +144,10 @@
           {{order.packageRemarks}}
         </el-descriptions-item>
         <el-descriptions-item :label="$t('到仓数据')">
-          // TODO
+          {{order.checkNum}}{{$t('箱')}}
+          {{order.checkWeight}}Kg
+          {{order.checkVolume}}m³
+          {{order.checkQuantity}}{{$t('个')}}
         </el-descriptions-item>
         <el-descriptions-item :label="$t('提货数据')">
           {{order.pickNum}} {{$t('箱')}} {{order.pickRatio}}%

src/views/ecw/order/index.vue

@@ -289,7 +289,9 @@
       <el-table-column :label="$t('发货人客服')" align="center" prop="consignorFollowCustomerService" />
       <el-table-column :label="$t('收货人客服')" align="center" prop="consigneeFollowCustomerService" />
       <el-table-column :label="$t('到仓箱数/方数重量')" align="center" prop="status">
-        <template slot-scope="scope"> 暂无数据 </template>
+        <template slot-scope="{ row }">
+          {{ row.checkNum }}{{ $t("箱") }} / {{ row.checkVolume }}m³ /{{ row.checkWeight }}Kg
+        </template>
       </el-table-column>
       <el-table-column :label="$t('提货率')" align="center" prop="pickRatio" />
       <el-table-column :label="$t('动态')" align="center" prop="statusMsg" />