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

src/views/ecw/financial/creatCollection.vue

@@ -257,7 +257,7 @@
         </el-descriptions>
       </el-card>
       <el-card class="card">
-        <div slot="header" class="card-title">{{ $t('应收账单') }}</div>
+        <div slot="header" class="card-title">{{ $t('收款信息') }}</div>
         <el-table :data="form.receiptAccountList" border :key="form.receiptAccountList.length">
           <el-table-column :label="$t('应收币种')" align="center">
             <template slot-scope="scope">
@@ -296,7 +296,7 @@
               {{ $t('核销基准金额') }}（<dict-tag :type="DICT_TYPE.BOX_SHIPPING_PRICE_UNIT" :value="showCurrencyId" />）
             </template>
           </el-table-column>
-          <el-table-column :label="$t('收款账户')" align="center">
+          <el-table-column :label="$t('期望收款账户')" align="center">
             <template slot-scope="scope">
               <el-form-item
                 v-if="scope.row.type !== 'total'"
@@ -319,7 +319,7 @@
               </el-form-item>
             </template>
           </el-table-column>
-          <el-table-column :label="$t('收款币种')" align="center">
+          <el-table-column :label="$t('期望收款币种')" align="center">
             <template slot-scope="scope">
               <el-form-item
                 v-if="scope.row.type !== 'total'"
@@ -336,7 +336,7 @@
               </el-form-item>
             </template>
           </el-table-column>
-          <el-table-column :label="$t('收款汇率')" align="center">
+          <el-table-column :label="$t('期望收款汇率')" align="center">
             <template slot-scope="scope">
               <el-form-item
                 v-if="scope.row.type !== 'total'"
@@ -347,10 +347,10 @@
               >
                 <el-input v-model="scope.row.collectionRate" @input="() => rateChange(scope.row, scope.$index)"></el-input>
               </el-form-item>
-              <span v-else>{{ $t('收款总金额') }}</span>
+              <span v-else>{{ $t('期望收费金额') }}</span>
             </template>
           </el-table-column>
-          <el-table-column :label="$t('收款金额')" align="center" prop="collectionAmount">
+          <el-table-column :label="$t('期望收款金额')" align="center" prop="collectionAmount">
             <template slot-scope="scope">
               <span v-if="scope.row.type !== 'total'">{{ scope.row.collectionAmount.toFixed(6) }}</span>
               <div v-else>

src/views/ecw/financial/receiptDetail.vue

@@ -154,7 +154,7 @@
       </el-table>
     </el-card>
     <el-card class="card">
-      <div slot="header" class="card-title">{{ $t('应收账单') }}</div>
+      <div slot="header" class="card-title">{{ $t('收款信息') }}</div>
       <el-table :data="form.receiptAccountList" border>
         <el-table-column :label="$t('应收币种')" align="center">
           <template slot-scope="scope">
@@ -185,17 +185,17 @@
             {{ $t('核销基准金额') }}（<dict-tag :type="DICT_TYPE.BOX_SHIPPING_PRICE_UNIT" :value="showCurrencyId" />）
           </template>
         </el-table-column>
-        <el-table-column :label="$t('收款账户')" align="center">
+        <el-table-column :label="$t('期望收款账户')" align="center">
           <template slot-scope="scope" v-if="scope.row.type !== 'total'">
             {{ `${bankData.find(v => v.id == scope.row.platformAccountId).baAccountName}(${bankData.find(v => v.id == scope.row.platformAccountId).baAccountNum})` }}
           </template>
         </el-table-column>
-        <el-table-column :label="$t('收款币种')" align="center">
+        <el-table-column :label="$t('期望收款币种')" align="center">
           <template slot-scope="scope">
             <dict-tag :type="DICT_TYPE.BOX_SHIPPING_PRICE_UNIT" :value="scope.row.collectionCurrencyId" />
           </template>
         </el-table-column>
-        <el-table-column :label="$t('收款汇率')" align="center">
+        <el-table-column :label="$t('期望收款汇率')" align="center">
           <template slot-scope="scope">
             <!-- <el-form-item
               v-if="scope.row.type !== 'total'"
@@ -207,10 +207,10 @@
               <el-input v-model="scope.row.collectionRate" @input="() => rateChange(scope.row, scope.$index)"></el-input>
             </el-form-item> -->
             <span v-if="scope.row.type !== 'total'">{{ scope.row.collectionRate }}</span>
-            <span v-else>{{ $t('收款总金额') }}</span>
+            <span v-else>{{ $t('期望收费金额') }}</span>
           </template>
         </el-table-column>
-        <el-table-column :label="$t('收款金额')" align="center" prop="collectionAmount">
+        <el-table-column :label="$t('期望收款金额')" align="center" prop="collectionAmount">
           <template slot-scope="scope">
             <span v-if="scope.row.type !== 'total'">{{ scope.row.collectionAmount }}</span>
             <div v-else>

src/views/ecw/order/singleApply.vue

@@ -120,7 +120,7 @@
         <el-table-column :label="$t('入仓货物属性')" align="center">
             <template slot-scope="scope">
               <span>{{$t('合计')}}：</span>
-              <span>{{scope.row.sumNum+this.$t('箱')+' '+scope.row.sumVolume+'m³ '+scope.row.sumWeight+'kg'}}</span>
+              <span>{{scope.row.sumNum+$t('箱')+' '+scope.row.sumVolume+'m³ '+scope.row.sumWeight+'kg'}}</span>
             </template>
         </el-table-column>
         <el-table-column :label="$t('入仓时间')" align="center">
@@ -221,6 +221,7 @@ export default {
       // 执行查询
       getMergeListByOrderNo(this.queryParams).then(response => {
         this.loading = false;
+        console.log('(response.data',response.data)
         if(response.data.mergedList){
           this.mergedList = response.data.mergedList;
         }