Commit e10e1abc authored by dragondean@qq.com's avatar dragondean@qq.com

解决几个bug

parent b1041f6b
...@@ -721,8 +721,8 @@ export default { ...@@ -721,8 +721,8 @@ export default {
return exportCustomerExcel(params); return exportCustomerExcel(params);
}).then(response => { }).then(response => {
this.$download.excel(response, `${this.$t('客户信息')}.xls`); this.$download.excel(response, `${this.$t('客户信息')}.xls`);
console.log(response,'response') /* console.log(response,'response')
this.$download.excel(response, `${this.$t('全部客户信息')}.xls`); this.$download.excel(response, `${this.$t('全部客户信息')}.xls`); */
this.exportLoading = false; this.exportLoading = false;
}).catch(() => {}); }).catch(() => {});
}, },
......
...@@ -355,9 +355,11 @@ ...@@ -355,9 +355,11 @@
</div> </div>
</el-descriptions-item> </el-descriptions-item>
<el-descriptions-item :label="$t('预计费用')" :span="1"> <el-descriptions-item :label="$t('预计费用')" :span="1">
<div>
<template v-for="item in estimatedCosts"> <template v-for="item in estimatedCosts">
<div :key="item.currencyId">{{item.amount || 0}}{{currencyMap[item.currencyId]}}</div> <div :key="item.currencyId">{{item.amount || 0}}{{currencyMap[item.currencyId]}}</div>
</template> </template>
</div>
</el-descriptions-item> </el-descriptions-item>
</el-descriptions> </el-descriptions>
</el-card> </el-card>
...@@ -627,7 +629,7 @@ export default { ...@@ -627,7 +629,7 @@ export default {
sum.totalNum = sum.totalNum.plus(item.num || 0) sum.totalNum = sum.totalNum.plus(item.num || 0)
sum.totalVolume = sum.totalVolume.plus(item.volume || 0) sum.totalVolume = sum.totalVolume.plus(item.volume || 0)
sum.totalWeight = sum.totalWeight.plus(item.weight || 0) sum.totalWeight = sum.totalWeight.plus(item.weight || 0)
sum.totaltotalWorthNum = sum.totalWorth.plus(item.worth || 0) sum.totalWorth = sum.totalWorth.plus(item.worth || 0)
sum.totalQuatity = sum.totalQuatity.plus(item.quantity || 0) sum.totalQuatity = sum.totalQuatity.plus(item.quantity || 0)
}) })
return sum return sum
...@@ -695,6 +697,7 @@ export default { ...@@ -695,6 +697,7 @@ export default {
estimatedCosts(){ estimatedCosts(){
let arr = [] let arr = []
let withInsuranceFee = false let withInsuranceFee = false
let withOtherFee = false
this.originalFeeList.forEach(item => { this.originalFeeList.forEach(item => {
let it = { let it = {
currencyId: item.currencyId, currencyId: item.currencyId,
...@@ -706,6 +709,7 @@ export default { ...@@ -706,6 +709,7 @@ export default {
} }
if(this.form.otherFee && this.form.otherFeeCurrencyId == item.currencyId){ if(this.form.otherFee && this.form.otherFeeCurrencyId == item.currencyId){
it.amount = it.amount.plus(this.form.otherFee) it.amount = it.amount.plus(this.form.otherFee)
withOtherFee = true
} }
// 保价费(美元) // 保价费(美元)
if(item.currencyId == 1 && this.fee && this.fee.insuranceFee){ if(item.currencyId == 1 && this.fee && this.fee.insuranceFee){
...@@ -715,6 +719,21 @@ export default { ...@@ -715,6 +719,21 @@ export default {
arr.push(it) arr.push(it)
}) })
// 如果没有累加其他费用,则另外增加货币
if(!withOtherFee && this.form.otherFee){
let fee = {
currencyId: this.form.otherFeeCurrencyId,
amount: Decimal(this.form.otherFee)
}
// 如果保价费跟其他费用是同一种货币(都是美元)
if(!withInsuranceFee && this.fee && this.fee.insuranceFee && this.form.otherFeeCurrencyId == 1){
fee.amount = fee.amount.plus(this.fee.insuranceFee)
}
arr.push(fee)
}
// 没有累加保价费(没有美元计价)但是有保价费则需要加上去 // 没有累加保价费(没有美元计价)但是有保价费则需要加上去
if(!withInsuranceFee && this.fee && this.fee.insuranceFee){ if(!withInsuranceFee && this.fee && this.fee.insuranceFee){
arr.push({ arr.push({
...@@ -953,7 +972,7 @@ export default { ...@@ -953,7 +972,7 @@ export default {
} }
updateOffer(data).then(response => { updateOffer(data).then(response => {
this.$modal.msgSuccess(this.$t("修改成功")); this.$modal.msgSuccess(this.$t("修改成功"));
this.$router.back() this.$redirect('index')
}); });
return; return;
} }
......
...@@ -76,7 +76,11 @@ ...@@ -76,7 +76,11 @@
<!-- 列表 --> <!-- 列表 -->
<el-table v-loading="loading" :data="list" border> <el-table v-loading="loading" :data="list" border>
<el-table-column :label="$t('报价单号')" align="left" prop="number" width="200px" /> <el-table-column :label="$t('报价单号')" align="left" prop="number" width="200px">
<template slot-scope="{row}">
<el-link type="primary" @click.native="$router.push('detail?offerId=' + row.offerId)">{{row.number}}</el-link>
</template>
</el-table-column>
<el-table-column :label="$t('订单编号')" align="left" prop="orderNo" /> <el-table-column :label="$t('订单编号')" align="left" prop="orderNo" />
<el-table-column :label="$t('客户名称')" align="left" prop="relationName" /> <el-table-column :label="$t('客户名称')" align="left" prop="relationName" />
<el-table-column :label="$t('目的地')" align="center" prop="objectiveName" /> <el-table-column :label="$t('目的地')" align="center" prop="objectiveName" />
......
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