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

src/views/ecw/financial/creatCollection.vue

@@ -275,9 +275,9 @@
               {{ `${NP.minus(scope.row.receivableAmount, scope.row.discountTotal || 0)}${scope.row.discountTotal > 0 ? `(${scope.row.receivableAmount} - ${scope.row.discountTotal})` : ''}` }}
             </template>
           </el-table-column>
-          <el-table-column align="center" width="220">
+          <el-table-column align="center">
             <template #header>
-              {{ $t('核销基准币种') }}（{{getCurrencyLabel(showCurrencyId)}}）{{ $t('汇率') }}
+              {{ $t('核销基准币种')+'（'+getCurrencyLabel(showCurrencyId)+'）'+ $t('汇率') }}
             </template>
             <template slot-scope="scope">
               <template v-if="scope.row.type !== 'total'">
@@ -293,13 +293,13 @@
                 </el-form-item>
               </template>
               <template v-else>
-                {{ $t('应收总金额') }}（	{{getCurrencyLabel(showCurrencyId)}}）
+                {{ $t('应收总金额')+'（'+getCurrencyLabel(showCurrencyId)+'）'}}
               </template>
             </template>
           </el-table-column>
           <el-table-column align="center" prop="writeOffAmount">
             <template #header>
-              {{ $t('核销基准金额') }}（	{{getCurrencyLabel(showCurrencyId)}}）
+              {{ $t('核销基准金额')+'（'+getCurrencyLabel(showCurrencyId)+'）'}}
             </template>
           </el-table-column>
           <el-table-column :label="$t('期望收款账户')" align="center">