chenrui 1 سال پیش
والد
کامیت
1e48b76a5b

+ 7 - 1
src/views/promotionRulesManagement/dealerPromotions/sendAmountModal.vue

@@ -76,7 +76,7 @@
             <a-input-number
               v-model="form.regularAmount"
               @blur="calculatePrice"
-              :max="form.gateType==='FIXED_AMOUNT'?form.quotaAmount:999999"
+              :max="999999"
               :step="1"
               :precision="2"
               :min="0"
@@ -322,6 +322,12 @@ export default {
             _this.$message.warning('满赠规则条件不能为空!')
             return
           }
+          if (_this.form.gateType === 'FIXED_AMOUNT' && _this.form.regularAmount) {
+            if (_this.form.quotaAmount * 1 < _this.form.regularAmount * 1) {
+              _this.$message.warning('可使用配额必须大于购买正价产品金额!')
+              return
+            }
+          }
 
           if (_this.form.minOrderFlag == 1 && !_this.form.minOrderAmount) {
             _this.$message.warning('请输入订单起订限制金额数!')

+ 1 - 1
src/views/reportData/promotionSalesRealTimeReport/index.vue

@@ -38,7 +38,7 @@
                         v-model="queryParam.promoRuleReport.promotionRuleType"
                         ref="ruleType"
                         id="promotionSalesRealTimeReport-ruleType"
-                        code="PROMO_RULE_TYPE"
+                        code="PROMOTION_RULE_TYPE"
                         placeholder="请选择促销类型"
                         allowClear></v-select>
                     </a-form-model-item>

+ 1 - 1
src/views/reportData/promotionSalesRealTimeReport/list.vue

@@ -36,7 +36,7 @@
                     v-model="newQueryParam.promoRuleReport.promotionRuleType"
                     ref="ruleType"
                     id="promotionSalesRealTimeReport-ruleType"
-                    code="PROMO_RULE_TYPE"
+                    code="PROMOTION_RULE_TYPE"
                     placeholder="请选择促销类型"
                     allowClear></v-select>
                 </a-form-model-item>