Skip to content

杨炀 / dance-pc

Go to a project
Toggle navigation
Toggle navigation pinning
ae1a1f37 by 李婷婷
Options

个人随行人员

1 parent 2a7aa630
Expand all
Inline Side-by-side
Showing 15 changed files with 117 additions and 58 deletions
src/apiPc/match.js
...@@ -343,6 +343,13 @@ export function getPerPersonList(query, userId) { ...@@ -343,6 +343,13 @@ export function getPerPersonList(query, userId) {
343 params: query 343 params: query
344 }) 344 })
345 } 345 }
346 export function getPerPersonList2(query, userId) {
347 return request({
348 url: `/systemj/personInfo/getPersonInfoListByPersonIdNoLabel2/${userId}`,
349 method: 'get',
350 params: query
351 })
352 }
346 353
347 // 选择队友 354 // 选择队友
348 export function getMate(data) { 355 export function getMate(data) {
...@@ -434,6 +441,13 @@ export function groupSignSavePerson(data) { ...@@ -434,6 +441,13 @@ export function groupSignSavePerson(data) {
434 data: data 441 data: data
435 }) 442 })
436 } 443 }
444 export function savePersonInfo(data) {
445 return request({
446 url: `/league/unitCompetitionRole/savePersonInfo`,
447 method: 'post',
448 data: data
449 })
450 }
437 451
438 export function getCanSignProjectList(cptId) { 452 export function getCanSignProjectList(cptId) {
439 return request({ 453 return request({
......
src/routerPc/cn.js
...@@ -565,6 +565,12 @@ export const constantRoutes = [ ...@@ -565,6 +565,12 @@ export const constantRoutes = [
565 meta: { title: '选择参赛项目' } 565 meta: { title: '选择参赛项目' }
566 }, 566 },
567 { 567 {
568 path: 'list/:id/chooseCoachPerson',
569 component: () => import('@/viewsPc/match/components/chooseCoachPerson'),
570 name: 'chooseCoachPerson',
571 meta: { title: '选择教练/领队/其他' }
572 },
573 {
568 path: 'list/:id/signPreview', 574 path: 'list/:id/signPreview',
569 component: () => import('@/viewsPc/match/signPreview'), 575 component: () => import('@/viewsPc/match/signPreview'),
570 name: 'signPreview', 576 name: 'signPreview',
......
src/routerPc/en.js
...@@ -735,6 +735,12 @@ export const constantRoutes = [ ...@@ -735,6 +735,12 @@ export const constantRoutes = [
735 meta: { title: '选择参赛项目' } 735 meta: { title: '选择参赛项目' }
736 }, 736 },
737 { 737 {
738 path: 'list/:id/chooseCoachPerson',
739 component: () => import('@/viewsPc/match/components/chooseCoachPerson'),
740 name: 'chooseCoachPerson',
741 meta: { title: '选择教练/领队/其他' }
742 },
743 {
738 path: 'list/:id/signPreview', 744 path: 'list/:id/signPreview',
739 component: () => import('@/viewsPc/match/signPreview'), 745 component: () => import('@/viewsPc/match/signPreview'),
740 name: 'signPreview', 746 name: 'signPreview',
......
src/routerPc/index.js
...@@ -426,7 +426,13 @@ export const constantRoutes = [ ...@@ -426,7 +426,13 @@ export const constantRoutes = [
426 component: () => import('@/viewsPc/match/chooseProject'), 426 component: () => import('@/viewsPc/match/chooseProject'),
427 name: 'chooseProject', 427 name: 'chooseProject',
428 meta: { title: '选择参赛项目' } 428 meta: { title: '选择参赛项目' }
429 } 429 },
430 {
431 path: 'list/:id/chooseCoachPerson',
432 component: () => import('@/viewsPc/match/components/chooseCoachPerson'),
433 name: 'chooseCoachPerson',
434 meta: { title: '选择教练/领队/其他' }
435 },
430 ] 436 ]
431 }, 437 },
432 { 438 {
......
src/viewsPc/center/component/modifySign.vue
...@@ -115,7 +115,19 @@ const goConti = () => { ...@@ -115,7 +115,19 @@ const goConti = () => {
115 matchId: cptId 115 matchId: cptId
116 } 116 }
117 }) 117 })
118 } else if (signType == '1') { 118 }
119 // else if (signType == '1') {
120 // alert('222')
121 // router.push({
122 // path: `/match/list/${cptId}/chooseCoach`,
123 // query: {
124 // matchId: cptId,
125 // groupId: form.value.signList[0].groupId,
126 // signType: 1
127 // }
128 // })
129 // }
130 else if (signType == '1') {
119 router.push({ 131 router.push({
120 path: `/match/list/${cptId}/chooseSportsman`, 132 path: `/match/list/${cptId}/chooseSportsman`,
121 query: { 133 query: {
......
src/viewsPc/index.vue
...@@ -697,10 +697,10 @@ function applyInvitation() { ...@@ -697,10 +697,10 @@ function applyInvitation() {
697 697
698 .zn-btn { 698 .zn-btn {
699 background: #FFFFFF; 699 background: #FFFFFF;
700 font-size: 18px; 700 font-size: 16px;
701 color: #453DEA; 701 color: #453DEA;
702 border-radius: 23px; 702 border-radius: 23px;
703 padding: 10px 20px; 703 padding: 10px 18px;
704 display: inline-flex; 704 display: inline-flex;
705 align-items: center; 705 align-items: center;
706 } 706 }
...@@ -1170,7 +1170,7 @@ function applyInvitation() { ...@@ -1170,7 +1170,7 @@ function applyInvitation() {
1170 } 1170 }
1171 1171
1172 h1 { 1172 h1 {
1173 text-align: center 1173 text-align: center;
1174 } 1174 }
1175 } 1175 }
1176 } 1176 }
......
src/viewsPc/index_en.vue
...@@ -124,7 +124,7 @@ ...@@ -124,7 +124,7 @@
124 <download /> 124 <download />
125 </el-icon> 125 </el-icon>
126 </a> 126 </a>
127 <a class="zn-btn ml20 btn-q" @click="reserveSearch">Reservation Inquiry</a> 127 <a class="zn-btn btn-q" @click="reserveSearch">Reservation Inquiry</a>
128 <!-- <a 128 <!-- <a
129 v-if="matchData.isCourseView==1" class="zn-btn ml20 btn-q forPc" 129 v-if="matchData.isCourseView==1" class="zn-btn ml20 btn-q forPc"
130 style="font-size: 15px;margin-right: 20px" @click="popMaster" 130 style="font-size: 15px;margin-right: 20px" @click="popMaster"
...@@ -134,10 +134,10 @@ ...@@ -134,10 +134,10 @@
134 <Edit /> 134 <Edit />
135 </el-icon> 135 </el-icon>
136 </a> --> 136 </a> -->
137 137 <br/>
138 <a class="zn-btn ml20 btn-q" @click="backNumberSearch">Competition 138 <a class="zn-btn btn-q" @click="backNumberSearch">Competition
139 Number</a> 139 Number</a>
140 <a class="zn-btn ml20 btn-q" @click="schSearchSearch">Schedule 140 <a class="zn-btn btn-q" @click="schSearchSearch">Schedule
141 Inquiry</a> 141 Inquiry</a>
142 142
143 </div> 143 </div>
...@@ -716,7 +716,7 @@ function applyInvitation() { ...@@ -716,7 +716,7 @@ function applyInvitation() {
716 text-transform: uppercase; 716 text-transform: uppercase;
717 font-size: 16px; 717 font-size: 16px;
718 width: fit-content; 718 width: fit-content;
719 margin: 5px 5px 5px 0; 719 margin: 5px 5px 5px 15px;
720 color: #453DEA; 720 color: #453DEA;
721 border-radius: 23px; 721 border-radius: 23px;
722 padding: 10px 20px; 722 padding: 10px 20px;
...@@ -1408,7 +1408,7 @@ function applyInvitation() { ...@@ -1408,7 +1408,7 @@ function applyInvitation() {
1408 } 1408 }
1409 1409
1410 .zn-btn { 1410 .zn-btn {
1411 margin-top: 10px 1411 margin-top: 15px
1412 } 1412 }
1413 } 1413 }
1414 1414
......
src/viewsPc/match/chooseCoach.vue
...@@ -307,12 +307,12 @@ function geren() { ...@@ -307,12 +307,12 @@ function geren() {
307 if (res[1].data.id != null) { 307 if (res[1].data.id != null) {
308 hasChooseObj.value = res[1].data 308 hasChooseObj.value = res[1].data
309 hasChooseId = res[1].data.id 309 hasChooseId = res[1].data.id
310 form.value.coachs = hasChooseObj.value.coachIds.split(',') 310 form.value.coachs = hasChooseObj.value.coachIds.split(',')||[]
311 form.value.leader = hasChooseObj.value.leaderIds.split(',') 311 form.value.leader = hasChooseObj.value.leaderIds.split(',')||[]
312 form.value.other = hasChooseObj.value.otherIds.split(',') 312 form.value.other = hasChooseObj.value.otherIds.split(',')||[]
313 form.value.doctor = hasChooseObj.value.doctorIds.split(',') 313 form.value.doctor = hasChooseObj.value.doctorIds.split(',')||[]
314 form.value.translator = hasChooseObj.value.translatorIds.split(',') 314 form.value.translator = hasChooseObj.value.translatorIds.split(',')||[]
315 form.value.official = hasChooseObj.value.officialIds.split(',') 315 form.value.official = hasChooseObj.value.officialIds.split(',')||[]
316 } 316 }
317 }) 317 })
318 } 318 }
......
src/viewsPc/match/chooseProject.vue
...@@ -3,7 +3,7 @@ ...@@ -3,7 +3,7 @@
3 <!-- 个人报名-国外--> 3 <!-- 个人报名-国外-->
4 <div class="box ph-30"> 4 <div class="box ph-30">
5 <el-card class="mb20"> 5 <el-card class="mb20">
6 <single-sign-step :active-step="1" :language="language" /> 6 <single-sign-step :active-step="2" :language="language" />
7 </el-card> 7 </el-card>
8 8
9 <el-card :body-style="{'padding': '0'}"> 9 <el-card :body-style="{'padding': '0'}">
...@@ -126,13 +126,13 @@ ...@@ -126,13 +126,13 @@
126 <zu-table v-else :language="language" :list="zuTableList" @delete="removeThis" /> 126 <zu-table v-else :language="language" :list="zuTableList" @delete="removeThis" />
127 127
128 <div v-if="showPersonList||myMemberTable.length>0"> 128 <div v-if="showPersonList||myMemberTable.length>0">
129 <el-row class="mt20"> 129 <!-- <el-row class="mt20">
130 <el-col :span="24"> 130 <el-col :span="24">
131 <el-button plain type="primary" @click="addAccompany"> 131 <el-button plain type="primary" @click="addAccompany">
132 {{ language == 0 ? '添加随行人员' : 'Add accompanying personnel' }} 132 {{ language == 0 ? '添加随行人员' : 'Add accompanying personnel' }}
133 </el-button> 133 </el-button>
134 </el-col> 134 </el-col>
135 </el-row> 135 </el-row> -->
136 <el-table :data="myMemberTable" border class="mt20"> 136 <el-table :data="myMemberTable" border class="mt20">
137 <el-table-column :label="language==0?'序号':'Index'" align="center" type="index" width="70" /> 137 <el-table-column :label="language==0?'序号':'Index'" align="center" type="index" width="70" />
138 <el-table-column :label="language==0?'姓氏':'Surname'" min-width="100" prop="xing" /> 138 <el-table-column :label="language==0?'姓氏':'Surname'" min-width="100" prop="xing" />
...@@ -167,6 +167,7 @@ ...@@ -167,6 +167,7 @@
167 </div> 167 </div>
168 168
169 <div class="text-center mt20 father"> 169 <div class="text-center mt20 father">
170 <el-button type="primary" class="w200px" plain round @click="goPrev()">{{ language==0?'上一步':'Go back' }}</el-button>
170 <el-button 171 <el-button
171 class="btn-lineG w200px" round style="position: relative ; z-index: 99;" type="primary" 172 class="btn-lineG w200px" round style="position: relative ; z-index: 99;" type="primary"
172 @click="submitForm" 173 @click="submitForm"
...@@ -360,7 +361,7 @@ function upDateChoosedList() { ...@@ -360,7 +361,7 @@ function upDateChoosedList() {
360 } 361 }
361 362
362 function getMyMemberTable() { 363 function getMyMemberTable() {
363 match.getPerPersonList({ cptId: matchId.value, searchLabels: '1,2,3,4,5,6' }, userId.value).then(res => { 364 match.getPerPersonList2({ cptId: matchId.value, searchLabels: '1,2,3,4,5,6' }, userId.value).then(res => {
364 myMemberTable.value = res.rows 365 myMemberTable.value = res.rows
365 if (res.rows.length > 0) { 366 if (res.rows.length > 0) {
366 showPersonList.value = true 367 showPersonList.value = true
...@@ -418,7 +419,16 @@ function getSignInfoList() { ...@@ -418,7 +419,16 @@ function getSignInfoList() {
418 zuTableList.value = res.data.zuData || [] 419 zuTableList.value = res.data.zuData || []
419 }) 420 })
420 } 421 }
421 422 function goPrev() {
423 router.push({
424 name: 'chooseCoachPerson',
425 query: {
426 matchId: matchId.value,
427 groupId: groupId.value,
428 isNational: true,
429 }
430 })
431 }
422 432
423 function submitForm() { 433 function submitForm() {
424 if (signInfoList.value.length == 0) { 434 if (signInfoList.value.length == 0) {
...@@ -457,33 +467,34 @@ function submitForm() { ...@@ -457,33 +467,34 @@ function submitForm() {
457 } 467 }
458 } 468 }
459 469
460 if (showPersonList.value) { 470 // if (showPersonList.value) {
461 if (myMemberTable.value.length == 0) { 471 // if (myMemberTable.value.length == 0) {
462 ElMessageBox.confirm(language.value == 0 ? '是否继续添加随行人员？' : 'Do you want to add casual personnel?', 472 // ElMessageBox.confirm(language.value == 0 ? '是否继续添加随行人员？' : 'Do you want to add casual personnel?',
463 language.value == 0 ? '提示' : 'Tip', { 473 // language.value == 0 ? '提示' : 'Tip', {
464 confirmButtonText: language.value == 0 ? '是' : 'Yes', 474 // confirmButtonText: language.value == 0 ? '是' : 'Yes',
465 cancelButtonText: language.value == 0 ? '否，进入下一步' : 'NO,Go Next', 475 // cancelButtonText: language.value == 0 ? '否，进入下一步' : 'NO,Go Next',
466 type: 'warning' 476 // type: 'warning'
467 }).then(() => { 477 // }).then(() => {
468 478
469 }).catch(() => { 479 // }).catch(() => {
470 commit() 480 // commit()
471 }) 481 // })
472 } else { 482 // } else {
473 commit() 483 // commit()
474 } 484 // }
475 } else { 485 // }
476 ElMessageBox.confirm(language.value == 0 ? '是否添加随行人员？' : 'Do you want to add casual personnel?', 486 // else {
477 language.value == 0 ? '提示' : 'Tip', { 487 // ElMessageBox.confirm(language.value == 0 ? '是否添加随行人员？' : 'Do you want to add casual personnel?',
478 confirmButtonText: language.value == 0 ? '是' : 'Yes', 488 // language.value == 0 ? '提示' : 'Tip', {
479 cancelButtonText: language.value == 0 ? '否，进入下一步' : 'NO,Go Next', 489 // confirmButtonText: language.value == 0 ? '是' : 'Yes',
480 type: 'warning' 490 // cancelButtonText: language.value == 0 ? '否，进入下一步' : 'NO,Go Next',
481 }).then(() => { 491 // type: 'warning'
482 showPersonList.value = true 492 // }).then(() => {
483 }).catch(() => { 493 // showPersonList.value = true
494 // }).catch(() => {
484 commit() 495 commit()
485 }) 496 // })
486 } 497 // }
487 } 498 }
488 499
489 function commit() { 500 function commit() {
......
src/viewsPc/match/chooseSportsman_bak.vue
...@@ -209,7 +209,7 @@ import { useStorage } from '@vueuse/core/index' ...@@ -209,7 +209,7 @@ import { useStorage } from '@vueuse/core/index'
209 209
210 const language = useStorage('language', 0) 210 const language = useStorage('language', 0)
211 const data = reactive({ 211 const data = reactive({
212 coachForm: {}, activeStep: 2, 212 coachForm: {}, activeStep: 3,
213 tourCurrent: 0, 213 tourCurrent: 0,
214 tableData: [], 214 tableData: [],
215 signInfoList: [], 215 signInfoList: [],
......
src/viewsPc/match/components/singleSignStep.vue
1 <template> 1 <template>
2 <el-steps :active="activeStep" align-center> 2 <el-steps :active="activeStep" align-center>
3 <el-step :title="language==0?'校验 WDSF 会员号':'Check WDSF MIN'" /> 3 <el-step :title="language==0?'校验 WDSF 会员号':'Check WDSF MIN'" />
4 <el-step :title="language==0?'教练/领队/其他':'Coach/Head Of Team/Other'" />
4 <el-step :title="language==0?'选手报名':'Participant Registration'" /> 5 <el-step :title="language==0?'选手报名':'Participant Registration'" />
5 <el-step :title="language==0?'提交审核':'Submit for review'" /> 6 <el-step :title="language==0?'提交审核':'Submit for review'" />
6 </el-steps> 7 </el-steps>
......
src/viewsPc/match/detail_en.vue
...@@ -434,8 +434,8 @@ ...@@ -434,8 +434,8 @@
434 434
435 <div v-if="matchData.leagueId==0" class="fixed_gg_l" @click="applyInvitation"> 435 <div v-if="matchData.leagueId==0" class="fixed_gg_l" @click="applyInvitation">
436 <div> 436 <div>
437 <img v-if="language==0" src="@/assets/logo/Invitation_c.png"> 437 <img v-if="language==0 && matchData.invitationSw == '1'" src="@/assets/logo/Invitation_c.png">
438 <img v-else src="@/assets/logo/Invitation_e.png"> 438 <img v-if="language!=0 && matchData.invitationSw == '1'" src="@/assets/logo/Invitation_e.png">
439 </div> 439 </div>
440 440
441 </div> 441 </div>
...@@ -783,9 +783,12 @@ function goTeamSignCn() { ...@@ -783,9 +783,12 @@ function goTeamSignCn() {
783 async function goPersonalSign() { 783 async function goPersonalSign() {
784 // 选项目 784 // 选项目
785 await router.push({ 785 await router.push({
786 name: 'chooseProject', 786 name: 'chooseCoachPerson',
787 query: { 787 query: {
788 matchId: matchId.value 788 matchId: matchId.value,
789 groupId: groupId.value,
790 isNational: true,
791 languageSource: matchData.value.languageSource
789 } 792 }
790 }) 793 })
791 } 794 }
......
src/viewsPc/match/signPreview.vue
...@@ -207,7 +207,7 @@ function getMatch() { ...@@ -207,7 +207,7 @@ function getMatch() {
207 } 207 }
208 208
209 function getMyMemberTable() { 209 function getMyMemberTable() {
210 match.getPerPersonList({ cptId: matchId.value, searchLabels: '1,2,3,4,5,6' }, user.userId).then(res => { 210 match.getPerPersonList2({ cptId: matchId.value, searchLabels: '1,2,3,4,5,6' }, user.userId).then(res => {
211 myMemberTable.value = res.rows 211 myMemberTable.value = res.rows
212 }) 212 })
213 } 213 }
......
vite.config.js
...@@ -64,14 +64,14 @@ export default defineConfig(({ mode, command }) => { ...@@ -64,14 +64,14 @@ export default defineConfig(({ mode, command }) => {
64 proxy: { 64 proxy: {
65 // https://cn.vitejs.dev/config/#server-proxy 65 // https://cn.vitejs.dev/config/#server-proxy
66 '/dev-api/ztx-train': { 66 '/dev-api/ztx-train': {
67 target: 'http://192.168.1.22:8081', 67 target: 'http://192.168.1.128:8081',
68 // target: 'https://wdsfwuxicenter.com/stage-api', 68 // target: 'https://wdsfwuxicenter.com/stage-api',
69 // target: 'https://jijin.wtwuxicenter.com/stage-api', 69 // target: 'https://jijin.wtwuxicenter.com/stage-api',
70 changeOrigin: true, 70 changeOrigin: true,
71 rewrite: (p) => p.replace(/^\/dev-api\/ztx-train/, '') 71 rewrite: (p) => p.replace(/^\/dev-api\/ztx-train/, '')
72 }, 72 },
73 '/dev-api/ztx-match': { 73 '/dev-api/ztx-match': {
74 target: 'http://192.168.1.22:8081', 74 target: 'http://192.168.1.128:8081',
75 // target: 'https://jijin.wtwuxicenter.com/stage-api', 75 // target: 'https://jijin.wtwuxicenter.com/stage-api',
76 // target: 'https://wdsfwuxicenter.com/stage-api', 76 // target: 'https://wdsfwuxicenter.com/stage-api',
77 // target: 'https://wdsfwuxicenter.com/stage-api/', 77 // target: 'https://wdsfwuxicenter.com/stage-api/',
...@@ -79,14 +79,14 @@ export default defineConfig(({ mode, command }) => { ...@@ -79,14 +79,14 @@ export default defineConfig(({ mode, command }) => {
79 rewrite: (p) => p.replace(/^\/dev-api\/ztx-match/, '') 79 rewrite: (p) => p.replace(/^\/dev-api\/ztx-match/, '')
80 }, 80 },
81 '/dev-api/ztx-webSite': { 81 '/dev-api/ztx-webSite': {
82 target: 'http://192.168.1.22:8081', 82 target: 'http://192.168.1.128:8081',
83 // target: 'https://wdsfwuxicenter.com/stage-api', 83 // target: 'https://wdsfwuxicenter.com/stage-api',
84 // target: 'https://jijin.wtwuxicenter.com/stage-api', 84 // target: 'https://jijin.wtwuxicenter.com/stage-api',
85 changeOrigin: true, 85 changeOrigin: true,
86 rewrite: (p) => p.replace(/^\/dev-api\/ztx-webSite/, '') 86 rewrite: (p) => p.replace(/^\/dev-api\/ztx-webSite/, '')
87 }, 87 },
88 '/dev-api': { 88 '/dev-api': {
89 target: 'http://192.168.1.22:8081', 89 target: 'http://192.168.1.128:8081',
90 // target: 'http://192.168.1.169:8081', 90 // target: 'http://192.168.1.169:8081',
91 // target: 'https://jijin.wtwuxicenter.com/stage-api', 91 // target: 'https://jijin.wtwuxicenter.com/stage-api',
92 // target: 'https://wdsfwuxicenter.com/stage-api/', 92 // target: 'https://wdsfwuxicenter.com/stage-api/',
...@@ -96,7 +96,7 @@ export default defineConfig(({ mode, command }) => { ...@@ -96,7 +96,7 @@ export default defineConfig(({ mode, command }) => {
96 }, 96 },
97 '/ticket': { 97 '/ticket': {
98 // target: 'https://jijin.wtwuxicenter.com/stage-api', 98 // target: 'https://jijin.wtwuxicenter.com/stage-api',
99 target: 'http://192.168.1.22:8081', 99 target: 'http://192.168.1.128:8081',
100 // target: 'https://wdsfwuxicenter.com/h5/', 100 // target: 'https://wdsfwuxicenter.com/h5/',
101 // target: 'https://ticketh5.wdsfwuxicenter.com/h5/', 101 // target: 'https://ticketh5.wdsfwuxicenter.com/h5/',
102 changeOrigin: true, 102 changeOrigin: true,
......
Styling with Markdown is supported
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!