评分最大值判断修改

ruoyi-ui/src/views/votepage.vue

@@ -4,6 +4,7 @@
     <div class="title" style="font-size: 22px">{{ vote.voteTitle }}</div>
     <div class="time">时间：{{ vote.sTime }} - {{ vote.eTime }}</div>
     <div class="time" v-if="vote.khitemTypeid===1 && vote.umax">评优最大值为 {{ vote.umax }}</div>
+    <div class="time" v-if="vote.khitemTypeid!==1 && vote.maxNum">评分最大值为 {{ vote.maxNum }}</div>
     <div class="des">{{ vote.vDescription }}</div>
     <el-row :gutter="10" class="tou_piao" v-if="vote.khitemTypeid===2||vote.khitemTypeid===3">
       <el-col :xs="24" :sm="12" :md="8" :lg="6" :xl="6" v-for="item in voteList">
@@ -15,7 +16,7 @@
           <div class="_desc">参与评分 {{ item.voteNum!==null?item.voteNum: ''}} 人 </div>
           <div class="_desc">均值：{{ item.avgScore!==null?item.avgScore: '' }} </div>
           <div>
-            <el-input-number v-model="item.score" :max="vote.maxNum"></el-input-number>
+            <el-input-number v-model="item.score"></el-input-number>
           </div>
         </div>
       </el-col>
@@ -153,19 +154,29 @@ export default {
       let bkhdxName = '';
       let pyA = 0
       if(this.vote.khitemTypeid===2 || this.vote.khitemTypeid===3){
-        this.voteList.forEach(item => {
-          if(!(item.score===null||item.score===undefined)){
-            voteEmpList.push({
-              id: item.id,
-              bkhdxName: item.bkhdxName,
-              score: item.score,
+
+        let VoteList =  this.voteList;
+        for (let i = 0; i < VoteList.length; i++) {
+          if(VoteList[i].score===null||VoteList[i].score===undefined){
+            flag = false;
+            this.$alert(`【${ VoteList[i].bkhdxName }】未评分，请去评分！`, `提示`, {
+              type: 'Danger'
             })
-          }else {
+            break;
+          }else if(VoteList[i].score > this.vote.maxNum){
             flag = false;
-            bkhdxName += item.bkhdxName+'，'
-          }
+            this.$alert(`【${ VoteList[i].bkhdxName }】评分值不能超过评分最大值${this.vote.maxNum}，请重新去评分！`, `提示`, {
+              type: 'Danger'
             })
-        bkhdxName=bkhdxName.slice(0, -1);
+            break;
+          }else {
+            voteEmpList.push({
+              id: VoteList[i].id,
+              bkhdxName: VoteList[i].bkhdxName,
+              score: VoteList[i].score,
+            })
+          }
+        }
       }
       if(this.vote.khitemTypeid===1){
         this.voteList.forEach(item => {