|
@@ -532,7 +532,7 @@ export default {
|
|
|
const gateSelected = isYuan ? item.gateTotalAmount : item.gateQty // 已选
|
|
|
const gateTotal = isYuan ? item.gateBorrowAmount : item.gateBorrowQty // 累计
|
|
|
const gateQuota = isYuan ? item.gateQuotaAmount : item.gateQuotaQty // 配额
|
|
|
- const geteBalance = item.gateShortfallValue // 差额 = 配额 - 已选 - 累计
|
|
|
+ const geteBalance = isYuan ? item.gateCeAmount : item.gateCeQty // 差额 = 配额 - 已选 - 累计
|
|
|
// 正价统计
|
|
|
const isYuan1 = item.regularRuleUnit == 'YUAN'
|
|
|
const regularUnit = isYuan1 ? '元' : '个' // 单位
|
|
@@ -540,24 +540,24 @@ export default {
|
|
|
const regularRuleValue = item.regularRuleValue // 额度
|
|
|
const regularSelected = isYuan1 ? item.regularTotalAmount : item.regularTotalQty // 已选
|
|
|
const regularTotal = isYuan1 ? item.regularBorrowAmount : item.regularBorrowQty // 累计
|
|
|
- const regularBalance = regularRuleValue - regularSelected - regularTotal // 差额 = 额度 - 已选 - 累计
|
|
|
+ const regularBalance = isYuan ? item.regularCeAmount : item.regularCeQty // 差额 = 额度 - 已选 - 累计
|
|
|
// 促销品
|
|
|
const promoUnit = '个'
|
|
|
const promoSelected = item.giftQty || 0 // 已选
|
|
|
const promoBalance = item.giftShortfallQty // 差额
|
|
|
- const promoLimit = promoBalance * 1 + promoSelected * 1 // 额度 = 差额 + 已选
|
|
|
+ const promoLimit = item.giftCeQty // 额度 = 差额 + 已选
|
|
|
// 采购额
|
|
|
const purchaseUnit = '元'
|
|
|
const purchaseLimit = item.totalPromoGiftsAmount // 额度
|
|
|
const purchaseSelected = item.totalUsePromoGiftsAmount // 已选
|
|
|
- const purchaseSurplus = (purchaseLimit - purchaseSelected) || 0 // 结余
|
|
|
- const purchaseOverspend = (purchaseSelected - purchaseLimit) || 0 // 超支
|
|
|
+ const purchaseSurplus = item.surplusAmount || 0 // 结余
|
|
|
+ const purchaseOverspend = item.disSurplusAmount || 0 // 超支
|
|
|
// 特价产品
|
|
|
const isYuan2 = item.gateRuleUnit == 'YUAN'
|
|
|
const specialPriceUnit = isYuan2 ? '元' : '个' // 单位
|
|
|
const specialPriceQuota = (isYuan2 ? item.specialPriceQuotaAmount : item.specialPriceQuotaQty) || 0 // 配额
|
|
|
const specialPriceSelected = isYuan2 ? item.discountAmount : item.discountQty || 0 // 已选
|
|
|
- const specialPriceBalance = !specialPriceQuota ? 0 : (specialPriceQuota - specialPriceSelected)// 差额 = 配额 - 已选 - 累计
|
|
|
+ const specialPriceBalance = !specialPriceQuota ? 0 : isYuan ? item.discountCeAmount : item.discountCeQty// 差额 = 配额 - 已选
|
|
|
|
|
|
// 促销品
|
|
|
this.tableData.push({
|