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

src/views/ecw/order/detail.vue

@@ -51,8 +51,8 @@
     </el-card>
     <el-card class="card">
       <el-descriptions border :title="$t('物流信息')" :column="2">
-        <el-descriptions-item :label="$t('始发仓')">{{order.logisticsInfoDto.startTitleZh}}</el-descriptions-item>
-        <el-descriptions-item :label="$t('目的仓')">{{order.logisticsInfoDto.destTitleZh}}</el-descriptions-item>
+        <el-descriptions-item :label="$t('始发仓')">{{$l(order.logisticsInfoDto, 'startTitle')}}</el-descriptions-item>
+        <el-descriptions-item :label="$t('目的仓')">{{$l(order.logisticsInfoDto, 'destTitle')}}</el-descriptions-item>
         <!-- <el-descriptions-item :label="$t('地址')" :span="2">{{order.logisticsInfoDto.startAddressZh}}</el-descriptions-item> -->
         <el-descriptions-item :label="$t('运输方式')" :span="2">
           <dict-tag :type="DICT_TYPE.ECW_TRANSPORT_TYPE" :value="order.transportId" />
@@ -210,7 +210,7 @@
         <el-tab-pane :label="$t('订单动态')" name="second">
           <el-timeline v-if="order.orderTimeVOList && order.orderTimeVOList.length" :reverse="true">
             <el-timeline-item v-for="(activity, index) in order.orderTimeVOList" :key="index" :timestamp="activity.timestamp">
-              {{ activity.titleZh }}
+              {{ $l(activity, 'title') }}
               <div>{{$l(activity, 'remarks')}}</div>
             </el-timeline-item>
           </el-timeline>
@@ -232,10 +232,10 @@
               {{channelName}}
             </el-table-column>
             <el-table-column :label="$t('始发地')" prop="orderNo">
-              {{departure.titleZh || '-'}}
+              {{$l(departure, 'title') || '-'}}
             </el-table-column>
             <el-table-column :label="$t('目的地')">
-              {{objective.titleZh || '-'}}
+              {{$l(objective, 'title') || '-'}}
             </el-table-column>
             <el-table-column :label="$t('品名')" prop="titleZh"></el-table-column>
             <el-table-column :label="$t('箱数')" prop="num">
@@ -404,14 +404,14 @@ export default {
     currencyMap(){
         let map = {}
         this.currencyList.forEach(item => {
-            map[item.id] = item.titleZh
+            map[item.id] = this.$l(item, 'title')
         })
         return map
     },
     unitMap(){
         let map = {}
         this.unitList.forEach(item => {
-            map[item.id] = item.titleZh
+            map[item.id] = this.$l(item, 'title')
         })
         return map
     },
@@ -443,7 +443,7 @@ export default {
         console.log('listById', res)
         let region = ''
         res.data.forEach(item => {
-          region += " " + item.titleZh
+          region += " " + this.$l(item, 'title')
         })
         this.region = region
       })