Merge branch 'dev1.6' of http://gitlab.jdshangmen.com/jiedao-app/jiedao-app-operator into dev1.6

src/views/ecw/financial/commission-Payment.vue

@@ -254,11 +254,11 @@ export default {
           break;
         case 2:
           // 佣金付款单核销
-          commissionPaymentVerification(p).then(() =>resolve(this.$t('提交佣金付款单核销成功，请耐心等待审核结果!！')), reject)
+          commissionPaymentVerification(p).then(() =>resolve(this.$t('提交佣金付款单核销成功，请耐心等待审核结果!')), reject)
           break;
         case 3:
           // 付款单反核销申请
-          commissionPaymentVerificationCancel(p).then(() =>resolve(this.$t('提交佣金付款单反核销申请成功，请耐心等待审核结果!！')), reject)
+          commissionPaymentVerificationCancel(p).then(() =>resolve(this.$t('提交佣金付款单反核销申请成功，请耐心等待审核结果')), reject)
           break;
         case 4:
           // 取消付款单反审核

src/views/ecw/financial/paymentVoucher.vue

@@ -444,7 +444,7 @@ export default {
           break;
         case 6:
             // 反核销
-            paymentVerificationCancel(p).then(()=>resolve(this.$t('提交付款单反核销成功,请耐心等待审核结果!！')),reject)
+            paymentVerificationCancel(p).then(()=>resolve(this.$t('提交付款单反核销成功，请耐心等待审核结果!')),reject)
           break;
         case 7:
           //  取消反核销

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" />
@@ -184,6 +184,7 @@
             </el-table-column>
             <el-table-column prop="" :label="$t('成交单价')"  width="220px">
               <template slot-scope="{row}">
+
                 <template v-if="row.charging ==1">
                   <template v-if="!row.oneSeaFreight">{{ $t('未报价') }}</template>
                   <el-link type="primary" @click="showFeeDetail(row, 'clearance')" v-else>{{$t('全包价')}} {{row.oneSeaFreight}} {{currencyMap[row.seaFreightCurrency]}} / {{unitMap[row.seaFreightVolume]}}</el-link>
@@ -218,7 +219,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>
@@ -240,10 +241,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">
@@ -443,14 +444,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
     },
@@ -485,7 +486,7 @@ export default {
         console.log('listById', res)
         let region = ''
         res.data.forEach(item => {
-          region += " " + item.titleZh
+          region += " " + this.$l(item, 'title')
         })
         this.region = region
       })