|
@@ -222,8 +222,8 @@
|
|
还需门槛产品金额1000/4000(5000),已选择0元(可使用8000元配额)正价产品,已选择8个正价产品(满10送2),<strong>再满2件产品,可享受优惠</strong>,差200元到订单起订金额(1800元),可选择4个促销产品,已选择2个促销产品
|
|
还需门槛产品金额1000/4000(5000),已选择0元(可使用8000元配额)正价产品,已选择8个正价产品(满10送2),<strong>再满2件产品,可享受优惠</strong>,差200元到订单起订金额(1800元),可选择4个促销产品,已选择2个促销产品
|
|
</div>
|
|
</div>
|
|
<div>
|
|
<div>
|
|
- <div v-if="$hasPermissions('B_salesEdit_salesPrice')">总金额:<strong>{{ detailData&&(detailData.totalCommonAmount || detailData.totalCommonAmount==0) ? toThousands(detailData.totalCommonAmount) : '--' }}</strong></div>
|
|
|
|
- <div v-if="$hasPermissions('B_salesEdit_salesPrice')">优惠金额:<strong>{{ detailData&&(detailData.totalCommonAmount || detailData.totalCommonAmount==0) ? toThousands(detailData.totalCommonAmount) : '--' }}</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>
|
|
</div>
|
|
</div>
|
|
</div>
|
|
</a-alert>
|
|
</a-alert>
|
|
@@ -301,7 +301,7 @@
|
|
loadData: parameter => {
|
|
loadData: parameter => {
|
|
this.disabled = true
|
|
this.disabled = true
|
|
this.queryParam.salesBillSn = this.salesBillSn || ''
|
|
this.queryParam.salesBillSn = this.salesBillSn || ''
|
|
- // this.getCount()
|
|
|
|
|
|
+ this.getCount()
|
|
return salesDetailList(Object.assign(parameter, this.queryParam, {
|
|
return salesDetailList(Object.assign(parameter, this.queryParam, {
|
|
showStock: true,
|
|
showStock: true,
|
|
promoRuleSn: this.promo.promoRuleSn,
|
|
promoRuleSn: this.promo.promoRuleSn,
|
|
@@ -414,7 +414,6 @@
|
|
// 统计
|
|
// 统计
|
|
getCount(){
|
|
getCount(){
|
|
salesDetailPromoCount(Object.assign(this.queryParam, {
|
|
salesDetailPromoCount(Object.assign(this.queryParam, {
|
|
- showStock: true,
|
|
|
|
promoRuleSn: this.promo.promoRuleSn,
|
|
promoRuleSn: this.promo.promoRuleSn,
|
|
promoSn: this.promo.promoSn,
|
|
promoSn: this.promo.promoSn,
|
|
salesPromoSn: this.promo.salesPromoSn
|
|
salesPromoSn: this.promo.salesPromoSn
|