From 04be125365bfd254166072f75da87e406f633ba3 Mon Sep 17 00:00:00 2001 From: cloudroam <cloudroam> Date: 星期四, 09 一月 2025 18:36:56 +0800 Subject: [PATCH] Merge branch 'master' of http://47.96.225.205:8888/r/operation_pc-v2 --- utils/coupon-form.js | 30 +++++++++++++++++++++++------- 1 files changed, 23 insertions(+), 7 deletions(-) diff --git a/utils/coupon-form.js b/utils/coupon-form.js index 07c9ae6..d695a94 100644 --- a/utils/coupon-form.js +++ b/utils/coupon-form.js @@ -28,6 +28,8 @@ obj.elBusForm .getComponentById('minOrderAmount') .$parent.clearValidate() + } else { + updateForm({ minOrderAmount: undefined }) } }, }, @@ -55,12 +57,12 @@ label: '优惠券使用条件:', id: 'minOrderAmount', type: 'input-number', - el: { - min: 0, + el: (row) => ({ + min: row.couponDiscountType === 'discount' ? 0.01 : 0, max: 99999999, precision: 2, controls: false, - }, + }), prefix: '满', unit: '元', rules: { @@ -81,10 +83,24 @@ controls: false, }, unit: '元', - rules: { - required: true, - message: '请输入优惠券面值', - trigger: 'blur', + rules: (row) => { + return [ + { + required: true, + message: '请输入优惠券面值', + trigger: 'blur', + }, + { + validator: (rule, value, callback) => { + if (value && row.minOrderAmount && value > row.minOrderAmount) { + callback(new Error('优惠券面值不能大于优惠券使用条件')) + } else { + callback() + } + }, + trigger: 'blur', + }, + ] }, }, ] -- Gitblit v1.9.3