自编号报表优化

src/views/ecw/financial/selfNoReport.vue

@@ -80,55 +80,76 @@
           <span v-else>{{scope.row.selfNo}}</span>
         </template>
       </el-table-column>
-      <el-table-column :label="$t('应收款(Accounts receivable)')" align="center" prop="summaryInfo.receivableTotalFeeGroup"></el-table-column>
+      <el-table-column :label="$t('应收款(Accounts receivable)USD')" prop="summaryInfo.netReceiptsCollectFreightFeeGroup">
+        <template slot-scope="{row}">
+          {{row.summaryInfo.receivableTotalFee}}{{row.summaryInfo.receivableTotalFeeCurrency}}
+        </template>
+      </el-table-column>
+      <el-table-column :label="$t('应收款 RECEIVABLE')" align="center" prop="summaryInfo.receivableTotalFeeGroup">
+        <el-table-column :label="$t('运费 FREIGHT') + ColumnCurrencyName('Freight')" prop="summaryInfo.netReceiptsCollectFreightFeeGroup">
+          <template slot-scope="{row}">
+            {{row.summaryInfo.totalReceivableFreightFee}}{{row.summaryInfo.totalFreightFeeCurrency}}
+          </template>
+        </el-table-column>
+        <el-table-column :label="$t('清关费 CLEARING FEE') + ColumnCurrencyName('Clearance')">
+          <template slot-scope="{row}">
+            {{row.summaryInfo.totalReceivableClearanceFee}}{{row.summaryInfo.totalClearanceFeeCurrency}}
+          </template>
+        </el-table-column>
+        <el-table-column :label="$t('额外费用 EXTRAL FEE') + ColumnCurrencyName('Other')">
+          <template slot-scope="{row}">
+            {{row.summaryInfo.totalReceivableOtherFee}}{{row.summaryInfo.totalOtherFeeCurrency}}
+          </template>
+        </el-table-column>
+      </el-table-column>
       <el-table-column :label="'received in ' + (dstCountryName || $t('目的国')) + `(${$t('目的地实收')})`" align="center" prop="">
-        <el-table-column :label="$t('运费')" prop="summaryInfo.netReceiptsCollectFreightFeeGroup">
+        <el-table-column :label="$t('运费') + ColumnCurrencyName('Freight')" prop="summaryInfo.netReceiptsCollectFreightFeeGroup">
           <template slot-scope="{row}">
-            {{row.summaryInfo.totalNetReceiptsCollectFreightFee}}{{row.summaryInfo.netReceiptsCollectFreightFeeCurrency}}
+            {{row.summaryInfo.totalNetReceiptsCollectFreightFee}}{{row.summaryInfo.totalFreightFeeCurrency}}
           </template>
         </el-table-column>
-        <el-table-column :label="$t('清关费')" prop="summaryInfo.netReceiptsCollectClearanceFeeGroup">
+        <el-table-column :label="$t('清关费') + ColumnCurrencyName('Clearance')" prop="summaryInfo.netReceiptsCollectClearanceFeeGroup">
           <template slot-scope="{row}">
-            {{row.summaryInfo.totalNetReceiptsCollectClearanceFee}}{{row.summaryInfo.netReceiptsCollectClearanceFeeCurrency}}
+            {{row.summaryInfo.totalNetReceiptsCollectClearanceFee}}{{row.summaryInfo.totalClearanceFeeCurrency}}
           </template>
         </el-table-column>
-        <el-table-column :label="$t('额外费用')" prop="summaryInfo.netReceiptsCollectOtherFeeGroup">
+        <el-table-column :label="$t('额外费用') + ColumnCurrencyName('Other')" prop="summaryInfo.netReceiptsCollectOtherFeeGroup">
           <template slot-scope="{row}">
-            {{row.summaryInfo.totalNetReceiptsCollectOtherFee}}{{row.summaryInfo.netReceiptsCollectOtherFeeCurrency}}
+            {{row.summaryInfo.totalNetReceiptsCollectOtherFee}}{{row.summaryInfo.totalOtherFeeCurrency}}
           </template>
         </el-table-column>
       </el-table-column>
       <el-table-column :label="$t('received in China(中国实收)')" align="center" prop="" >
-        <el-table-column :label="$t('运费')" prop="summaryInfo.netReceiptsAdvanceFreightFeeGroup">
+        <el-table-column :label="$t('运费') + ColumnCurrencyName('Freight')" prop="summaryInfo.netReceiptsAdvanceFreightFeeGroup">
           <template slot-scope="{row}">
