Merge branch 'dev' into test

src/api/ecw/order.js

@@ -1052,14 +1052,6 @@ export function getOrderItemDeleted(orderId){
   })
 }
 
-//退仓品名列表
-export function getOrderCheckInfo(orderId){
-  return request({
-    url: '/ecw/order/order-check-info/' + orderId,
-    method: 'get',
-  })
-}
-
 // 打包页面订单数据统计
 export function getPackStatistics(orderId){
   return request({

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

@@ -153,7 +153,7 @@ export default {
       <!--<el-table-column prop="prodTitleEn" :label="$t('品名')" />-->
       <el-table-column :label="$t('品牌')"  width="90px">
         <template slot-scope="{row}">
-          <template v-if="row.brandName">{{row.brandName}}</template>
+          <template v-if="row.checkBrandName">{{row.checkBrandName}}</template>
           <dict-tag v-else :type="DICT_TYPE.ECW_IS_BRAND" :value="row.brandType" />
         </template>
       </el-table-column>
@@ -174,11 +174,11 @@ export default {
       </el-table-column>
       <el-table-column prop="sumNum" :label="$t('到仓信息')"  width="90px">
         <template slot-scope="{row}">
-          <div v-if="row.warehouseInInfoVO">
-            {{row.warehouseInInfoVO.cartonsNum}}{{$t('箱')}}
-            {{row.warehouseInInfoVO.weight}}Kg
-            {{row.warehouseInInfoVO.volume}}m³
-            {{row.warehouseInInfoVO.quantityAll}}{{$t('个')}}
+          <div v-if="row.warehouseCheckInfoVO">
+            {{row.warehouseCheckInfoVO.cartonsNum}}{{$t('箱')}}
+            {{row.warehouseCheckInfoVO.weight}}Kg
+            {{row.warehouseCheckInfoVO.volume}}m³
+            {{row.warehouseCheckInfoVO.quantity}}{{$t('个')}}
           </div>
         </template>
       </el-table-column>

src/views/ecw/order/detail.vue

@@ -326,7 +326,7 @@
           </el-table>
         </el-tab-pane>
         <el-tab-pane :label="$t('到仓详情')" name="seven">
-          <check-detail-prod :list="orderCheckInfoData"
+          <check-detail-prod :list="order.orderItemVOList"
                        :attr-list="attrList"
                        :prod-type-list="prodTypeList"
                        :currency-map="currencyMap"
@@ -497,7 +497,6 @@ export default {
       packAfterData:null,//显示打包历史详情
       attrList: [],
       orderItemDeletedData:[],//退仓品名
-      orderCheckInfoData:[],//到仓详情
       prodTypeList:[],//商品类型列表
       type:1
     }
@@ -628,14 +627,6 @@ export default {
         that.orderItemDeletedData = response.data;
       });
     },
-    getOrderCheckInfo(){
-      let that = this
-      // TODO 待提供执行查询接口
-      // getOrderCheckInfo(that.orderId).then(response => {
-          getOrderItemDeleted(that.orderId).then(response => {
-        that.orderCheckInfoData = response.data;
-      });
-    },
     /** 获取产品类型列表 */
     getProdTypeList() {
       getProductTypeList().then((response) => {