7

src/views/ecw/box/batchMarkup.vue

@@ -226,17 +226,14 @@
       <el-table-column :label="$t('始发仓/渠道-目的仓')" align="center">
         <template v-slot="scope"> {{ scope.row.destAdjustToStartWarehouseName }}-{{ scope.row.destAdjustToDestWarehouseName }} </template>
       </el-table-column>
-      <el-table-column :label="$t('额外费用')" align="center">
+      <el-table-column :label="$t('额外费用')" align="center" width="150">
         <template slot-scope="{ row }">
           <div v-for="(item, feeIndex) in row.costVO.feeDtoList" :key="feeIndex">
-            <div v-if="item.amount && item.feeType !== 1 && item.feeType !== 2">
-              <dict-tag :type="DICT_TYPE.FEE_TYPE" :value="item.feeType" />
-              {{ item.amount }} {{ currencyMap[item.currencyId] }}
-            </div>
+            <div v-if="item.amount && item.feeType !== 1 && item.feeType !== 2"><dict-tag :type="DICT_TYPE.FEE_TYPE" :value="item.feeType" />: {{ currencyMapF[item.currencyId] }}{{ item.amount }}</div>
           </div>
         </template>
       </el-table-column>
-      <el-table-column :label="$t('加价单价')" align="center">
+      <el-table-column :label="$t('加价单价')" align="center" width="150">
         <template slot-scope="scope">
           <div>{{ $t("运费") }}：{{ form.freightFee || 0 }}{{ currencyMap[form.freightCurrencyId] }}/{{ unitMap[form.freightUnitId] }}</div>
           <div>{{ $t("清关费") }}：{{ form.clearanceFee || 0 }}{{ currencyMap[form.clearanceCurrencyId] }}/{{ unitMap[form.clearanceUnitId] }}</div>
@@ -368,6 +365,13 @@ export default {
       })
       return map
     },
+    currencyMapF() {
+      let map = {}
+      this.currencyList.forEach((item) => {
+        map[item.id] = item.fuhao
+      })
+      return map
+    },
     unitMap() {
       let map = {}
       this.unitList.forEach((item) => {