|
|
|
@ -154,12 +154,18 @@ export default {
|
|
|
|
let pyA = 0
|
|
|
|
let pyA = 0
|
|
|
|
if(this.vote.khitemTypeid===2 || this.vote.khitemTypeid===3){
|
|
|
|
if(this.vote.khitemTypeid===2 || this.vote.khitemTypeid===3){
|
|
|
|
this.voteList.forEach(item => {
|
|
|
|
this.voteList.forEach(item => {
|
|
|
|
|
|
|
|
if(!(item.score===null||item.score===undefined)){
|
|
|
|
voteEmpList.push({
|
|
|
|
voteEmpList.push({
|
|
|
|
id: item.id,
|
|
|
|
id: item.id,
|
|
|
|
bkhdxName: item.bkhdxName,
|
|
|
|
bkhdxName: item.bkhdxName,
|
|
|
|
score: item.score,
|
|
|
|
score: item.score,
|
|
|
|
})
|
|
|
|
})
|
|
|
|
|
|
|
|
}else {
|
|
|
|
|
|
|
|
flag = false;
|
|
|
|
|
|
|
|
bkhdxName += item.bkhdxName+','
|
|
|
|
|
|
|
|
}
|
|
|
|
})
|
|
|
|
})
|
|
|
|
|
|
|
|
bkhdxName=bkhdxName.slice(0, -1);
|
|
|
|
}
|
|
|
|
}
|
|
|
|
if(this.vote.khitemTypeid===1){
|
|
|
|
if(this.vote.khitemTypeid===1){
|
|
|
|
this.voteList.forEach(item => {
|
|
|
|
this.voteList.forEach(item => {
|
|
|
|
@ -184,7 +190,6 @@ export default {
|
|
|
|
});
|
|
|
|
});
|
|
|
|
bkhdxName=bkhdxName.slice(0, -1);
|
|
|
|
bkhdxName=bkhdxName.slice(0, -1);
|
|
|
|
}
|
|
|
|
}
|
|
|
|
|
|
|
|
|
|
|
|
if(this.vote.umax && pyA>this.vote.umax){
|
|
|
|
if(this.vote.umax && pyA>this.vote.umax){
|
|
|
|
flag = false;
|
|
|
|
flag = false;
|
|
|
|
this.$alert(`评优数量不能超过评优最大值!`, `提示`, {
|
|
|
|
this.$alert(`评优数量不能超过评优最大值!`, `提示`, {
|
|
|
|
|