148e7844 by 杨炀

no message

1 parent 5669aaae
......@@ -302,7 +302,7 @@ export function getMyTeamList(cptId, groupId) {
})
}
export function getMyGroupForCpt(groupId, cptId) {
export function getMygetMyGroupForCptGroupForCpt(groupId, cptId) {
return request({
url: `/league/group/getMyGroupForCpt/${groupId}/${cptId}`,
method: 'get'
......
......@@ -18,7 +18,7 @@
{{ form.address }}
</el-col>
<el-col>
{{ language == 0 ?'入住信息':'Check-in Information' }}{{ form.messageObj?.roomStayDate }}
{{ language == 0 ?'入住信息':'Check-in&Check-out' }}{{ form.messageObj?.roomStayDate }}
</el-col>
<el-col>
{{ language == 0 ?'房间信息':'Room Information' }}{{ form.messageObj?.roomName }}{{ form.roomNum }}
......
......@@ -261,7 +261,7 @@ let hasChooseId
function tuandui() {
loading.value = true
Promise.all([
match.getMyGroupForCpt(groupId.value, matchId),
match.(groupId.value, matchId),
match.getChooseDoneGroupCoachs(matchId, groupId.value)
]).then((res) => {
personAllList.value = res[0].data
......
......@@ -282,9 +282,28 @@ const getAthletesList = () => {
cantBao.value.flag = false
}
}
} else {
upDateChoosedList()
}
})
}
function upDateChoosedList() {
for (var a of athletesList.value){
for (var b of choosedList.value){
if(a.id == b.id){
b = a
}
}
}
for (var a of choosedList.value){
if(!a.passportUrl){
cantBao.value.flag = true
cantBao.value.name = a.realName
} else {
cantBao.value.flag = false
}
}
}
function getMyMemberTable() {
match.getPerPersonList({cptId: matchId.value, searchLabels: '1,2,3,4,5,6'}, userId.value).then(res => {
myMemberTable.value = res.rows
......
......@@ -615,7 +615,7 @@ function checkTwo(a,b) {
match.checkMate({per1Id:a.id,per2Id:b.id,cptId:matchId.value}).then(res=>{
if(!res.data){
// ElMessage.warning(language.value == 0 ? '他们不是固定组合':'They\'re not a couple')
ElMessage.warning(language.value == 0 ? `${a.realName} 已经和其他人组成舞伴,无法报名:请重新选择`:`${a.realName} has already formed a dancer with another person, cannot sign up: please select again`)
ElMessage.warning(language.value == 0 ? `${a.realName} 已经和其他人组成舞伴,无法报名,请重新选择`:`${a.realName} has already formed a dancer with another person, cannot sign up: please select again`)
}
})
}
......
......@@ -15,9 +15,8 @@
<el-descriptions-item v-else :label="language==0?'所属国家/地区':'Country'">{{ form.countryName }}</el-descriptions-item>
<el-descriptions-item v-if="isNational" :label="language==0?'WDSF':'WDSF MIN'">{{ form.idcCode }}</el-descriptions-item>
<el-descriptions-item v-else :label="language==0?'证件类型':'ID type'">{{ form.idcTypeStr }}</el-descriptions-item>
<el-descriptions-item v-else :label="form.idcTypeStr">{{ form.idcCode }}</el-descriptions-item>
<el-descriptions-item v-else :label="language==0?'证件号码':'ID NO'">{{ form.idcCode }}</el-descriptions-item>
<el-descriptions-item v-if="!isNational" :label="language==0?'出生日期':'Date of Birth'">{{ form.birth }}</el-descriptions-item>
</el-descriptions>
......
Styling with Markdown is supported
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!