chenrui 4 mesiacov pred
rodič
commit
6a89fb34ac

+ 6 - 6
src/views/salesManagement/salesQueryNew/comps/activeStatisticsList.vue

@@ -277,7 +277,7 @@ export default {
               title: '配额',
               width: 50,
               align: 'center',
-              renderBodyCell: ({ row, column, rowIndex }, h) => formatTd(row, column, rowIndex, 'regularUnit')
+              renderBodyCell: ({ row, column, rowIndex }, h) => formatTd(row, column, rowIndex, 'gateUnit')
             },
             {
               field: 'regularSelected',
@@ -380,7 +380,7 @@ export default {
               title: '配额',
               width: 50,
               align: 'center',
-              renderBodyCell: ({ row, column, rowIndex }, h) => formatTd(row, column, rowIndex, 'specialPriceUnit')
+              renderBodyCell: ({ row, column, rowIndex }, h) => formatTd(row, column, rowIndex, 'gateUnit')
             },
             {
               field: 'specialPriceSelected',
@@ -532,15 +532,15 @@ 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 = isYuan ? item.gateCeAmount : item.gateCeQty // 差额 = 配额 - 已选 - 累计
+        const geteBalance = item.gateShortfallValue // 差额 = 配额 - 已选 - 累计
         // 正价统计
         const isYuan1 = item.regularRuleUnit == 'YUAN'
         const regularUnit = isYuan1 ? '元' : '个' // 单位
-        const regularQuota = item.gateQuotaAmount // 配额
+        const regularQuota = item.promotionRule.promotionRuleType != 'PROMO_PROD' ? item.gateQuotaAmount : 0// 配额
         const regularRuleValue = item.regularRuleValue // 额度
         const regularSelected = isYuan1 ? item.regularTotalAmount : item.regularTotalQty // 已选
         const regularTotal = isYuan1 ? item.regularBorrowAmount : item.regularBorrowQty // 累计
-        const regularBalance = isYuan ? item.regularCeAmount : item.regularCeQty // 差额 = 额度 - 已选 - 累计
+        const regularBalance = isYuan1 ? item.regularCeAmount : item.regularCeQty // 差额 = 额度 - 已选 - 累计
         // 促销品
         const promoUnit = '个'
         const promoSelected = item.giftQty || 0 // 已选
@@ -555,7 +555,7 @@ export default {
         // 特价产品
         const isYuan2 = item.gateRuleUnit == 'YUAN'
         const specialPriceUnit = isYuan2 ? '元' : '个' // 单位
-        const specialPriceQuota = (isYuan2 ? item.specialPriceQuotaAmount : item.specialPriceQuotaQty) || 0 // 配额
+        const specialPriceQuota = item.promotionRule.promotionRuleType === 'PROMO_PROD' ? item.gateQuotaAmount : 0 // 配额
         const specialPriceSelected = isYuan2 ? item.discountAmount : item.discountQty || 0 // 已选
         const specialPriceBalance = !specialPriceQuota ? 0 : isYuan ? item.discountCeAmount : item.discountCeQty// 差额 = 配额 - 已选