|
@@ -95,8 +95,8 @@
|
|
|
</template>
|
|
|
<!-- 采购单价 -->
|
|
|
<template slot="unitPrice" slot-scope="text, record">
|
|
|
- <span v-if="record.promotionFlag && (record.promotionFlag=='GIFT' || record.promotionFlag=='DISCOUNT')">{{ record.discountedPrice||record.discountedPrice==0? toThousands(record.discountedPrice): '--' }}{{ record.origPrice ? '(' + toThousands(record.origPrice) + ')' : '' }}</span>
|
|
|
- <span v-else>{{ toThousands(record.discountedPrice||0) }}</span>
|
|
|
+ <span v-if="record.promotionFlag && (record.promotionFlag=='GIFT' || record.promotionFlag=='DISCOUNT')">{{ record.price||record.price==0? toThousands(record.price): '--' }}{{ record.origPrice ? '(' + toThousands(record.origPrice) + ')' : '' }}</span>
|
|
|
+ <span v-else>{{ toThousands(record.price||0) }}</span>
|
|
|
</template>
|
|
|
<!-- 采购金额 -->
|
|
|
<template slot="amount" slot-scope="text, record">
|
|
@@ -171,7 +171,7 @@ export default {
|
|
|
{ title: '已取消数量', dataIndex: 'cancelQty', width: '7%', align: 'center', customRender: function (text) { return ((text || text == 0) ? text : '--') } }
|
|
|
]
|
|
|
if (this.$hasPermissions('M_ShowAllCost')) {
|
|
|
- arr.splice(5, 0, { title: '采购单价', dataIndex: 'discountedPrice', width: '11%', align: 'right', scopedSlots: { customRender: 'unitPrice' } })
|
|
|
+ arr.splice(5, 0, { title: '采购单价', dataIndex: 'price', width: '11%', align: 'right', scopedSlots: { customRender: 'unitPrice' } })
|
|
|
arr.splice(6, 0, { title: '采购金额', dataIndex: 'discountedAmount', width: '11%', align: 'right', scopedSlots: { customRender: 'amount' } })
|
|
|
arr.splice(8, 0, { title: '审核订单金额', dataIndex: 'pushedAmount', width: '8%', align: 'right', customRender: function (text) { return ((text || text == 0) ? _this.toThousands(text, 2) : '--') } })
|
|
|
}
|