From 1b55f8d643f9b63d3c6c94e305b61e166be68814 Mon Sep 17 00:00:00 2001
From: shijingjing <1789544664@qq.com>
Date: Thu, 30 Jun 2022 20:30:34 +0800
Subject: [PATCH] bug

---
 .../apps/AppPartyMemberScore/psList.vue       |  2 +-
 .../components/applyForIntegral.vue           | 22 +++++++++++++------
 2 files changed, 16 insertions(+), 8 deletions(-)

diff --git a/project/sanjianxi/apps/AppPartyMemberScore/psList.vue b/project/sanjianxi/apps/AppPartyMemberScore/psList.vue
index 2e5bac9b..f8ed93df 100644
--- a/project/sanjianxi/apps/AppPartyMemberScore/psList.vue
+++ b/project/sanjianxi/apps/AppPartyMemberScore/psList.vue
@@ -20,7 +20,7 @@
           <template #left>
             <div>统计周期</div>
             <el-date-picker size="small" v-model="searchDotime" type="daterange" range-separator="至" @change="timeChange"
-                            start-placeholder="开始日期" end-placeholder="结束日期" value-format="yyyy-MM-dd HH:mm:ss" format="yyyy-MM-dd"></el-date-picker>
+                            start-placeholder="开始日期" end-placeholder="结束日期" value-format="yyyy-MM-dd" format="yyyy-MM-dd"></el-date-picker>
           </template>
           <template #right>
             <el-input size="small" placeholder="党员姓名" v-model="search.name" clearable
diff --git a/project/sanjianxi/apps/AppPartyScoreRules/components/applyForIntegral.vue b/project/sanjianxi/apps/AppPartyScoreRules/components/applyForIntegral.vue
index e99c3057..742d0d42 100644
--- a/project/sanjianxi/apps/AppPartyScoreRules/components/applyForIntegral.vue
+++ b/project/sanjianxi/apps/AppPartyScoreRules/components/applyForIntegral.vue
@@ -88,7 +88,7 @@
             <el-input placeholder="请输入" v-model="form.integral" clearable/>
           </el-form-item>
           <!-- 区间 -->
-          <el-form-item label="积分分值" prop="integralArr" v-if="form.ruleType == '2'">
+          <el-form-item label="积分分值" v-if="form.ruleType == '2'">
             <ai-range v-model="form.integralArr" clearable/>
           </el-form-item>
           <!-- 阶梯 -->
@@ -198,7 +198,7 @@ export default {
         scoringCycle: [{required: true, message: "请选择周期范围" }],
         integral: [{required: true, pattern: /^\d*[.\d]\d?$/, message: "请输入积分分值,最多保留一位小数"}],
         numberLimit: [{pattern: /^\d*$/, message: "请输入正整数"}],
-        integralArr: [{required: true, message: "请输入积分分值", trigger: "change"}],
+        // integralArr: [{required: true, message: "请输入积分分值", trigger: "change"}],
         ladderIntegral: [{required: true, message: "请输入积分分值"}]
       },
       cacheOps: [],
@@ -307,13 +307,21 @@ 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.ruleType == 2) {
+        if(!this.form.integralArr) {
+          return this.$message.error('请输入积分分值')
+        }
+        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('请输入正确的区间范围')
+        }
 
-      if(this.form.integralMin >= this.form.integralMax) {
-        return this.$message.error('请输入正确的区间范围')
       }
+      
+
+      
 
       this.$refs.DialogForm.validate((valid) => {
         if (valid) {