lilei 1 year ago
parent
commit
06971df56c

+ 1 - 1
src/views/salesManagement/salesQueryNew/comps/detailProductList.vue

@@ -239,7 +239,7 @@
           return this.detailData && this.detailData.totalConvertPromoGiftsQty
         },
         showConvertPromoGifts(){
-          return this.activeList&&this.activeList.find(item => item.promotionRule&&item.promotionRule.convertExpenseFlag==1&&item.promotionRule.promotionRuleType=='BUY_PROD_GIVE_PROD')
+          return this.activeList&&this.activeList.filter(item=>item.enabledFlag == 1).find(item => item.promotionRule&&item.promotionRule.convertExpenseFlag==1&&item.promotionRule.promotionRuleType=='BUY_PROD_GIVE_PROD')
         },
         showStock(){
             return this.detailData && (this.detailData.billStatus == 'WAIT_AUDIT' || this.detailData.billStatus == 'HQ_CHANGE') && this.$hasPermissions('B_salesAudit')