Merge branch 'test' of http://110.41.143.128:8081/lanbaoming/jiedao-app-operator-master into test

src/api/ecw/order.js

@@ -1052,6 +1052,14 @@ 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/utils/dict.js

@@ -171,6 +171,7 @@ export const DICT_TYPE = {
   // order
   ORDER_TYPE: "order_type", // 订单类型
   PRODUCT_RECORD_ATTRIBUTE: "product_record_attribute", //产品备案属性
+  PROD_QUERY_TITLE_ZH_FIELD: 'prod_query_title_zh_field', // 商品列表商品中文名称查询类型
   CONTROL_GOODS_STATUS: "control_goods_status", //控货状态
   DISBURSEMENT_TYPE: "disbursement_type", //垫付类型
   DRAWEE: "drawee", // 付款人

src/views/ecw/order/edit.vue

@@ -707,7 +707,7 @@ import Template from '@/views/cms/template/index.vue'
 let makeDefaultFormData = () => {
   return {
     destCountryId: null,
-    lienId: null,
+    lineId: null,
     objectiveId: null,
     departureId: null,
     status:0,

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" />
@@ -1000,6 +1002,7 @@ export default {
         if (type.indexOf("2") > -1) {
           arr.push(this.$t("海外仓"))
         }
+        return arr.join(",")
       }
     }
   },