lilei 1 day ago
parent
commit
0b12665219
1 changed files with 4 additions and 2 deletions
  1. 4 2
      src/views/salesManagement/waitDispatchNew/queryPart.vue

+ 4 - 2
src/views/salesManagement/waitDispatchNew/queryPart.vue

@@ -273,7 +273,7 @@ export default {
     },
     },
     // 是否显示转采购额选项
     // 是否显示转采购额选项
     showConvertPromoGifts () {
     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.find(item => item.enabledFlag == 1 && item.promotionRule && item.promotionRule.convertExpenseFlag == 1 && item.promotionRule.promotionRuleType == 'BUY_PROD_GIVE_PROD')
     },
     },
     // 表格复选框
     // 表格复选框
     checkboxOption () {
     checkboxOption () {
@@ -559,7 +559,9 @@ export default {
 
 
       // 获取活动产品列表,查询条件未选正常产品
       // 获取活动产品列表,查询条件未选正常产品
       if (params.promotionFlag != 0) {
       if (params.promotionFlag != 0) {
-        const aclist = await queryAwaitDispatch({ ...params, detailPromoFlag: 1 }).then(res => res.data)
+        const acparams = { ...params, detailPromoFlag: 1, promoProductClz: params.promotionFlag }
+        acparams.promotionFlag = undefined
+        const aclist = await queryAwaitDispatch(acparams).then(res => res.data)
         // 没用活动产品,不显示
         // 没用活动产品,不显示
         const retList = aclist.length ? [{
         const retList = aclist.length ? [{
           id: 'promo-active'
           id: 'promo-active'