Commit 8a7c611d authored by dragondean@qq.com's avatar dragondean@qq.com

修复几个bug

parent 5d57b2db
......@@ -282,9 +282,9 @@ export default {
couponList: [], // 优惠券列表
couponIds:[],
fee:{
1: [{type:1},{type:1}], // 运费
2: [{type:2},{type:2}], // 清关费
3: [{}] // 优惠券专用
1: [],
2: [],
3: []
}
};
},
......@@ -402,12 +402,15 @@ export default {
if(this.form.discountDetailedVOs){
/* this[['clearanceFeeList', 'freightFeeList', 'discountList'][]] */
this.fee[this.form.costType] = this.form.discountDetailedVOs
// this.fee[this.form.costType] = this.form.discountDetailedVOs.filter(item => item.type == this.form.costType)
}
if(this.costType != this.form.costType){
this.form.discountDetailedVOs.forEach(item => {
this.fee[item.type].push(item)
})
/* if(this.costType != this.form.costType){
console.error(`费用类型冲突,计算出来的类型为${this.costType},接口费用类型为${res.data.costType},类型为${res.data.type}`)
this.$alert(this.$t('费用类型冲突'))
}
} */
// 非优惠券需要查询出优惠券作为叠加备选
if(this.form.type != 1){
this.getCouponSelect()
......@@ -417,8 +420,15 @@ export default {
if(this.$route.query.action == 'copy'){
this.form.couponId = null
}
})
}
// 不是编辑查看则给默认的费用表格
else{
this.fee = {
1: [{type:1},{type:1}], // 运费
2: [{type:2},{type:2}], // 清关费
3: [{}] // 优惠券专用
}
);
}
this.reset()
},
......
......@@ -49,7 +49,7 @@
</div>
<el-table :data="[formData]" border class="release-table">
<el-table-column :label="$t('控货箱数')">
{{detail.sumNum}}
{{detail.sumNum - detail.releaseNum }}
</el-table-column>
<el-table-column :label="$t('放货箱数')">
<template slot-scope="{row}">
......
......@@ -201,10 +201,14 @@
{{objective.titleZh || '-'}}
</el-table-column>
<el-table-column :label="$t('品名')" prop="titleZh"></el-table-column>
<el-table-column :label="$t('箱数')" prop="num"></el-table-column>
<el-table-column :label="$t('箱数')" prop="num">
<template slot-scope="{row}">
{{row.num || '-'}}
</template>
</el-table-column>
<el-table-column :label="$t('体积/重量')">
<template slot-scope="{row}">
{{row.volume}} / {{row.weight}}
{{row.volume || '-'}} / {{row.weight || '-'}}
</template>
</el-table-column>
<el-table-column :label="$t('收款类型')">
......
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