|
@@ -161,6 +161,12 @@
|
|
|
<a-badge :number-style="{ backgroundColor: '#52c41a' }" count="活动" v-if="record.promotableFlag == 1"></a-badge>
|
|
|
</div>
|
|
|
</template>
|
|
|
+
|
|
|
+ <!-- 促销价 -->
|
|
|
+ <template slot="discountPrice" slot-scope="text, record">
|
|
|
+ <span>{{ record.discountedPrice }}</span>
|
|
|
+ ({{ record.discountRate }}%)
|
|
|
+ </template>
|
|
|
<!-- 销售数量 -->
|
|
|
<template slot="salesNums" slot-scope="text, record">
|
|
|
<a-input-number
|
|
@@ -375,7 +381,7 @@
|
|
|
{ title: '序号', dataIndex: 'no', width: '4%', align: 'center' },
|
|
|
{ title: '产品编码', dataIndex: 'productEntity.code', scopedSlots: { customRender: 'productCode' }, width: '13%', align: 'center' },
|
|
|
{ title: '产品名称', dataIndex: 'productEntity.name', scopedSlots: { customRender: 'productName' }, width: '20%', align: 'left' },
|
|
|
- // { title: '售价', dataIndex: 'price', width: '8%', align: 'center', customRender: function (text) { return ((text || text == 0) ? text : '--') } },
|
|
|
+ { title: '起订量', dataIndex: 'unitQty', width: '8%', align: 'center', customRender: function (text) { return ((text || text == 0) ? text : '--') } },
|
|
|
{ title: '销售数量', scopedSlots: { customRender: 'salesNums' }, width: '8%', align: 'center' },
|
|
|
{ title: '库存', dataIndex: 'stockQty', scopedSlots: { customRender: 'stockQty' }, width: '8%', align: 'center' },
|
|
|
{ title: '出库仓库', scopedSlots: { customRender: 'warehouseBox' }, width: '15%', align: 'center' },
|
|
@@ -385,6 +391,10 @@
|
|
|
]
|
|
|
if (this.$hasPermissions('B_salesEdit_salesPrice')) { // 售价权限
|
|
|
arr.splice(3, 0, { title: '售价', dataIndex: 'price', width: '8%', align: 'right', customRender: text => ((text || text == 0) ? this.toThousands(text) : '--') })
|
|
|
+ // 如果是特价活动
|
|
|
+ if(this.promo.promotionRule.promotionRuleType=='PROMO_PROD'){
|
|
|
+ arr.splice(4, 0, { title: '促销价', dataIndex: 'discountPrice', width: '8%', align: 'right', scopedSlots: { customRender: 'discountPrice' }})
|
|
|
+ }
|
|
|
arr.splice(7, 0, { title: '售价小计', dataIndex: 'totalAmount', width: '8%', align: 'right', customRender: text => ((text || text == 0) ? this.toThousands(text) : '--') })
|
|
|
}
|
|
|
return arr
|