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

修复优惠提示暂无费用设置

parent 3cf4d273
...@@ -332,7 +332,7 @@ export default { ...@@ -332,7 +332,7 @@ export default {
for(let type in this.fee){ for(let type in this.fee){
let feeList = this.fee[type] let feeList = this.fee[type]
feeList.forEach(item => { feeList.forEach(item => {
if(item.reduceAmount){ if(item.reduceAmount || item.netReceiptsAmount){
costType = type costType = type
return false return false
} }
......
...@@ -150,7 +150,7 @@ ...@@ -150,7 +150,7 @@
<el-tooltip <el-tooltip
:is="row.orderType == 2 ? 'el-tooltip' : 'div'" :is="row.orderType == 2 ? 'el-tooltip' : 'div'"
class="item" effect="dark" class="item" effect="dark"
:content="(row.wvolume||0)+'m³'" :content="(row.wVolume||0)+'m³'"
placement="bottom"> placement="bottom">
<div v-if="row.inWarehouseState <= 1">{{row.costVO.totalVolume}}m³ /{{row.costVO.totalWeight}}Kg</div> <div v-if="row.inWarehouseState <= 1">{{row.costVO.totalVolume}}m³ /{{row.costVO.totalWeight}}Kg</div>
<div v-else>{{row.sumVolume}}m³ /{{row.sumWeight}}Kg</div> <div v-else>{{row.sumVolume}}m³ /{{row.sumWeight}}Kg</div>
......
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