|
@@ -87,7 +87,7 @@
|
|
|
促销产品
|
|
|
</a-radio-button>
|
|
|
<a-radio-button :value="'c'+i" v-for="(item,i) in form.giveRuleList" :key="i" v-show="(form.regularPromotionSameFlag==='0'||form.scopeFlag==='0')&&form.promotionRuleType=='BUY_PROD_GIVE_PROD'&&form.giveRuleList">
|
|
|
- {{ '促销产品'+'(阶梯'+(i*1+1) +')' }}
|
|
|
+ {{ form.giveRuleList.length>1? '促销产品'+'(阶梯'+(i*1+1) +')' :'促销产品' }}
|
|
|
</a-radio-button>
|
|
|
<a-radio-button value="d" v-show="form.promotionRuleType=='PROMO_PROD'">
|
|
|
特价产品
|
|
@@ -301,9 +301,9 @@ export default {
|
|
|
}
|
|
|
return arr
|
|
|
},
|
|
|
- specialColumns(){
|
|
|
- const _this = this
|
|
|
- let arr = [
|
|
|
+ specialColumns () {
|
|
|
+ const _this = this
|
|
|
+ const arr = [
|
|
|
{ title: '产品分类', width: '11%', scopedSlots: { customRender: 'productType' }, align: 'center' },
|
|
|
{ title: '品牌', width: '11%', scopedSlots: { customRender: 'productBrand' }, align: 'center' },
|
|
|
{ title: '产品', scopedSlots: { customRender: 'product' }, width: '11%', align: 'center' },
|
|
@@ -318,16 +318,16 @@ export default {
|
|
|
// { title: '特约折扣', dataIndex: 'specialDiscountRate', width: '6%', align: 'center', customRender: function (text) { return ((text || text == 0) ? (text + '%') : '--') } },
|
|
|
{ title: '设置起订量', width: '7%', scopedSlots: { customRender: 'setNum' }, align: 'center' }
|
|
|
]
|
|
|
- if(_this.form.discountType =='0' || _this.form.discountType =='1'){
|
|
|
- arr.splice(5, 0,{ title: '省级折扣', dataIndex: 'provinceDiscountRate', width: '6%', align: 'center', customRender: function (text) { return ((text || text == 0) ? (text + '%') : '--') } })
|
|
|
- arr.splice(8, 0,{ title: '市级折扣', dataIndex: 'cityDiscountRate', width: '6%', align: 'center', customRender: function (text) { return ((text || text == 0) ? (text + '%') : '--') } })
|
|
|
- arr.splice(11, 0,{ title: '特约折扣', dataIndex: 'specialDiscountRate', width: '6%', align: 'center', customRender: function (text) { return ((text || text == 0) ? (text + '%') : '--') } })
|
|
|
- }else{
|
|
|
- arr.splice(5, 0,{ title: '省价直降金额', dataIndex: 'provinceSubtract', width: '6%', align: 'right', customRender: function (text) { return ((text || text == 0) ? ('-'+text ) : '--') } })
|
|
|
- arr.splice(8, 0,{ title: '市价直降金额', dataIndex: 'citySubtract', width: '6%', align: 'right', customRender: function (text) { return ((text || text == 0) ? ('-'+text) : '--') } })
|
|
|
- arr.splice(11, 0,{ title: '特约直降金额', dataIndex: 'specialSubtract', width: '6%', align: 'right', customRender: function (text) { return ((text || text == 0) ? ('-'+text) : '--') } })
|
|
|
+ if (_this.form.discountType == '0' || _this.form.discountType == '1') {
|
|
|
+ arr.splice(5, 0, { title: '省级折扣', dataIndex: 'provinceDiscountRate', width: '6%', align: 'center', customRender: function (text) { return ((text || text == 0) ? (text + '%') : '--') } })
|
|
|
+ arr.splice(8, 0, { title: '市级折扣', dataIndex: 'cityDiscountRate', width: '6%', align: 'center', customRender: function (text) { return ((text || text == 0) ? (text + '%') : '--') } })
|
|
|
+ arr.splice(11, 0, { title: '特约折扣', dataIndex: 'specialDiscountRate', width: '6%', align: 'center', customRender: function (text) { return ((text || text == 0) ? (text + '%') : '--') } })
|
|
|
+ } else {
|
|
|
+ arr.splice(5, 0, { title: '省价直降金额', dataIndex: 'provinceSubtract', width: '6%', align: 'right', customRender: function (text) { return ((text || text == 0) ? ('-' + text) : '--') } })
|
|
|
+ arr.splice(8, 0, { title: '市价直降金额', dataIndex: 'citySubtract', width: '6%', align: 'right', customRender: function (text) { return ((text || text == 0) ? ('-' + text) : '--') } })
|
|
|
+ arr.splice(11, 0, { title: '特约直降金额', dataIndex: 'specialSubtract', width: '6%', align: 'right', customRender: function (text) { return ((text || text == 0) ? ('-' + text) : '--') } })
|
|
|
}
|
|
|
- return arr
|
|
|
+ return arr
|
|
|
}
|
|
|
},
|
|
|
methods: {
|