完善订单费用汇总

src/views/ecw/order/components/FeeDetail.vue

@@ -10,7 +10,7 @@
           {{orderSummary.receivableClearanceFee}}{{currencyMap[orderSummary.clearanceFreightCurrency]}}
         </el-descriptions-item>
         <el-descriptions-item :label="$t('应收额外费用')">
-          {{orderSummary.receivableOtherFee}}{{currencyMap[orderSummary.clearanceOtherCurrency]}}
+          {{orderSummary.receivableOtherFee}}{{currencyMap[orderSummary.otherFeeCurrency]}}
         </el-descriptions-item>
         <el-descriptions-item :label="$t('应收总金额')">
           {{orderSummary.receivableTotalAmount}}{{currencyMap[orderSummary.writeOffCurrencyId]}}
@@ -22,7 +22,7 @@
           {{orderSummary.netReceiptsClearanceFee}}{{currencyMap[orderSummary.clearanceFreightCurrency]}}
         </el-descriptions-item>
         <el-descriptions-item :label="$t('实收额外费用')">
-          {{orderSummary.netReceiptsOtherFee}}{{currencyMap[orderSummary.clearanceOtherCurrency]}}
+          {{orderSummary.netReceiptsOtherFee}}{{currencyMap[orderSummary.otherFeeCurrency]}}
         </el-descriptions-item>
         <el-descriptions-item :label="$t('实收总额')">
           {{orderSummary.netReceiptsTotalAmount}}{{currencyMap[orderSummary.writeOffCurrencyId]}}
@@ -34,7 +34,7 @@
           {{orderSummary.discountClearanceFee}}{{currencyMap[orderSummary.clearanceFreightCurrency]}}
         </el-descriptions-item>
         <el-descriptions-item :label="$t('额外费用优惠金额')">
-          {{orderSummary.discountOtherFee}}{{currencyMap[orderSummary.clearanceOtherCurrency]}}
+          {{orderSummary.discountOtherFee}}{{currencyMap[orderSummary.otherFeeCurrency]}}
         </el-descriptions-item>
         <el-descriptions-item :label="$t('订单优惠金额')">
           {{orderSummary.discountTotalAmount}}{{currencyMap[orderSummary.writeOffCurrencyId]}}
@@ -250,11 +250,11 @@
             <dict-tag :type="DICT_TYPE.FEE_TYPE" :value="row.feeType"></dict-tag>
           </template>
         </el-table-column>
-        <el-table-column :label="$t('金额')" prop="realityTotalAmount">
+        <!--<el-table-column :label="$t('金额')" prop="realityTotalAmount">
           <template slot-scope="{row}">
             TODO {{currencyMap[row.currencyId]}}
           </template>
-        </el-table-column>
+        </el-table-column>-->
         <el-table-column :label="$t('付款类型')">
           <template slot-scope="{row}">
             <dict-tag :type="DICT_TYPE.ECW_PAY_ADVANCE" :value="row.isPayAdvance"></dict-tag>
@@ -268,7 +268,7 @@
         </el-table-column>
         <el-table-column :label="$t('收款优惠金额')" width="120" prop="discountFee">
           <template slot-scope="{row}">
-            {{row.discountTotal}}{{currencyMap[row.currencyId]}}
+            {{row.discountTotal || 0}}{{currencyMap[row.currencyId]}}
           </template>
         </el-table-column>
         <el-table-column :label="$t('实收美元金额')" width="120" prop="realFee">
@@ -281,7 +281,7 @@
             <dict-tag :type="DICT_TYPE.ECW_RECEIVABLE_STATE" :value="row.state"></dict-tag>
           </template>
         </el-table-column>
-        <el-table-column :label="$t('申请人')" prop="author"></el-table-column>
+        <el-table-column :label="$t('申请人')" prop="authorName"></el-table-column>
         <el-table-column :label="$t('申请时间')" prop="applyTime">
           <template slot-scope="{row}">{{row.createTime|parseTime}}</template>
         </el-table-column>
@@ -295,11 +295,11 @@
             <dict-tag :type="DICT_TYPE.FEE_TYPE" :value="row.feeType"></dict-tag>
           </template>
         </el-table-column>
-        <el-table-column :label="$t('金额')" prop="fee">
+        <!--<el-table-column :label="$t('金额')" prop="fee">
           <template slot-scope="{row}">
             TODO {{currencyMap[row.currencyId]}}
           </template>
-        </el-table-column>
+        </el-table-column>-->
         <el-table-column :label="$t('付款类型')">
           <template slot-scope="{row}">
             <dict-tag :type="DICT_TYPE.ECW_PAY_ADVANCE" :value="row.isPayAdvance"></dict-tag>
@@ -465,13 +465,13 @@ export default  {
     // 特需汇总
     getSpecialSummaries(){
       let arr = []
-      arr[3] = this.$t('合计')
+      arr[2] = this.$t('合计')
       // 应收金额
-      arr[4] = this.calcTotalByCurrency(this.specialNeedFeeList, 'receivableTotalAmount', 'currencyId')
+      arr[3] = this.calcTotalByCurrency(this.specialNeedFeeList, 'receivableTotalAmount', 'currencyId')
       // 收款优惠金额
-      arr[5] = this.calcTotalByCurrency(this.specialNeedFeeList, 'discountTotal', 'currencyId')
+      arr[4] = this.calcTotalByCurrency(this.specialNeedFeeList, 'discountTotal', 'currencyId')
       // 实收金额
-      arr[6] = this.calcTotalByCurrency(this.specialNeedFeeList, 'realityTotalAmount', 'currencyId')
+      arr[5] = this.calcTotalByCurrency(this.specialNeedFeeList, 'realityTotalAmount', 'currencyId')
       return arr
     },
     // 费用申请汇总