lilei 6 月之前
父節點
當前提交
c7b3b76a7c

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

@@ -637,15 +637,17 @@ export default {
       const _this = this
       // 启用
       if (item.enabledFlag == 0) {
+        const isJiejia = item.promotion.stackFlag == 1 // 叠加产品
         this.$confirm({
           title: item.promotion.description + '-' + item.promotionRule.description + ',确定启用规则?',
           centered: true,
           class: 'confirm-center',
           content: <div>
-            <div style="padding:0 0 10px 0;text-align:center;">
+            <div style="padding:10px;">
+              <div style="padding:10px 0;text-align:center;">请选择</div>
               <aRadioGroup onChange={_this.changeDaOpt}>
                 <aRadio style="display:block;height: '30px';lineHeight: '30px';padding:5px 0;" value="DELETE">
-                  正常产品、参与叠加规则的促销产品自动适配规则
+                  {isJiejia ? '正常产品、参与叠加规则的促销产品自动适配规则' : '正常产品自动适配规则'}
                 </aRadio>
                 <aRadio style="display:block;height: '30px';lineHeight: '30px';padding:5px 0;" value="REMOVE">
                   产品不自动适配规则
@@ -658,6 +660,7 @@ export default {
               _this.enabledActive(item)
             } else {
               _this.$message.info('请选择启用方式!')
+              return true
             }
           },
           onCancel () {
@@ -689,6 +692,7 @@ export default {
             _this.disabledActive(item)
           } else {
             _this.$message.info('请选择禁用方式!')
+            return true
           }
         },
         onCancel () {

+ 9 - 0
src/views/salesManagement/salesQueryNew/comps/updateActiveModal.vue

@@ -14,6 +14,7 @@
           <aRadio :style="radioStyle" value="0" v-if="promoRuleSn">
             不参加促销
           </aRadio>
+          <!-- 非叠加 -->
           <div v-for="(item,idx) in activeList" :key="idx">
             <div>
               <strong>{{ item.title }}</strong>
@@ -65,6 +66,14 @@ export default {
     },
     total () {
       return this.promoRuleSn ? 1 : this.activeList.length
+    },
+    // 叠加活动
+    stackActiveList () {
+      return this.activeList.filter(item => item.promotion.stackFlag == 1)
+    },
+    // 非叠加活动
+    noStackActiveList () {
+      return this.activeList.filter(item => item.promotion.stackFlag !== 1)
     }
   },
   methods: {