From 9587b1acfe6e33bf39490dca01c12d921a511cd7 Mon Sep 17 00:00:00 2001
From: shijingjing <1789544664@qq.com>
Date: Thu, 30 Jun 2022 16:59:55 +0800
Subject: [PATCH] 30398

---
 .../apps/AppPartyScoreManage/pointsDetails.vue      |  1 -
 .../components/applyForIntegral.vue                 | 13 +++++++++----
 2 files changed, 9 insertions(+), 5 deletions(-)

diff --git a/project/sanjianxi/apps/AppPartyScoreManage/pointsDetails.vue b/project/sanjianxi/apps/AppPartyScoreManage/pointsDetails.vue
index e66f5853..8cd4d724 100644
--- a/project/sanjianxi/apps/AppPartyScoreManage/pointsDetails.vue
+++ b/project/sanjianxi/apps/AppPartyScoreManage/pointsDetails.vue
@@ -108,7 +108,6 @@ export default {
       this.instance.post(`/app/apppartyintegralinfo/list`, null, {
         params: {
           ...this.search,
-          type: 1
         },
       })
       .then((res) => {
diff --git a/project/sanjianxi/apps/AppPartyScoreRules/components/applyForIntegral.vue b/project/sanjianxi/apps/AppPartyScoreRules/components/applyForIntegral.vue
index 6842ca60..92eb2b53 100644
--- a/project/sanjianxi/apps/AppPartyScoreRules/components/applyForIntegral.vue
+++ b/project/sanjianxi/apps/AppPartyScoreRules/components/applyForIntegral.vue
@@ -235,6 +235,7 @@ export default {
           this.form = res.data
           this.form.ladderIntegral = JSON.parse(res.data.ladderRule)
           this.form.ruleType = res.data.ruleType
+          this.form.integralArr = [ res.data.integralMin, res.data.integralMax ]
           this.dialog = true
         }
       })
@@ -306,12 +307,16 @@ export default {
       this.getList();
     },
     onConfirm() {
+      this.form.integralMin = this.form.integralArr?.[0] || ''
+      this.form.integralMax = this.form.integralArr?.[1] || ''
+      this.form.ladderRule = JSON.stringify(this.form.ladderIntegral)
+
+      if(this.form.integralMin >= this.form.integralMax) {
+        return this.$message.error('请输入正确的区间范围')
+      }
+
       this.$refs.DialogForm.validate((valid) => {
         if (valid) {
-          this.form.integralMin = this.form.integralArr?.[0] || ''
-          this.form.integralMax = this.form.integralArr?.[1] || ''
-          this.form.ladderRule = JSON.stringify(this.form.ladderIntegral)
-          
           this.instance.post(`/app/apppartyintegralrule/addOrUpdate`, {
             ...this.form,
             id: this.form.id || ''