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

调整费用明细顺序

parent 7c52a88c
...@@ -413,8 +413,8 @@ export default { ...@@ -413,8 +413,8 @@ export default {
this.showFeeDetailDialog = true this.showFeeDetailDialog = true
const freight = [], clearance = [] const freight = [], clearance = []
let freightFields = [{field: 'oneSeaFreight', label: this.$t('成交单价')}] let freightFields = []
let clearanceFields = [{field: 'oneClearanceFreight', label: this.$t('成交单价')}] let clearanceFields = []
// 不是特价则显示其他字段 // 不是特价则显示其他字段
if(!row.specialPriceType){ if(!row.specialPriceType){
freightFields = [ freightFields = [
...@@ -425,12 +425,13 @@ export default { ...@@ -425,12 +425,13 @@ export default {
{field: 'electrifiedFreightPrice', label: this.$t('带电加价')}, {field: 'electrifiedFreightPrice', label: this.$t('带电加价')},
{field: 'discountFreightPrice', label: this.$t('优惠活动减免')}, {field: 'discountFreightPrice', label: this.$t('优惠活动减免')},
{field: 'plainCommission', label: this.$t('明佣')} {field: 'plainCommission', label: this.$t('明佣')}
].concat(freightFields) ]
// 有减免金额才显示优惠后单价 // 有减免金额才显示优惠后单价
if(row['discountFreightPrice'] && row['discountFreightPrice'] > 0){ if(row['discountFreightPrice'] && row['discountFreightPrice'] > 0){
freightFields.push({field: 'afterDiscountSeaFreight', label: this.$t('优惠后单价')}) freightFields.push({field: 'afterDiscountSeaFreight', label: this.$t('优惠后单价')})
} }
freightFields.push({field: 'oneSeaFreight', label: this.$t('成交单价')})
freightFields.forEach(item => { freightFields.forEach(item => {
if(row[item.field]){ if(row[item.field]){
freight.push({ freight.push({
...@@ -449,10 +450,11 @@ export default { ...@@ -449,10 +450,11 @@ export default {
{field: 'liquidClearanceFeePrice', label: this.$t('液体加价')}, {field: 'liquidClearanceFeePrice', label: this.$t('液体加价')},
{field: 'electrifiedClearanceFeePrice', label: this.$t('带电加价')}, {field: 'electrifiedClearanceFeePrice', label: this.$t('带电加价')},
{field: 'discountClearanceFeePrice', label: this.$t('优惠活动减免')} {field: 'discountClearanceFeePrice', label: this.$t('优惠活动减免')}
].concat(clearanceFields) ]
if(row['discountClearanceFeePrice'] && row['discountClearanceFeePrice'] > 0){ if(row['discountClearanceFeePrice'] && row['discountClearanceFeePrice'] > 0){
clearanceFields.push({field: 'afterDiscountClearanceFreight', label: this.$t('优惠后单价')}) clearanceFields.push({field: 'afterDiscountClearanceFreight', label: this.$t('优惠后单价')})
} }
clearanceFields.push({field: 'oneClearanceFreight', label: this.$t('成交单价')})
clearanceFields.forEach(item => { clearanceFields.forEach(item => {
if(row[item.field]){ if(row[item.field]){
clearance.push({ clearance.push({
......
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