评优最大值功能添加

ruoyi-ui/src/views/kaohe/pingce/index.vue

@@ -398,6 +398,17 @@
             </div>
           </template>
         </el-table-column>
+        <el-table-column label="评优最大值" align="center" prop="vote" min-width="140" :show-overflow-tooltip="true">
+          <template slot-scope="scope">
+            <div v-if="scope.$index=== pcSetUp.xzhIndex && scope.row.typeId===1">
+              <el-input-number :disabled="scope.row.vote.id && !(new Date(scope.row.vote.sTime) > (new Date()))" controls-position="right"
+                               v-model="scope.row.vote.umax" :min="0" style="width: 120px;"></el-input-number>
+            </div>
+            <div v-else>
+              <span>{{ scope.row.vote.umax }}</span>
+            </div>
+          </template>
+        </el-table-column>
         <el-table-column label="评分占比" align="center" prop="vote"  min-width="300" :show-overflow-tooltip="true">
           <template slot-scope="scope">
             <div v-if="scope.$index=== pcSetUp.xzhIndex && scope.row.typeId!==3">
@@ -724,6 +735,7 @@ export default {
         sTime: null,
         eTime: null,
         maxNum: null,
+        umax: null,
         percentage: null,
         state: null,
         itemIds: null,
@@ -1194,6 +1206,18 @@ export default {
           type: 'Danger'
         })
       }
+      if(row.typeId===1 && (!Vote.umax)){
+        flag = false;
+        this.$alert(`评优最大值不能为空！`, `提示`, {
+          type: 'Danger'
+        })
+      }
+      if(row.typeId===1 && (Vote.umax>this.pcSetUp.row.pcBkhdxs.length)){
+        flag = false;
+        this.$alert(`评优最大值不能大于被考核对象个数！`, `提示`, {
+          type: 'Danger'
+        })
+      }
       if(row.typeId!==3 && (!Vote.percentage)){
         flag = false;
         this.$alert(`评分占比不能为空！`, `提示`, {

ruoyi-ui/src/views/votepage.vue

@@ -2,6 +2,7 @@
   <div class="app-container">
     <div class="title">{{ 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="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">
@@ -89,6 +90,7 @@ export default {
       let voteEmpList = [];
       let flag = true;
       let bkhdxName = '';
+      let pyA = 0
       if(this.vote.khitemTypeid===2 || this.vote.khitemTypeid===3){
         this.voteList.forEach(item => {
           voteEmpList.push({
@@ -114,7 +116,18 @@ export default {
             flag = false;
             bkhdxName += item.bkhdxName+'，'
           }
-          voteEmpList.push(obj)
+          if(item.option&&item.option==='optionA'){
+            pyA += 1;
+          }
+          voteEmpList.push(obj);
+        });
+        bkhdxName=bkhdxName.slice(0, -1);
+      }
+      
+      if(pyA>this.vote.umax){
+        flag = false;
+        this.$alert(`评优数量不能超过评优最大值！`, `提示`, {
+          type: 'Danger'
         })
       }
       if(flag){
@@ -135,8 +148,7 @@ export default {
             type: 'Danger'
           })
         }
-      }else {
-        // bkhdxName
+      }else if(bkhdxName){
         this.$alert(`【${ bkhdxName }】未评分，请去评分！`, `提示`, {
           type: 'Danger'
         })
@@ -160,7 +172,7 @@ export default {
     color: #666666;
   }
   .time{
-    padding: 10px;
+    padding: 5px;
     color: #af5e5e;
   }