From 0a9b637d8ab077da602e62898822310b75fe4fcf Mon Sep 17 00:00:00 2001 From: wangsongsole Date: Thu, 29 Jun 2023 11:28:10 +0800 Subject: [PATCH] =?UTF-8?q?=F0=9F=92=8A=20fix:=20=E4=BF=AE=E5=A4=8D?= =?UTF-8?q?=E3=80=90=E6=96=B0=E5=A2=9E=E7=BA=A2=E5=8C=85=E3=80=91=E9=9A=8F?= =?UTF-8?q?=E6=9C=BA=E7=BA=A2=E5=8C=85=EF=BC=8C=E8=BE=93=E5=85=A5=E6=9C=80?= =?UTF-8?q?=E5=A4=A7=E9=9D=A2=E9=A2=9D=EF=BC=8C=E5=A4=A7=E4=BA=8E=E4=BA=86?= =?UTF-8?q?=E5=89=8D=E7=AB=AF=E8=AE=A1=E7=AE=97=E7=9A=84=E6=9C=80=E5=A4=A7?= =?UTF-8?q?=E9=9D=A2=E9=A2=9D=E5=80=BC=E6=97=B6=EF=BC=8C=E5=BA=94=E8=AF=A5?= =?UTF-8?q?=E4=B8=8D=E5=85=81=E8=AE=B8=E6=8F=90=E4=BA=A4?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- src/components/redPackets/index.jsx | 7 +++++-- src/components/redPackets/rules.js | 10 ++++++++++ src/components/redPackets/static.js | 3 ++- 3 files changed, 17 insertions(+), 3 deletions(-) diff --git a/src/components/redPackets/index.jsx b/src/components/redPackets/index.jsx index 144133e2..bc54831c 100644 --- a/src/components/redPackets/index.jsx +++ b/src/components/redPackets/index.jsx @@ -484,7 +484,10 @@ export default class addKnockGold extends Component { } else { data = b } - return data.toFixed(2) + this.setState({ + computeMin: data.toFixed(2) + }) + this.onHandleChange("", "max_denomination") } //tag关闭 @@ -501,7 +504,7 @@ export default class addKnockGold extends Component { return "请输入" } if (this.state.computeMax) { - return `最大面额为${this.computeMin()} ~ ${this.state.computeMax}` + return `最大面额为${this.state.computeMin} ~ ${this.state.computeMax}` } return "请输入" } diff --git a/src/components/redPackets/rules.js b/src/components/redPackets/rules.js index e0f64d1a..436eeb53 100644 --- a/src/components/redPackets/rules.js +++ b/src/components/redPackets/rules.js @@ -208,6 +208,16 @@ export function additionalRules(params) { return false } + if (params.computeMax < model.max_denomination) { + Notify.error("随机最大面额不得大于计算最大面额") + return false + } + + if (params.computeMin < model.min_denomination) { + Notify.error("随机最小面额不得大于计算最小面额") + return false + } + if (model.day_budget < model.denomination || model.day_budget > model.all_budget) { Notify.error("单日发放预算不得小于面额且不大于总预算") return false diff --git a/src/components/redPackets/static.js b/src/components/redPackets/static.js index b7dad267..f3d4249f 100644 --- a/src/components/redPackets/static.js +++ b/src/components/redPackets/static.js @@ -65,6 +65,7 @@ export function model({ data }) { userSelectList: [] /* 预警人数据 */, form_data: {}, isEdit: !!data?.id /* 是否为编辑 */, - computeMax: "" /* 随机最大面额 */ + computeMax: "" /* 随机最大面额 */, + computeMin: "" /* 随机最小面额 */ } }