叠加整合、优惠券和标签叠加与否

src/views/coupon/Coupon_CreateCoupon.vue

@@ -216,7 +216,8 @@
                   ["不", ""][scope.row.isGradeFlag] +
                   "可用等级优惠，" +
                   ["不", ""][scope.row.isMarketFlag] +
-                  "可用优惠方案"
+                  "可用优惠方案，" + ["不", ""][scope.row.isLabelFlag] +
+                  "可叠加标签优惠"
                 : ""
             }}
             {{ scope.row.couponType == 3 ? "------------" : "" }}
@@ -541,6 +542,21 @@
             <el-radio label="0">不叠加优惠方案</el-radio>
           </el-radio-group>
         </el-form-item>
+        <el-form-item
+          label="用劵时叠加标签优惠"
+          prop="isLabelFlag"
+          v-if="createForm.couponType == 1 || createForm.couponType == 2"
+          :rules="{
+            required: createForm.couponType == 1 || createForm.couponType == 2,
+            message: '请选择用劵时叠加标签',
+            trigger: 'change',
+          }"
+        >
+          <el-radio-group v-model="createForm.isLabelFlag">
+            <el-radio label="1">叠加标签优惠</el-radio>
+            <el-radio label="0">不叠加标签优惠</el-radio>
+          </el-radio-group>
+        </el-form-item>
         <el-form-item label="有效期内可用时间控制" prop="availableControl">
           <el-radio-group
             v-model="createForm.availableControl"
@@ -749,6 +765,7 @@ export default {
         isCardFlag: "1",
         isGradeFlag: "1",
         isMarketFlag: "1",
+        isLabelFlag: "0",
         availableControl: "0",
         appointedDaysList: [],
         cycleDaysList: [],
@@ -1150,6 +1167,7 @@ export default {
         isCardFlag: "1",
         isGradeFlag: "1",
         isMarketFlag: "1",
+        isLabelFlag: "0",
         availableControl: "0",
         appointedDaysList: [],
         cycleDaysList: [],

src/views/dzk/Dzk_Rule.vue

@@ -209,7 +209,7 @@
             <el-radio label="0">不叠加</el-radio>
           </el-radio-group>
         </el-form-item>
-        <el-form-item
+        <!-- <el-form-item
           prop="isDiscountCoupon"
           label="是否叠加优惠券"
           :required="settingForm.cardEnabledFlag == 1"
@@ -218,7 +218,7 @@
             <el-radio label="1">叠加</el-radio>
             <el-radio label="0">不叠加</el-radio>
           </el-radio-group>
-        </el-form-item>
+        </el-form-item> -->
         <el-form-item
           prop="isLabel"
           label="是否叠加标签"