lilei 2 달 전
부모
커밋
9239104b5f
1개의 변경된 파일2개의 추가작업 그리고 2개의 파일을 삭제
  1. 2 2
      src/views/salesManagement/salesQueryNew/comps/updateActiveModal.vue

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

@@ -121,14 +121,14 @@ export default {
       if (this.salesBillDetailSnList.length) {
         return this.activeList.filter(item => item.promotionRule && item.promotionRule.stackFlag == 1 && item.enabledFlag == 1)
       }
-      return this.activeList.filter(item => item.stackFlag == 1)
+      return this.activeList.filter(item => item.stackFlag == 1 && item.enabledFlag == 1)
     },
     // 非叠加活动
     noStackActiveList () {
       if (this.salesBillDetailSnList.length) {
         return this.activeList.filter(item => item.promotionRule && item.promotionRule.stackFlag == 0 && item.enabledFlag == 1)
       }
-      return this.activeList.filter(item => item.stackFlag == 0)
+      return this.activeList.filter(item => item.stackFlag == 0 && item.enabledFlag == 1)
     }
   },
   methods: {