Skip to content

jijin / 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) {
params: query
})
}
export function getPerPersonList2(query, userId) {
return request({
url: `/systemj/personInfo/getPersonInfoListByPersonIdNoLabel2/${userId}`,
method: 'get',
params: query
})
}
// 选择队友
export function getMate(data) {
......@@ -434,6 +441,13 @@ export function groupSignSavePerson(data) {
data: data
})
}
export function savePersonInfo(data) {
return request({
url: `/league/unitCompetitionRole/savePersonInfo`,
method: 'post',
data: data
})
}
export function getCanSignProjectList(cptId) {
return request({
......
src/routerPc/cn.js
......@@ -565,6 +565,12 @@ export const constantRoutes = [
meta: { title: '选择参赛项目' }
},
{
path: 'list/:id/chooseCoachPerson',
component: () => import('@/viewsPc/match/components/chooseCoachPerson'),
name: 'chooseCoachPerson',
meta: { title: '选择教练/领队/其他' }
},
{
path: 'list/:id/signPreview',
component: () => import('@/viewsPc/match/signPreview'),
name: 'signPreview',
......
src/routerPc/en.js
......@@ -734,6 +734,12 @@ export const constantRoutes = [
name: 'chooseProject',
meta: { title: '选择参赛项目' }
},
{
path: 'list/:id/chooseCoachPerson',
component: () => import('@/viewsPc/match/components/chooseCoachPerson'),
name: 'chooseCoachPerson',
meta: { title: '选择教练/领队/其他' }
},
{
path: 'list/:id/signPreview',
component: () => import('@/viewsPc/match/signPreview'),
......
src/routerPc/index.js
......@@ -426,7 +426,13 @@ export const constantRoutes = [
component: () => import('@/viewsPc/match/chooseProject'),
name: 'chooseProject',
meta: { title: '选择参赛项目' }
}
},
{
path: 'list/:id/chooseCoachPerson',
component: () => import('@/viewsPc/match/components/chooseCoachPerson'),
name: 'chooseCoachPerson',
meta: { title: '选择教练/领队/其他' }
},
]
},
{
......
src/viewsPc/center/component/modifySign.vue
......@@ -115,7 +115,19 @@ const goConti = () => {
matchId: cptId
}
})
} else if (signType == '1') {
}
// else if (signType == '1') {
// alert('222')
// router.push({
// path: `/match/list/${cptId}/chooseCoach`,
// query: {
// matchId: cptId,
// groupId: form.value.signList[0].groupId,
// signType: 1
// }
// })
// }
else if (signType == '1') {
router.push({
path: `/match/list/${cptId}/chooseSportsman`,
query: {
......
src/viewsPc/index.vue
......@@ -697,10 +697,10 @@ function applyInvitation() {
.zn-btn {
background: #FFFFFF;
font-size: 18px;
font-size: 16px;
color: #453DEA;
border-radius: 23px;
padding: 10px 20px;
padding: 10px 18px;
display: inline-flex;
align-items: center;
}
......@@ -1170,7 +1170,7 @@ function applyInvitation() {
}
h1 {
text-align: center
text-align: center;
}
}
}
......
src/viewsPc/index_en.vue
......@@ -124,7 +124,7 @@
<download />
</el-icon>
</a>
<a class="zn-btn ml20 btn-q" @click="reserveSearch">Reservation Inquiry</a>
<a class="zn-btn btn-q" @click="reserveSearch">Reservation Inquiry</a>
<!-- <a
v-if="matchData.isCourseView==1" class="zn-btn ml20 btn-q forPc"
style="font-size: 15px;margin-right: 20px" @click="popMaster"
......@@ -134,10 +134,10 @@
<Edit />
</el-icon>
</a> -->
<a class="zn-btn ml20 btn-q" @click="backNumberSearch">Competition
<br/>
<a class="zn-btn btn-q" @click="backNumberSearch">Competition
Number</a>
<a class="zn-btn ml20 btn-q" @click="schSearchSearch">Schedule
<a class="zn-btn btn-q" @click="schSearchSearch">Schedule
Inquiry</a>
</div>
......@@ -716,7 +716,7 @@ function applyInvitation() {
text-transform: uppercase;
font-size: 16px;
width: fit-content;
margin: 5px 5px 5px 0;
margin: 5px 5px 5px 15px;
color: #453DEA;
border-radius: 23px;
padding: 10px 20px;
......@@ -1408,7 +1408,7 @@ function applyInvitation() {
}
.zn-btn {
margin-top: 10px
margin-top: 15px
}
}
......
src/viewsPc/match/chooseCoach.vue
......@@ -307,12 +307,12 @@ function geren() {
if (res[1].data.id != null) {
hasChooseObj.value = res[1].data
hasChooseId = res[1].data.id
form.value.coachs = hasChooseObj.value.coachIds.split(',')
form.value.leader = hasChooseObj.value.leaderIds.split(',')
form.value.other = hasChooseObj.value.otherIds.split(',')
form.value.doctor = hasChooseObj.value.doctorIds.split(',')
form.value.translator = hasChooseObj.value.translatorIds.split(',')
form.value.official = hasChooseObj.value.officialIds.split(',')
form.value.coachs = hasChooseObj.value.coachIds.split(',')||[]
form.value.leader = hasChooseObj.value.leaderIds.split(',')||[]
form.value.other = hasChooseObj.value.otherIds.split(',')||[]
form.value.doctor = hasChooseObj.value.doctorIds.split(',')||[]
form.value.translator = hasChooseObj.value.translatorIds.split(',')||[]
form.value.official = hasChooseObj.value.officialIds.split(',')||[]
}
})
}
......
src/viewsPc/match/chooseProject.vue
......@@ -3,7 +3,7 @@
<!-- 个人报名-国外-->
<div class="box ph-30">
<el-card class="mb20">
<single-sign-step :active-step="1" :language="language" />
<single-sign-step :active-step="2" :language="language" />
</el-card>
<el-card :body-style="{'padding': '0'}">
......@@ -126,13 +126,13 @@
<zu-table v-else :language="language" :list="zuTableList" @delete="removeThis" />
<div v-if="showPersonList||myMemberTable.length>0">
<el-row class="mt20">
<!-- <el-row class="mt20">
<el-col :span="24">
<el-button plain type="primary" @click="addAccompany">
{{ language == 0 ? '添加随行人员' : 'Add accompanying personnel' }}
</el-button>
</el-col>
</el-row>
</el-row> -->
<el-table :data="myMemberTable" border class="mt20">
<el-table-column :label="language==0?'序号':'Index'" align="center" type="index" width="70" />
<el-table-column :label="language==0?'姓氏':'Surname'" min-width="100" prop="xing" />
......@@ -167,6 +167,7 @@
</div>
<div class="text-center mt20 father">
<el-button type="primary" class="w200px" plain round @click="goPrev()">{{ language==0?'上一步':'Go back' }}</el-button>
<el-button
class="btn-lineG w200px" round style="position: relative ; z-index: 99;" type="primary"
@click="submitForm"
......@@ -360,7 +361,7 @@ function upDateChoosedList() {
}
function getMyMemberTable() {
match.getPerPersonList({ cptId: matchId.value, searchLabels: '1,2,3,4,5,6' }, userId.value).then(res => {
match.getPerPersonList2({ cptId: matchId.value, searchLabels: '1,2,3,4,5,6' }, userId.value).then(res => {
myMemberTable.value = res.rows
if (res.rows.length > 0) {
showPersonList.value = true
......@@ -418,7 +419,16 @@ function getSignInfoList() {
zuTableList.value = res.data.zuData || []
})
}
function goPrev() {
router.push({
name: 'chooseCoachPerson',
query: {
matchId: matchId.value,
groupId: groupId.value,
isNational: true,
}
})
}
function submitForm() {
if (signInfoList.value.length == 0) {
......@@ -457,33 +467,34 @@ function submitForm() {
}
}
if (showPersonList.value) {
if (myMemberTable.value.length == 0) {
ElMessageBox.confirm(language.value == 0 ? '是否继续添加随行人员？' : 'Do you want to add casual personnel?',
language.value == 0 ? '提示' : 'Tip', {
confirmButtonText: language.value == 0 ? '是' : 'Yes',
cancelButtonText: language.value == 0 ? '否，进入下一步' : 'NO,Go Next',
type: 'warning'
}).then(() => {
// if (showPersonList.value) {
// if (myMemberTable.value.length == 0) {
// ElMessageBox.confirm(language.value == 0 ? '是否继续添加随行人员？' : 'Do you want to add casual personnel?',
// language.value == 0 ? '提示' : 'Tip', {
// confirmButtonText: language.value == 0 ? '是' : 'Yes',
// cancelButtonText: language.value == 0 ? '否，进入下一步' : 'NO,Go Next',
// type: 'warning'
// }).then(() => {
}).catch(() => {
commit()
})
} else {
commit()
}
} else {
ElMessageBox.confirm(language.value == 0 ? '是否添加随行人员？' : 'Do you want to add casual personnel?',
language.value == 0 ? '提示' : 'Tip', {
confirmButtonText: language.value == 0 ? '是' : 'Yes',
cancelButtonText: language.value == 0 ? '否，进入下一步' : 'NO,Go Next',
type: 'warning'
}).then(() => {
showPersonList.value = true
}).catch(() => {
// }).catch(() => {
// commit()
// })
// } else {
// commit()
// }
// }
// else {
// ElMessageBox.confirm(language.value == 0 ? '是否添加随行人员？' : 'Do you want to add casual personnel?',
// language.value == 0 ? '提示' : 'Tip', {
// confirmButtonText: language.value == 0 ? '是' : 'Yes',
// cancelButtonText: language.value == 0 ? '否，进入下一步' : 'NO,Go Next',
// type: 'warning'
// }).then(() => {
// showPersonList.value = true
// }).catch(() => {
commit()
})
}
// })
// }
}
function commit() {
......
src/viewsPc/match/chooseSportsman_bak.vue
......@@ -209,7 +209,7 @@ import { useStorage } from '@vueuse/core/index'
const language = useStorage('language', 0)
const data = reactive({
coachForm: {}, activeStep: 2,
coachForm: {}, activeStep: 3,
tourCurrent: 0,
tableData: [],
signInfoList: [],
......
src/viewsPc/match/components/singleSignStep.vue
<template>
<el-steps :active="activeStep" align-center>
<el-step :title="language==0?'校验 WDSF 会员号':'Check WDSF MIN'" />
<el-step :title="language==0?'教练/领队/其他':'Coach/Head Of Team/Other'" />
<el-step :title="language==0?'选手报名':'Participant Registration'" />
<el-step :title="language==0?'提交审核':'Submit for review'" />
</el-steps>
......
src/viewsPc/match/detail_en.vue
......@@ -434,8 +434,8 @@
<div v-if="matchData.leagueId==0" class="fixed_gg_l" @click="applyInvitation">
<div>
<img v-if="language==0" src="@/assets/logo/Invitation_c.png">
<img v-else src="@/assets/logo/Invitation_e.png">
<img v-if="language==0 && matchData.invitationSw == '1'" src="@/assets/logo/Invitation_c.png">
<img v-if="language!=0 && matchData.invitationSw == '1'" src="@/assets/logo/Invitation_e.png">
</div>
</div>
......@@ -783,9 +783,12 @@ function goTeamSignCn() {
async function goPersonalSign() {
// 选项目
await router.push({
name: 'chooseProject',
name: 'chooseCoachPerson',
query: {
matchId: matchId.value
matchId: matchId.value,
groupId: groupId.value,
isNational: true,
languageSource: matchData.value.languageSource
}
})
}
......
src/viewsPc/match/signPreview.vue
......@@ -207,7 +207,7 @@ function getMatch() {
}
function getMyMemberTable() {
match.getPerPersonList({ cptId: matchId.value, searchLabels: '1,2,3,4,5,6' }, user.userId).then(res => {
match.getPerPersonList2({ cptId: matchId.value, searchLabels: '1,2,3,4,5,6' }, user.userId).then(res => {
myMemberTable.value = res.rows
})
}
......
vite.config.js
......@@ -64,14 +64,14 @@ export default defineConfig(({ mode, command }) => {
proxy: {
// https://cn.vitejs.dev/config/#server-proxy
'/dev-api/ztx-train': {
target: 'http://192.168.1.22:8081',
target: 'http://192.168.1.128:8081',
// target: 'https://wdsfwuxicenter.com/stage-api',
// target: 'https://jijin.wtwuxicenter.com/stage-api',
changeOrigin: true,
rewrite: (p) => p.replace(/^\/dev-api\/ztx-train/, '')
},
'/dev-api/ztx-match': {
target: 'http://192.168.1.22:8081',
target: 'http://192.168.1.128:8081',
// target: 'https://jijin.wtwuxicenter.com/stage-api',
// target: 'https://wdsfwuxicenter.com/stage-api',
// target: 'https://wdsfwuxicenter.com/stage-api/',
......@@ -79,14 +79,14 @@ export default defineConfig(({ mode, command }) => {
rewrite: (p) => p.replace(/^\/dev-api\/ztx-match/, '')
},
'/dev-api/ztx-webSite': {
target: 'http://192.168.1.22:8081',
target: 'http://192.168.1.128:8081',
// target: 'https://wdsfwuxicenter.com/stage-api',
// target: 'https://jijin.wtwuxicenter.com/stage-api',
changeOrigin: true,
rewrite: (p) => p.replace(/^\/dev-api\/ztx-webSite/, '')
},
'/dev-api': {
target: 'http://192.168.1.22:8081',
target: 'http://192.168.1.128:8081',
// target: 'http://192.168.1.169:8081',
// target: 'https://jijin.wtwuxicenter.com/stage-api',
// target: 'https://wdsfwuxicenter.com/stage-api/',
......@@ -96,7 +96,7 @@ export default defineConfig(({ mode, command }) => {
},
'/ticket': {
// target: 'https://jijin.wtwuxicenter.com/stage-api',
target: 'http://192.168.1.22:8081',
target: 'http://192.168.1.128:8081',
// target: 'https://wdsfwuxicenter.com/h5/',
// target: 'https://ticketh5.wdsfwuxicenter.com/h5/',
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!