lilei 2 weeks ago
parent
commit
e4dff92c22

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

@@ -589,8 +589,8 @@ export default {
         const gateSelected = isYuan ? item.gateTotalAmount : item.gateQty // 已选
         const gateSelected = isYuan ? item.gateTotalAmount : item.gateQty // 已选
         const gateTotal = isYuan ? item.gateBorrowAmount : item.gateBorrowQty // 累计
         const gateTotal = isYuan ? item.gateBorrowAmount : item.gateBorrowQty // 累计
         const geteBalance = item.gateShortfallValue // 差额
         const geteBalance = item.gateShortfallValue // 差额
-        const quotaUnit = item.QuotaRuleUnit == 'YUAN' ? '元' : '个' // 配额单位
-        const gateQuota = item.QuotaRuleUnit == 'YUAN' ? item.gateQuotaAmount : item.gateQuotaQty // 配额
+        const quotaUnit = item.quotaRuleUnit == 'YUAN' ? '元' : '个' // 配额单位
+        const gateQuota = item.gateQuotaAmount // 配额
         const unUseGateQuota = item.unUseAmount // 未用配额
         const unUseGateQuota = item.unUseAmount // 未用配额
         // 特价产品
         // 特价产品
         const isYuan2 = item.gateRuleUnit == 'YUAN'
         const isYuan2 = item.gateRuleUnit == 'YUAN'

+ 1 - 1
src/views/salesManagement/salesQueryNew/detail.vue

@@ -566,7 +566,7 @@ export default {
     hideTable (type, len) {
     hideTable (type, len) {
       this.spinning = false
       this.spinning = false
       if (type == 'normal') {
       if (type == 'normal') {
-        this.hideNormalTable = !(this.promoFlag == 0 || this.promoFlag == undefined) || this.borrowFlag != undefined
+        this.hideNormalTable = !(this.promoFlag == 0 || this.promoFlag == undefined) || this.borrowFlag != undefined || (len == 0 && this.activeList.length)
       } else {
       } else {
         if (this.promoFlag == 0) {
         if (this.promoFlag == 0) {
           this.hideActiveTable = true
           this.hideActiveTable = true