|
@@ -412,12 +412,14 @@
|
|
{ title: '操作', scopedSlots: { customRender: 'action' }, width: '12%', align: 'center' }
|
|
{ title: '操作', scopedSlots: { customRender: 'action' }, width: '12%', align: 'center' }
|
|
]
|
|
]
|
|
if (this.$hasPermissions('B_salesEdit_salesPrice')) { // 售价权限
|
|
if (this.$hasPermissions('B_salesEdit_salesPrice')) { // 售价权限
|
|
- arr.splice(3, 0, { title: '售价', dataIndex: 'price', width: '6%', align: 'right', scopedSlots: { customRender: 'price' } })
|
|
|
|
|
|
+ arr.splice(4, 0, { title: '售价', dataIndex: 'price', width: '6%', align: 'right', scopedSlots: { customRender: 'price' } })
|
|
|
|
+ let idx = 0
|
|
// 如果是特价活动
|
|
// 如果是特价活动
|
|
if(this.promo.promotionRule.promotionRuleType=='PROMO_PROD'){
|
|
if(this.promo.promotionRule.promotionRuleType=='PROMO_PROD'){
|
|
- arr.splice(4, 0, { title: '促销价', dataIndex: 'discountPrice', width: '6%', align: 'right', scopedSlots: { customRender: 'discountPrice' }})
|
|
|
|
|
|
+ idx = idx + 1
|
|
|
|
+ arr.splice(5, 0, { title: '促销价', dataIndex: 'discountPrice', width: '6%', align: 'right', scopedSlots: { customRender: 'discountPrice' }})
|
|
}
|
|
}
|
|
- arr.splice(7, 0, { title: '售价小计', dataIndex: 'totalAmount', width: '6%', align: 'right', customRender: text => ((text || text == 0) ? this.toThousands(text) : '--') })
|
|
|
|
|
|
+ arr.splice(8+idx, 0, { title: '售价小计', dataIndex: 'totalAmount', width: '6%', align: 'right', customRender: text => ((text || text == 0) ? this.toThousands(text) : '--') })
|
|
}
|
|
}
|
|
return arr
|
|
return arr
|
|
}
|
|
}
|