-            {{row.summaryInfo.netReceiptsAdvanceFreightFeeCurrency}}{{row.summaryInfo.netReceiptsAdvanceClearanceFeeCurrency}}
+            {{row.summaryInfo.netReceiptsAdvanceFreightFeeCurrency}}{{row.summaryInfo.totalFreightFeeCurrency}}
           </template>
         </el-table-column>
-        <el-table-column :label="$t('清关费')" prop="summaryInfo.netReceiptsAdvanceClearanceFeeGroup">
+        <el-table-column :label="$t('清关费') + ColumnCurrencyName('Clearance')" prop="summaryInfo.netReceiptsAdvanceClearanceFeeGroup">
           <template slot-scope="{row}">
-            {{row.summaryInfo.totalNetReceiptsAdvanceClearanceFee}}{{row.summaryInfo.netReceiptsAdvanceClearanceFeeCurrency}}
+            {{row.summaryInfo.totalNetReceiptsAdvanceClearanceFee}}{{row.summaryInfo.totalClearanceFeeCurrency}}
           </template>
         </el-table-column>
-        <el-table-column :label="$t('额外费用')" prop="summaryInfo.netReceiptsAdvanceOtherFeeGroup">
+        <el-table-column :label="$t('额外费用') + ColumnCurrencyName('Other')" prop="summaryInfo.netReceiptsAdvanceOtherFeeGroup">
           <template slot-scope="{row}">
-            {{row.summaryInfo.totalNetReceiptsAdvanceOtherFee}}{{row.summaryInfo.netReceiptsAdvanceOtherFeeCurrency}}
+            {{row.summaryInfo.totalNetReceiptsAdvanceOtherFee}}{{row.summaryInfo.totalOtherFeeCurrency}}
           </template>
         </el-table-column>
       </el-table-column>
       <el-table-column :label="$t('Discounts 折扣')" align="center" prop="">
-        <el-table-column :label="$t('运费')" prop="summaryInfo.discountFreightFeeGroup">
+        <el-table-column :label="$t('运费') + ColumnCurrencyName('Freight')" prop="summaryInfo.discountFreightFeeGroup">
           <template slot-scope="{row}">
-            {{row.summaryInfo.discountFreightFee}}{{row.summaryInfo.netReceiptsCollectFreightFeeCurrency}}
+            {{row.summaryInfo.discountFreightFee}}{{row.summaryInfo.totalFreightFeeCurrency}}
           </template>
         </el-table-column>
-        <el-table-column :label="$t('清关费')" prop="summaryInfo.discountClearanceFeeGroup">
+        <el-table-column :label="$t('清关费') + ColumnCurrencyName('Clearance')" prop="summaryInfo.discountClearanceFeeGroup">
           <template slot-scope="{row}">
-            {{row.summaryInfo.discountClearanceFee}}{{row.summaryInfo.netReceiptsCollectClearanceFeeCurrency}}
+            {{row.summaryInfo.discountClearanceFee}}{{row.summaryInfo.totalClearanceFeeCurrency}}
           </template>
         </el-table-column>
-        <el-table-column :label="$t('额外费用')" prop="summaryInfo.discountOtherFeeGroup">
+        <el-table-column :label="$t('额外费用') + ColumnCurrencyName('Other')" prop="summaryInfo.discountOtherFeeGroup">
           <template slot-scope="{row}">
-            {{row.summaryInfo.discountOtherFee}}{{row.summaryInfo.netReceiptsCollectOtherFeeCurrency}}
+            {{row.summaryInfo.discountOtherFee}}{{row.summaryInfo.totalOtherFeeCurrency}}
           </template>
         </el-table-column>
       </el-table-column>
@@ -178,7 +199,10 @@ export default {
     };
   },
   activated(){
-    this.getList();
+    // 如果有必须的条件则查询
+    if(this.queryParams.startWarehouseIdList.length && this.queryParams.dstCountryId){
+      this.getList();
+    }
   },
   created() {
     getCurrencyPage(this.params).then(res => this.currencyList = res.data.list)
@@ -222,6 +246,14 @@ export default {
       const country = this.countryList.find(item => item.id == this.queryParams.destCountryId)
       if(!country) return null
       return this.$l(country, 'title')
+    },
+    // 获取列的货币名称 columnName 取值为Other, Freight, Clearance
+    ColumnCurrencyName(){
+      return (columnName) => {
+        if(!this.list.length) return ''
+        let field = `total${columnName}FeeCurrency`
+        return `(${this.list[0]['summaryInfo'][field]})`
+      }
     }
   },
   methods: {