Commit 1e323da1 authored by dragondean@qq.com's avatar dragondean@qq.com

应收报表中国实收运费字段错误

parent 354c8088
...@@ -20,7 +20,7 @@ ...@@ -20,7 +20,7 @@
> >
<el-select <el-select
v-model="queryParams.startWarehouseIdList" v-model="queryParams.startWarehouseIdList"
multiple multiple
:placeholder="$t('请选择')" :placeholder="$t('请选择')"
clearable clearable
...@@ -104,7 +104,7 @@ ...@@ -104,7 +104,7 @@
:start-placeholder="$t('开始日期')" :start-placeholder="$t('开始日期')"
:end-placeholder="$t('结束日期')" :end-placeholder="$t('结束日期')"
value-format="yyyy-MM-dd HH:mm:ss" value-format="yyyy-MM-dd HH:mm:ss"
> >
</el-date-picker> </el-date-picker>
</el-form-item> </el-form-item>
...@@ -117,7 +117,7 @@ ...@@ -117,7 +117,7 @@
:start-placeholder="$t('开始日期')" :start-placeholder="$t('开始日期')"
:end-placeholder="$t('结束日期')" :end-placeholder="$t('结束日期')"
value-format="yyyy-MM-dd HH:mm:ss" value-format="yyyy-MM-dd HH:mm:ss"
> >
</el-date-picker> </el-date-picker>
</el-form-item> </el-form-item>
...@@ -130,7 +130,7 @@ ...@@ -130,7 +130,7 @@
:start-placeholder="$t('开始日期')" :start-placeholder="$t('开始日期')"
:end-placeholder="$t('结束日期')" :end-placeholder="$t('结束日期')"
value-format="yyyy-MM-dd HH:mm:ss" value-format="yyyy-MM-dd HH:mm:ss"
> >
</el-date-picker> </el-date-picker>
</el-form-item> </el-form-item>
...@@ -272,7 +272,7 @@ ...@@ -272,7 +272,7 @@
prop="summaryInfo.netReceiptsAdvanceFreightFeeGroup" prop="summaryInfo.netReceiptsAdvanceFreightFeeGroup"
> >
<template slot-scope="{ row }"> <template slot-scope="{ row }">
{{ row.summaryInfo.netReceiptsAdvanceFreightFee {{ row.summaryInfo.totalNetReceiptsAdvanceFreightFee
}}{{ row.summaryInfo.totalFreightFeeCurrency }} }}{{ row.summaryInfo.totalFreightFeeCurrency }}
</template> </template>
</el-table-column> </el-table-column>
...@@ -407,20 +407,20 @@ export default { ...@@ -407,20 +407,20 @@ export default {
let da= res.data.filter( let da= res.data.filter(
(item) => +item.tradeType === 2 || +item.tradeType === 3 (item) => +item.tradeType === 2 || +item.tradeType === 3
); );
let ids = da.map(item => item.id); let ids = da.map(item => item.id);
this.$set(this.queryParams, "startWarehouseIdList", ids); this.$set(this.queryParams, "startWarehouseIdList", ids);
this.exportWarehouseList = da;//下拉框数据 this.exportWarehouseList = da;//下拉框数据
} }
); );
getListTree({ treeType: 1 }).then((r) => { getListTree({ treeType: 1 }).then((r) => {
this.countryList = r.data; this.countryList = r.data;
}); });
}, },
watch: { watch: {
// 目的国变更后要重置目的仓 // 目的国变更后要重置目的仓
...@@ -486,8 +486,8 @@ export default { ...@@ -486,8 +486,8 @@ export default {
handleSelect(val){ handleSelect(val){
console.log("") console.log("")
//console.log(this.currencyList) //console.log(this.currencyList)
}, },
getCurrencyLabel(id) { getCurrencyLabel(id) {
const item = this.currencyList.find((item) => item.id === id); const item = this.currencyList.find((item) => item.id === id);
if (!item) return ""; if (!item) return "";
...@@ -506,7 +506,7 @@ export default { ...@@ -506,7 +506,7 @@ export default {
this.addBeginAndEndTime(params, this.daogangTime, "DaogangTime", false); this.addBeginAndEndTime(params, this.daogangTime, "DaogangTime", false);
this.addBeginAndEndTime(params, this.qingguanTime, "QingguanTime", false); this.addBeginAndEndTime(params, this.qingguanTime, "QingguanTime", false);
// 执行查询 // 执行查询
boxSettlementPage(params) boxSettlementPage(params)
.then((response) => { .then((response) => {
...@@ -561,7 +561,7 @@ export default { ...@@ -561,7 +561,7 @@ export default {
// 其他费用折扣 // 其他费用折扣
this.getTotal("discountOtherFee") + OtherCurrencyName, this.getTotal("discountOtherFee") + OtherCurrencyName,
]; ];
return data; return data;
}, },
/** 搜索按钮操作 */ /** 搜索按钮操作 */
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment