|
@@ -15,27 +15,30 @@
|
|
</span>
|
|
</span>
|
|
<span v-else>购买满{{ descDetail.gateAmount }}元门槛产品,可使用 {{ descDetail.quotaAmount }}元配额,采购规则中的正价商品</span>
|
|
<span v-else>购买满{{ descDetail.gateAmount }}元门槛产品,可使用 {{ descDetail.quotaAmount }}元配额,采购规则中的正价商品</span>
|
|
</div>
|
|
</div>
|
|
- <span v-else>--</span>
|
|
|
|
|
|
+ <span v-else>无</span>
|
|
</a-descriptions-item>
|
|
</a-descriptions-item>
|
|
<a-descriptions-item label="促销规则">
|
|
<a-descriptions-item label="促销规则">
|
|
- <div v-if="descDetail.promotionRuleType == 'BUY_PROD_GIVE_PROD'">
|
|
|
|
|
|
+ {{ descDetail.regularSameFlag==='1'?'同款,':'不同款,' }}
|
|
|
|
+ <span v-if="descDetail.promotionRuleType == 'BUY_PROD_GIVE_PROD'">
|
|
购买满{{ descDetail.regularQty }}个正价产品,送{{ descDetail.promotionQty }}个促销产品
|
|
购买满{{ descDetail.regularQty }}个正价产品,送{{ descDetail.promotionQty }}个促销产品
|
|
- </div>
|
|
|
|
- <div v-else-if="descDetail.promotionRuleType == 'BUY_PROD_GIVE_MONEY'">
|
|
|
|
|
|
+ {{ descDetail.accrualFlag ? ',数量叠加':',数量不叠加' }}
|
|
|
|
+ </span>
|
|
|
|
+ <span v-else-if="descDetail.promotionRuleType == 'BUY_PROD_GIVE_MONEY'">
|
|
购买满{{ descDetail.regularAmount }}元正价产品,送{{ descDetail.giveAmount }}元促销品采购额
|
|
购买满{{ descDetail.regularAmount }}元正价产品,送{{ descDetail.giveAmount }}元促销品采购额
|
|
- </div>
|
|
|
|
- <div v-else>
|
|
|
|
|
|
+ {{ descDetail.accrualFlag ? ',金额叠加':',金额不叠加' }}
|
|
|
|
+ </span>
|
|
|
|
+ <span v-else>
|
|
特价产品
|
|
特价产品
|
|
- </div>
|
|
|
|
|
|
+ </span>
|
|
</a-descriptions-item>
|
|
</a-descriptions-item>
|
|
- <a-descriptions-item label="显示正价产品款数">
|
|
|
|
|
|
+ <a-descriptions-item label="限制正价产品款数" v-if="descDetail.promotionRuleType!='PROMO_PROD'&&descDetail.promotionRuleType!='BUY_PROD_GIVE_MONEY'">
|
|
{{ descDetail.restrictCategory||'--' }}
|
|
{{ descDetail.restrictCategory||'--' }}
|
|
</a-descriptions-item>
|
|
</a-descriptions-item>
|
|
- <a-descriptions-item label="订单起订金额">
|
|
|
|
- {{ descDetail.minOrderAmount||'--' }}
|
|
|
|
|
|
+ <a-descriptions-item label="订单起订金额(元)">
|
|
|
|
+ {{ descDetail.minOrderAmount||'无' }}
|
|
</a-descriptions-item>
|
|
</a-descriptions-item>
|
|
- <a-descriptions-item label="活动经费上线">
|
|
|
|
- {{ descDetail.upperLimitAmount||'--' }}
|
|
|
|
|
|
+ <a-descriptions-item label="活动经费上线(元)">
|
|
|
|
+ {{ descDetail.upperLimitAmount||'无' }}
|
|
</a-descriptions-item>
|
|
</a-descriptions-item>
|
|
</a-descriptions>
|
|
</a-descriptions>
|
|
</div>
|
|
</div>
|
|
@@ -161,6 +164,12 @@
|
|
<a-badge :number-style="{ backgroundColor: '#52c41a' }" count="活动" v-if="record.promotableFlag == 1"></a-badge>
|
|
<a-badge :number-style="{ backgroundColor: '#52c41a' }" count="活动" v-if="record.promotableFlag == 1"></a-badge>
|
|
</div>
|
|
</div>
|
|
</template>
|
|
</template>
|
|
|
|
+
|
|
|
|
+ <!-- 促销价 -->
|
|
|
|
+ <template slot="discountPrice" slot-scope="text, record">
|
|
|
|
+ <span>{{ record.discountedPrice }}</span>
|
|
|
|
+ ({{ record.discountRate }}%)
|
|
|
|
+ </template>
|
|
<!-- 销售数量 -->
|
|
<!-- 销售数量 -->
|
|
<template slot="salesNums" slot-scope="text, record">
|
|
<template slot="salesNums" slot-scope="text, record">
|
|
<a-input-number
|
|
<a-input-number
|
|
@@ -230,7 +239,7 @@
|
|
</div>
|
|
</div>
|
|
<div>
|
|
<div>
|
|
<div v-if="$hasPermissions('B_salesEdit_salesPrice')">总金额:<strong>{{ countData&&(countData.totalAmount || countData.totalAmount==0) ? toThousands(countData.totalAmount) : '--' }}</strong></div>
|
|
<div v-if="$hasPermissions('B_salesEdit_salesPrice')">总金额:<strong>{{ countData&&(countData.totalAmount || countData.totalAmount==0) ? toThousands(countData.totalAmount) : '--' }}</strong></div>
|
|
- <div v-if="$hasPermissions('B_salesEdit_salesPrice')">优惠金额:<strong>{{ countData&&(countData.lossAmount || countData.lossAmount==0) ? toThousands(countData.lossAmount) : '--' }}</strong></div>
|
|
|
|
|
|
+ <div v-if="$hasPermissions('B_salesEdit_salesPrice')&&countData&&countData.lossAmount">优惠金额:<strong>{{ toThousands(countData.lossAmount) }}</strong></div>
|
|
</div>
|
|
</div>
|
|
</div>
|
|
</div>
|
|
</div>
|
|
</div>
|
|
@@ -333,6 +342,7 @@
|
|
for (var i = 0; i < data.list.length; i++) {
|
|
for (var i = 0; i < data.list.length; i++) {
|
|
data.list[i].no = no + i + 1
|
|
data.list[i].no = no + i + 1
|
|
data.list[i].qtyBackups = data.list[i].qty
|
|
data.list[i].qtyBackups = data.list[i].qty
|
|
|
|
+ data.list[i].unitQtyV = data.list[i].unitQty ? (data.list[i].unitQty + data.list[i].productEntity.unit) : '--'
|
|
}
|
|
}
|
|
this.disabled = false
|
|
this.disabled = false
|
|
this.dataSource = data.list
|
|
this.dataSource = data.list
|
|
@@ -375,7 +385,7 @@
|
|
{ title: '序号', dataIndex: 'no', width: '4%', align: 'center' },
|
|
{ title: '序号', dataIndex: 'no', width: '4%', align: 'center' },
|
|
{ title: '产品编码', dataIndex: 'productEntity.code', scopedSlots: { customRender: 'productCode' }, width: '13%', 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: '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: 'unitQtyV', width: '8%', align: 'center', customRender: function (text) { return ((text || text == 0) ? text : '--') } },
|
|
{ title: '销售数量', scopedSlots: { customRender: 'salesNums' }, width: '8%', align: 'center' },
|
|
{ title: '销售数量', scopedSlots: { customRender: 'salesNums' }, width: '8%', align: 'center' },
|
|
{ title: '库存', dataIndex: 'stockQty', scopedSlots: { customRender: 'stockQty' }, width: '8%', align: 'center' },
|
|
{ title: '库存', dataIndex: 'stockQty', scopedSlots: { customRender: 'stockQty' }, width: '8%', align: 'center' },
|
|
{ title: '出库仓库', scopedSlots: { customRender: 'warehouseBox' }, width: '15%', align: 'center' },
|
|
{ title: '出库仓库', scopedSlots: { customRender: 'warehouseBox' }, width: '15%', align: 'center' },
|
|
@@ -385,6 +395,10 @@
|
|
]
|
|
]
|
|
if (this.$hasPermissions('B_salesEdit_salesPrice')) { // 售价权限
|
|
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) : '--') })
|
|
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) : '--') })
|
|
arr.splice(7, 0, { title: '售价小计', dataIndex: 'totalAmount', width: '8%', align: 'right', customRender: text => ((text || text == 0) ? this.toThousands(text) : '--') })
|
|
}
|
|
}
|
|
return arr
|
|
return arr
|
|
@@ -452,6 +466,7 @@
|
|
this.queryParam.productTypeSn2 = ''
|
|
this.queryParam.productTypeSn2 = ''
|
|
this.queryParam.productTypeSn3 = ''
|
|
this.queryParam.productTypeSn3 = ''
|
|
this.productType = []
|
|
this.productType = []
|
|
|
|
+ this.rowSelectionInfo = null
|
|
this.$refs.table.clearSelected()
|
|
this.$refs.table.clearSelected()
|
|
this.$refs.table.refresh(!!flag)
|
|
this.$refs.table.refresh(!!flag)
|
|
},
|
|
},
|