fixed: 国际赛提示-他们不是固定组合
Showing
2 changed files
with
10 additions
and
3 deletions
| ... | @@ -617,8 +617,11 @@ function removeCurproject() { | ... | @@ -617,8 +617,11 @@ function removeCurproject() { |
| 617 | function checkTwo(a,b) { | 617 | function checkTwo(a,b) { |
| 618 | match.checkMate({per1Id:a.id,per2Id:b.id,cptId:matchId.value}).then(res=>{ | 618 | match.checkMate({per1Id:a.id,per2Id:b.id,cptId:matchId.value}).then(res=>{ |
| 619 | if(!res.data){ | 619 | if(!res.data){ |
| 620 | // ElMessage.warning(language.value == 0 ? '他们不是固定组合':'They\'re not a couple') | 620 | if(isNational.value){ |
| 621 | ElMessage.warning(language.value == 0 ? `${a.realName} 已经和其他人组成舞伴,无法报名,请重新选择`:`${a.realName} has already formed a dancer with another person, cannot sign up: please select again`) | 621 | ElMessage.warning(language.value == 0 ? '他们不是固定组合':'They\'re not a couple') |
| 622 | } else { | ||
| 623 | ElMessage.warning(language.value == 0 ? `${a.realName}/${b.realName} 已经和其他人组成舞伴,无法报名,请重新选择`:`${a.realName}/${b.realName} has already formed a dancer with another person, cannot sign up: please select again`) | ||
| 624 | } | ||
| 622 | } | 625 | } |
| 623 | }) | 626 | }) |
| 624 | } | 627 | } | ... | ... |
| ... | @@ -234,7 +234,11 @@ function handleSelectionChange(val) { | ... | @@ -234,7 +234,11 @@ function handleSelectionChange(val) { |
| 234 | function checkTwo(a,b) { | 234 | function checkTwo(a,b) { |
| 235 | match.checkMate({per1Id:a.id,per2Id:b.id,cptId:matchId}).then(res=>{ | 235 | match.checkMate({per1Id:a.id,per2Id:b.id,cptId:matchId}).then(res=>{ |
| 236 | if(!res.data){ | 236 | if(!res.data){ |
| 237 | ElMessage.warning(language.value == 0 ? `${a.realName} 已经和其他人组成舞伴,无法报名:请重新选择`:`${a.realName} has already formed a dancer with another person, cannot sign up: please select again`) | 237 | if(isNational.value){ |
| 238 | ElMessage.warning(language.value == 0 ? '他们不是固定组合':'They\'re not a couple') | ||
| 239 | } else { | ||
| 240 | ElMessage.warning(language.value == 0 ? `${a.realName} 已经和其他人组成舞伴,无法报名:请重新选择`:`${a.realName} has already formed a dancer with another person, cannot sign up: please select again`) | ||
| 241 | } | ||
| 238 | proxy.$refs['allSportmenTable'].clearSelection() | 242 | proxy.$refs['allSportmenTable'].clearSelection() |
| 239 | } | 243 | } |
| 240 | }) | 244 | }) | ... | ... |
-
Please register or sign in to post a comment