148e7844 by 杨炀

no message

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