增加比赛编辑

base
JayChou 6 months ago
parent 871b9b5ca2
commit 4be34ff89a
  1. 36
      src/api/oldRace.ts
  2. 26
      src/views/competition/index.vue
  3. 71
      src/views/login/registered.vue
  4. 9
      src/views/projectName/index.vue
  5. 21
      src/views/raceInfo/index.vue
  6. 94
      src/views/registrationGroup/components/stuList.vue
  7. 25
      src/views/registrationGroup/components/teaList.vue
  8. 93
      src/views/registrationGroup/index.vue
  9. 5
      src/views/registrationPersonage/index.vue
  10. 39
      src/views/userInfo/components/reacList.vue
  11. 7
      src/views/userInfo/index.vue

@ -0,0 +1,36 @@
import request from "@/utils/requset";
// 获取年度比赛和项目
export const getOldRaceList = (params:any) => {
return request({
url: '/annualcompetitionprojectregistration/annualCompetitionProjectRegistration/queryCompInfo4Stu',
method: 'get',
params
})
}
// 查询报名信息
export const getOldRaceInfo = (params:any) => {
return request({
url: '/annualcompetitionprojectregistration/annualCompetitionProjectRegistration/queryTopicById',
method: 'get',
params
})
}
// 查询团队成员列表
export const getTeamList = (params:any) => {
return request({
url: 'annualcompetitionprojectregistration/annualCompetitionProjectRegistration/queryTeamManagementByMainId',
method: 'get',
params
})
}
// 获取指导老师列表
export const getTeacherList = (params:any) => {
return request({
url: 'annualcompetitionprojectregistration/annualCompetitionProjectRegistration/queryInstructorSheetByMainId',
method: 'get',
params
})
}

@ -7,7 +7,19 @@
<div class="competition" v-loading="loading"> <div class="competition" v-loading="loading">
<!-- 简介 --> <!-- 简介 -->
<div class="synopsis"> <div class="synopsis">
<div style="display: flex;justify-content: space-between;">
<div class="name">{{ yearRaceInfo.name }}</div> <div class="name">{{ yearRaceInfo.name }}</div>
<div class="back">
<el-button
type="primary"
style="margin-top: 10px"
@click="$router.back()"
>
返回
</el-button>
</div>
</div>
<div class="content"> <div class="content">
{{ yearRaceInfo.introduction }} {{ yearRaceInfo.introduction }}
</div> </div>
@ -20,11 +32,15 @@
<div class="text-box"> <div class="text-box">
<div class="title">选择项目</div> <div class="title">选择项目</div>
<div class="small">选择下面的项目报名参与比赛</div> <div class="small">选择下面的项目报名参与比赛</div>
<div class="back"><el-button type="primary" style="margin-top: 10px;" @click="$router.back()">返回</el-button></div>
</div> </div>
<div class="card-list"> <div class="card-list">
<div v-if="dataList.length == 0" style="font-size: 20px; color:#828282 ;">没有项目请创建年度比赛项目</div> <div
v-if="dataList.length == 0"
style="font-size: 20px; color: #828282"
>
没有项目请创建年度比赛项目
</div>
<template v-for="(o, i) in dataList" :key="o.id"> <template v-for="(o, i) in dataList" :key="o.id">
<div v-if="(i + 5) % 4 == 1" class="card" type="yellow"> <div v-if="(i + 5) % 4 == 1" class="card" type="yellow">
<div class="top" :title="o.objName">{{ o.objName }}</div> <div class="top" :title="o.objName">{{ o.objName }}</div>
@ -82,7 +98,9 @@
<div class="text">{{ i.name }}</div> <div class="text">{{ i.name }}</div>
<img src="../../assets/images/编组.png" alt="" /> <img src="../../assets/images/编组.png" alt="" />
</div> </div>
<div class="bottom">报名时间{{ i.starttime }} - {{ i.endtime }}</div> <div class="bottom">
报名时间{{ i.starttime }} - {{ i.endtime }}
</div>
</div> </div>
</div> </div>
</div> </div>
@ -95,7 +113,7 @@ import { getCompetitionApi } from '@/api/person'
import { ref, watch } from 'vue' import { ref, watch } from 'vue'
import { useRoute, useRouter } from 'vue-router' import { useRoute, useRouter } from 'vue-router'
import { ElMessage, ElLoading } from 'element-plus' import { ElMessage, ElLoading } from 'element-plus'
import { getYearRaceInfo,getHistoryRaceList } from '@/api/race' import { getYearRaceInfo, getHistoryRaceList } from '@/api/race'
const route = useRoute() const route = useRoute()
const router = useRouter() const router = useRouter()

@ -2,7 +2,7 @@
<div class="login-form"> <div class="login-form">
<div class="login-title">注册</div> <div class="login-title">注册</div>
<div class="form"> <div class="form">
<el-form :model="form" label-width="0"> <el-form :model="form" ref="ruleFormRef" label-width="0" :rules="rules">
<!-- <el-form-item> <!-- <el-form-item>
<el-col :span="11"> <el-col :span="11">
<el-input <el-input
@ -24,21 +24,21 @@
/> />
</el-col> </el-col>
</el-form-item> --> </el-form-item> -->
<el-form-item> <el-form-item prop="username">
<el-input <el-input
v-model="form.username" v-model="form.username"
:prefix-icon="User" :prefix-icon="User"
placeholder="账号" placeholder="账号"
/> />
</el-form-item> </el-form-item>
<el-form-item> <el-form-item prop="realname">
<el-input <el-input
v-model="form.realname" v-model="form.realname"
:prefix-icon="User" :prefix-icon="User"
placeholder="姓名" placeholder="姓名"
/> />
</el-form-item> </el-form-item>
<el-form-item> <el-form-item prop="workno">
<el-input <el-input
v-model="form.workno" v-model="form.workno"
placeholder="工号/学号" placeholder="工号/学号"
@ -61,14 +61,14 @@
ref="cascader" ref="cascader"
/> />
</el-form-item> </el-form-item>
<el-form-item> <el-form-item prop="mobile">
<el-input <el-input
placeholder="手机号码" placeholder="手机号码"
v-model="form.mobile" v-model="form.mobile"
:prefix-icon="Iphone" :prefix-icon="Iphone"
></el-input> ></el-input>
</el-form-item> </el-form-item>
<el-form-item> <el-form-item prop="password">
<el-input <el-input
placeholder="密码" placeholder="密码"
v-model="form.password" v-model="form.password"
@ -119,6 +119,7 @@ import { User, Iphone, Lock } from '@element-plus/icons-vue'
import { getFaculties } from '@/api/race' import { getFaculties } from '@/api/race'
import { ElMessage } from 'element-plus' import { ElMessage } from 'element-plus'
import { getCode, sturegister } from '@/api/user' import { getCode, sturegister } from '@/api/user'
import { ca } from 'element-plus/es/locales.mjs'
const $emits = defineEmits(['backLogin']) const $emits = defineEmits(['backLogin'])
const form = reactive<any>({ const form = reactive<any>({
username: '', username: '',
@ -140,7 +141,43 @@ const KeyValue: any = {
confirmPassword: '确认密码' /*, policy: false*/, confirmPassword: '确认密码' /*, policy: false*/,
smscode: '验证码', smscode: '验证码',
} }
const rules = {
username: [
{ required: true, message: '请输入姓名', trigger: 'blur' },
{ min: 6, max: 20, message: '账号长度在6到50个字符', trigger: 'blur' },
{
pattern: /^[a-zA-Z0-9]+$/,
message: '姓名只能包含中文、英文',
trigger: 'blur',
},
],
realname: [
{ required: true, message: '请输入姓名', trigger: 'blur' },
{ min: 2, max: 20, message: '姓名长度在2到10个字符', trigger: 'blur' },
{
pattern: /^[a-zA-Z0-9]+$/,
message: '姓名只能包含中文、英文',
trigger: 'blur',
},
],
workno: [
{ required: true, message: '请输入工号/学号', trigger: 'blur' },
{ pattern: /^\d{1,20}$/, message: '工号/学号必须是8位数字', trigger: 'blur' },
],
mobile: [
{ required: true, message: '请输入手机号', trigger: 'blur' },
{ pattern: /^1[3-9]\d{9}$/, message: '手机号格式不正确', trigger: 'blur' },
],
password: [
{ required: true, message: '请输入密码', trigger: 'blur' },
{ min: 8, max: 16, message: '密码长度在8到16个字符', trigger: 'blur' },
{
pattern: /^(?=(.*[a-zA-Z]){2,}|(?=.*[a-zA-Z])(?=.*\d)|(?=.*[a-zA-Z])(?=.*[!@#$%^&*()_+\-=\[\]{};':"\\|,.<>/?])|(?=.*\d)(?=.*[!@#$%^&*()_+\-=\[\]{};':"\\|,.<>/?]))[a-zA-Z\d!@#$%^&*()_+\-=\[\]{};':"\\|,.<>/?]{8,16}$/,
message: '密码必须包含至少两种字符类型:英文字符、数字、特殊字符',
trigger: 'blur'
}
],
}
const FacultiesList = ref([]) const FacultiesList = ref([])
const getFacultiesList = async (data: any) => { const getFacultiesList = async (data: any) => {
const res: any = await getFaculties(data) const res: any = await getFaculties(data)
@ -160,31 +197,31 @@ const props = {
primaryKey: 'key', primaryKey: 'key',
pid: node.value, pid: node.value,
}) })
if(node.level == 0 || node.level == 1){ if (node.level == 0 || node.level == 1) {
const nodes = FacultiesList.value.map((item: any) => ({ const nodes = FacultiesList.value.map((item: any) => ({
value: item.id, value: item.id,
label: item.title, label: item.title,
disabled : true disabled: true,
})) }))
resolve(nodes) resolve(nodes)
}else{ } else {
const nodes = FacultiesList.value.map((item: any) => ({ const nodes = FacultiesList.value.map((item: any) => ({
value: item.id, value: item.id,
label: item.title, label: item.title,
})) }))
resolve(nodes) resolve(nodes)
} }
}, },
} }
const cascader = ref() const cascader = ref()
const handleChange = (e:any) => { const handleChange = (e: any) => {
// console.log(e,cascader.value); // console.log(e,cascader.value);
cascader.value.togglePopperVisible() cascader.value.togglePopperVisible()
} }
const ruleFormRef = ref<any>()
const ragistered = async () => { const ragistered = async () => {
try {
await ruleFormRef.value.validate()
for (const key in form) { for (const key in form) {
if (form[key] === '') { if (form[key] === '') {
ElMessage.warning(`${KeyValue[key]}不能为空`) ElMessage.warning(`${KeyValue[key]}不能为空`)
@ -221,6 +258,12 @@ const ragistered = async () => {
getcodeinfo() getcodeinfo()
} }
console.log(res) console.log(res)
} catch (error: any) {
console.log(error, 'error')
for (const key in error) {
ElMessage.warning(`${KeyValue[key]}${error[key][0].message}`)
}
}
} }
const codeUrl = ref('') const codeUrl = ref('')

@ -21,7 +21,7 @@
</el-breadcrumb-item> </el-breadcrumb-item>
</template> </template>
</el-breadcrumb> </el-breadcrumb>
<div class="black"><el-button type="primary" style="margin-top: 10px;" @click="$router.back()">返回</el-button></div> <!-- <div class="black"><el-button type="primary" style="margin-top: 10px;" @click="$router.back()">返回</el-button></div> -->
</div> </div>
<div class="content"> <div class="content">
@ -37,7 +37,10 @@
</div> </div>
<div class="btn-box"> <div class="btn-box">
<el-button class="btn" @click="handleSub">立刻报名</el-button> <el-button class="btn" @click="$router.back()">返回</el-button>
<el-button class="btn" style="margin-left: 60px;" @click="handleSub">立刻报名</el-button>
</div> </div>
</div> </div>
@ -157,7 +160,7 @@ getData()
--color2: #42d9ac; --color2: #42d9ac;
cursor: pointer; cursor: pointer;
text-align: center; text-align: center;
width: 470px; width: 270px;
height: 50px; height: 50px;
border-radius: 45px; border-radius: 45px;
border: none; border: none;

@ -139,11 +139,18 @@
/> />
</div> </div>
<div class="reac-info"> <div class="reac-info">
<div class="niandu">{{item.annualname}}年度</div>
<div class="reac-title">{{ item.name }}</div> <div class="reac-title">{{ item.name }}</div>
<div class="reac-project">{{ item.introduction }}</div> <div class="reac-title">负责部门{{ item.compOrgan }}</div>
<div class="time"> <!-- <div class="reac-project">{{ item.introduction }}</div> -->
报名时间:{{ item.starttime }}-{{ item.endtime }} <div class="time" style="display: flex;justify-content: space-between;">
<div> 开始时间:{{ item.starttime }} </div>
结束时间:{{ item.endtime }}
<div></div>
</div> </div>
<!-- <div class="time">
</div> -->
</div> </div>
</div> </div>
</div> </div>
@ -275,7 +282,13 @@ const createfileLink = (url: any) => {
.time { .time {
font-size: 14px; font-size: 14px;
color: #8c8b8b; color: #8c8b8b;
margin-top: 40px; margin-top: 30px;
}
.niandu{
color: #1e2033;
font-size: 18px;
margin-top: 20px;
font-weight: 600;
} }
} }
} }

@ -3,13 +3,7 @@
<el-button type="primary" icon="Plus" @click="add" class="btn"> <el-button type="primary" icon="Plus" @click="add" class="btn">
新增 新增
</el-button> </el-button>
<el-button <el-button type="danger" icon="Delete" @click="del" class="btn">
type="danger"
icon="Delete"
@click="del"
class="btn"
>
删除 删除
</el-button> </el-button>
<div class="table-box"> <div class="table-box">
@ -58,6 +52,39 @@
/> />
</template> </template>
</el-table-column> </el-table-column>
<el-table-column>
<template #header>
<el-icon>
<Edit />
</el-icon>
<span style="margin-left: 10px">学号</span>
</template>
<template #default="{ row }">
<el-input v-model="row.work_no" />
</template>
</el-table-column>
<el-table-column>
<template #header>
<el-icon>
<Edit />
</el-icon>
<span style="margin-left: 10px">手机号</span>
</template>
<template #default="{ row }">
<el-input v-model="row.phone" />
</template>
</el-table-column>
<el-table-column>
<template #header>
<el-icon>
<Edit />
</el-icon>
<span style="margin-left: 10px">邮箱</span>
</template>
<template #default="{ row }">
<el-input v-model="row.email" />
</template>
</el-table-column>
<el-table-column> <el-table-column>
<template #header> <template #header>
<el-icon> <el-icon>
@ -76,11 +103,14 @@
</template> </template>
<script lang="ts" setup> <script lang="ts" setup>
import { reactive, ref, onMounted ,watch} from 'vue' import { reactive, ref, onMounted, watch } from 'vue'
import stuDialog from './stuDialog.vue' import stuDialog from './stuDialog.vue'
import { ClusterOutlined } from '@ant-design/icons-vue' import { ClusterOutlined } from '@ant-design/icons-vue'
import { ElMessage } from 'element-plus' import { ElMessage } from 'element-plus'
import userStore from '@/store/module/user' import userStore from '@/store/module/user'
import { getTeamList } from '@/api/oldRace'
import { useRoute } from 'vue-router'
const route = useRoute()
const userModel = userStore() const userModel = userStore()
const options = [ const options = [
@ -97,31 +127,48 @@ const options = [
// //
const tableData = reactive<any[]>([]) const tableData = reactive<any[]>([])
onMounted(() => { onMounted(() => {
if(tableData.length === 1) return if (route.query.edit) {
setTimeout(() => { const getTeamListEvent = async () => {
tableData.push({ const res: any = await getTeamList({ id: route.query.id })
userId: userModel.userInfo.id, console.log(res, 'res~~~')
realname: userModel.userInfo.realname, res.result.forEach((item: any) => {
captain: '1', tableData.push(item)
teamSeq: 1,
}) })
}, 50) }
}) getTeamListEvent()
watch(()=>userModel.userInfo,()=>{ return
if(tableData.length === 1) return }
if (tableData.length === 1) return
setTimeout(() => {
tableData.push({ tableData.push({
userId: userModel.userInfo.id, userId: userModel.userInfo.id,
realname: userModel.userInfo.realname, realname: userModel.userInfo.realname,
work_no: userModel.userInfo.workNo,
phone: userModel.userInfo.phone,
email: userModel.userInfo.email,
captain: '1', captain: '1',
teamSeq: 1, teamSeq: 1,
}) })
}, 500)
}) })
// watch(()=>userModel.userInfo,()=>{
// if(tableData.length === 1) return
// tableData.push({
// userId: userModel.userInfo.id,
// realname: userModel.userInfo.realname,
// captain: '1',
// teamSeq: 1,
// })
// })
const add = () => { const add = () => {
const length = tableData.push({ const length = tableData.push({
realname: '', // realname: '', //
captain: '0', // captain: '0', //
teamSeq: tableData.length + 1, // teamSeq: tableData.length + 1, //
userId: '', // id userId: '', // id
work_no: '',
phone: '',
email: '',
}) })
openDialog(tableData[length - 1]) openDialog(tableData[length - 1])
} }
@ -129,6 +176,8 @@ const add = () => {
// dialogdialog // dialogdialog
const target = ref<any>() const target = ref<any>()
const openDialog = (row: any) => { const openDialog = (row: any) => {
// console.log(row,'row');
visible.value = true visible.value = true
target.value = row target.value = row
} }
@ -144,7 +193,10 @@ const handleSelected = (row: any = {}) => {
}) })
return return
} }
console.log(row, 'aqq')
target.value.work_no = row.work_no
target.value.phone = row.phone
target.value.email = row.email
target.value.realname = row.realname target.value.realname = row.realname
target.value.userId = row.id target.value.userId = row.id
} }
@ -157,7 +209,7 @@ const multipleTableRef = ref<any>(null)
const isSele = ref(false) const isSele = ref(false)
const del = () => { const del = () => {
const rows = multipleTableRef.value.getSelectionRows() const rows = multipleTableRef.value.getSelectionRows()
console.log(rows,'111'); console.log(rows, '111')
if (rows.length === 0) { if (rows.length === 0) {
return ElMessage({ return ElMessage({
message: '请选择要删除的成员', message: '请选择要删除的成员',

@ -119,10 +119,13 @@
</template> </template>
<script lang="ts" setup> <script lang="ts" setup>
import { reactive, ref } from 'vue' import { reactive, ref ,onMounted} from 'vue'
import teaDialog from './teaDialog.vue' import teaDialog from './teaDialog.vue'
import { ClusterOutlined } from '@ant-design/icons-vue' import { ClusterOutlined } from '@ant-design/icons-vue'
import { ElMessage } from 'element-plus' import { ElMessage } from 'element-plus'
import {getTeacherList} from '@/api/oldRace'
import { useRoute } from 'vue-router'
const route = useRoute()
const options = [ const options = [
{ {
value: '1', value: '1',
@ -136,12 +139,28 @@ const options = [
// //
const tableData = reactive<any[]>([]) const tableData = reactive<any[]>([])
onMounted(async() => {
if (route.query.edit) {
const res:any = await getTeacherList({ id: route.query.id})
res.result.forEach((item: any) => {
tableData.push({
teacherName: item.teacherName,
teacherPhone: item.teacherPhone,
teacherType: item.teacherType.toString(),
teacherXl: item.teacherXl,
teacherYjfx: item.teacherYjfx,
teacherZc: item.teacherZc,
teacherZy: item.teacherZy,
teacherid: item.teacherid,
})
})
}
})
const add = () => { const add = () => {
const length = tableData.push({ const length = tableData.push({
teacherName: '', teacherName: '',
teacherPhone: '', teacherPhone: '',
teacherType: '', teacherType: '1',
teacherXl: '', teacherXl: '',
teacherYjfx: '', teacherYjfx: '',
teacherZc: '', teacherZc: '',

@ -5,11 +5,7 @@
<div class="box"> <div class="box">
<div class="title-box"> <div class="title-box">
<div class="title">报名信息确认</div> <div class="title">报名信息确认</div>
<!-- <div class="text"> <div class="text">请仔细核对报名信息报名成功后无法修改</div>
请仔细核对报名信息报名成功后无法修改请仔细核对报名信息报名成功后无法修改
请仔细核对报名信息报名成功后无法修改请仔细核对报名信息报名成功后无法修改
请仔细核对报名信息报名成功后无法修改请仔细核对报名信息报名成功后无法修改
</div> -->
</div> </div>
<div class="img-box"> <div class="img-box">
@ -154,7 +150,7 @@
</div> </div>
</el-card> </el-card>
<div class="bottom"> <div class="bottom">
<el-button class="btn" @click="$router.push('/')">取消报名</el-button> <el-button class="btn" @click="$router.back()">取消报名</el-button>
<el-button class="btn cyan" @click="submit" :loading="loading"> <el-button class="btn cyan" @click="submit" :loading="loading">
确认报名 确认报名
</el-button> </el-button>
@ -163,7 +159,7 @@
</template> </template>
<script lang="ts" setup> <script lang="ts" setup>
import { reactive, ref, toRefs,nextTick } from 'vue' import { reactive, ref, toRefs, nextTick } from 'vue'
import { useRoute, useRouter } from 'vue-router' import { useRoute, useRouter } from 'vue-router'
import userStore from '@/store/module/user' import userStore from '@/store/module/user'
import type { FormInstance, FormRules } from 'element-plus' import type { FormInstance, FormRules } from 'element-plus'
@ -172,6 +168,7 @@ import { getSignUpApi } from '@/api/person'
import stuList from './components/stuList.vue' import stuList from './components/stuList.vue'
import teaList from './components/teaList.vue' import teaList from './components/teaList.vue'
import { getNdbswxqList, getComppxqList } from '@/api/person' import { getNdbswxqList, getComppxqList } from '@/api/person'
import { getOldRaceList,getOldRaceInfo } from '@/api/oldRace'
import { getTopicList } from '@/api/race' import { getTopicList } from '@/api/race'
const user = userStore() const user = userStore()
const route = useRoute() const route = useRoute()
@ -189,13 +186,59 @@ function pasSex(num: number) {
// //
const ndbs = ref<any>({}) const ndbs = ref<any>({})
const ndbsXm = ref<any>({}) const ndbsXm = ref<any>({})
getNdbswxqList(route.query.bcId as string).then((res: any) => { console.log(route.query.edit, 'route.query.edit')
const options = ref([])
if (route.query.edit) {
const getOldRaceListEvent = async () => {
const res: any = await getOldRaceList({ id: route.query.id})
ndbs.value = res.result.annualComp
ndbsXm.value = res.result.annualCompPoint
}
const getOldRaceInfoEvent = async () => {
const res: any = await getOldRaceInfo({ id: route.query.id})
console.log(res,'res~~~');
ruleForm.annualCompid = route.query.annualCompid
ruleForm.teamName = res.result.teamName
ruleForm.topicId = res.result.topicObj.id
options.value = res.result.topicList.map((item) => {
return {
value: item.id,
label: item.name,
}
})
}
getOldRaceListEvent()
getOldRaceInfoEvent()
} else {
getNdbswxqList(route.query.bcId as string).then((res: any) => {
if (res.result) ndbs.value = res.result if (res.result) ndbs.value = res.result
}) })
getComppxqList(route.query.id as string).then((res: any) => { getComppxqList(route.query.id as string).then((res: any) => {
//console.log(res.result, 'xm') //console.log(res.result, 'xm')
if (res.result) ndbsXm.value = res.result if (res.result) ndbsXm.value = res.result
}) })
const getTopicListApi = async () => {
const res: any = await getTopicList({ annualCompid: route.query.id })
console.log(res)
nextTick(() => {
if (res.result.length != 0) {
ruleForm.topicId = res.result[0].id
}
})
options.value = res.result.map((item) => {
return {
value: item.id,
label: item.name,
}
})
}
getTopicListApi()
}
// members: adviser: // members: adviser:
const activeName = ref('members') const activeName = ref('members')
@ -219,18 +262,23 @@ const teaRef = ref<any>(null)
const loading = ref(false) const loading = ref(false)
const submit = () => { const submit = () => {
if(!ruleForm.teamName) return ElMessage.warning('请输入队伍名称') if (!ruleForm.teamName) return ElMessage.warning('请输入队伍名称')
if(!ruleForm.topicId) return ElMessage.warning('请选择题目') if (!ruleForm.topicId) return ElMessage.warning('请选择题目')
ruleForm.instructorSheetList = [...teaRef.value.submit()] ruleForm.instructorSheetList = [...teaRef.value.submit()]
ruleForm.teamManagementList = [...stuRef.value.submit()] ruleForm.teamManagementList = [...stuRef.value.submit()]
loading.value = true loading.value = true
ruleForm.id = route.query.id
if(route.query.edit){
ruleForm.enrollCode = route.query.enrollCode
}
getSignUpApi(ruleForm) getSignUpApi(ruleForm)
.then((res: any) => { .then((res: any) => {
ElMessage({ ElMessage({
message: res?.message || '报名成功', message: res?.message || '报名成功',
type: 'success', type: 'success',
}) })
router.push('/') router.push('/user-info')
}) })
.catch((err) => { .catch((err) => {
ElMessage({ ElMessage({
@ -240,24 +288,7 @@ const submit = () => {
}) })
.finally(() => (loading.value = false)) .finally(() => (loading.value = false))
} }
const options = ref([])
const getTopicListApi = async () => {
const res: any = await getTopicList({ annualCompid: route.query.id })
console.log(res)
nextTick(( ) => {
if(res.result.length != 0){
ruleForm.topicId = res.result[0].id
}
})
options.value = res.result.map((item) => {
return {
value: item.id,
label: item.name,
}
})
}
getTopicListApi()
</script> </script>
<style lang="scss" scoped> <style lang="scss" scoped>

@ -138,9 +138,7 @@
</el-card> </el-card>
<div class="bottom"> <div class="bottom">
<el-button class="btn" @click="() => router.push('/')"> <el-button class="btn" @click="() => router.back()">取消报名</el-button>
取消报名
</el-button>
<el-button class="btn cyan" :loading="subLoading" @click="submit"> <el-button class="btn cyan" :loading="subLoading" @click="submit">
确认报名 确认报名
</el-button> </el-button>
@ -209,6 +207,7 @@ async function submit() {
message: res?.message || res?.result || '报名成功', message: res?.message || res?.result || '报名成功',
type: 'success', type: 'success',
}) })
router.push('/user-info')
} catch (error) { } catch (error) {
ElMessage({ ElMessage({
// @ts-ignore // @ts-ignore

@ -33,7 +33,7 @@
</template> </template>
</el-table-column> </el-table-column>
<el-table-column label="操作"> <el-table-column label="上传作品">
<template #default="{ row }"> <template #default="{ row }">
<el-button <el-button
link link
@ -47,7 +47,7 @@
<el-tag v-else>已上传作品</el-tag> <el-tag v-else>已上传作品</el-tag>
</template> </template>
</el-table-column> </el-table-column>
<el-table-column label="提交" prop="fileName"> <el-table-column label="操作" prop="fileName">
<template #default="{ row }"> <template #default="{ row }">
<el-button <el-button
link link
@ -58,6 +58,23 @@
> >
提交 提交
</el-button> </el-button>
<el-button
link
type="primary"
size="small"
@click="editEvent(row.id,row.annualCompid,row.enrollCode)"
v-if="row.enrollStatic == '1' || row.enrollStatic == '3'"
>
编辑
</el-button>
<!-- <el-button
link
type="primary"
size="small"
>
详情
</el-button> -->
</template> </template>
</el-table-column> </el-table-column>
</el-table> </el-table>
@ -115,8 +132,10 @@
<script setup lang="ts"> <script setup lang="ts">
import { ref } from 'vue' import { ref } from 'vue'
import { getStuRaceList, uploadFileZp, sava, getfile } from '@/api/race' import { getStuRaceList, uploadFileZp, sava } from '@/api/race'
import { ElMessage } from 'element-plus' import { ElMessage } from 'element-plus'
import { useRouter } from 'vue-router'
const router = useRouter()
const list = ref<any>([]) const list = ref<any>([])
const page = ref<any>({ const page = ref<any>({
pageNo: 1, pageNo: 1,
@ -214,6 +233,20 @@ const formatstatus = (status: any) => {
break break
} }
} }
const editEvent = (id: any,annualCompid: any,enrollCode:any) => {
console.log(id);
router.push({
path: '/registrationGroup',
query:{
id,
annualCompid,
enrollCode,
edit: true
}
})
}
</script> </script>
<style scoped lang="scss"> <style scoped lang="scss">

@ -37,6 +37,7 @@
<div class="text">{{ useUserStore.userInfo.realname }}</div> <div class="text">{{ useUserStore.userInfo.realname }}</div>
</div> </div>
<div class="info-box"> <div class="info-box">
<div class="label">姓别</div> <div class="label">姓别</div>
<div class="text"> <div class="text">
@ -115,6 +116,9 @@
<el-form-item label="姓名"> <el-form-item label="姓名">
<el-input v-model="form.name" /> <el-input v-model="form.name" />
</el-form-item> </el-form-item>
<el-form-item label="学号">
<el-input v-model="form.workNo" />
</el-form-item>
<!-- <el-form-item label="部门"> <!-- <el-form-item label="部门">
<el-cascader <el-cascader
:props="props" :props="props"
@ -171,6 +175,7 @@ const editUserInfo = () => {
form.birthday = useUserStore.userInfo.birthday form.birthday = useUserStore.userInfo.birthday
form.sex = useUserStore.userInfo.sex form.sex = useUserStore.userInfo.sex
form.email = useUserStore.userInfo.email form.email = useUserStore.userInfo.email
form.workNo = useUserStore.userInfo.workNo
// form.facultiesId = useUserStore.userInfo.facultiesId // form.facultiesId = useUserStore.userInfo.facultiesId
form.phone = useUserStore.userInfo.phone form.phone = useUserStore.userInfo.phone
dialogVisible.value = true dialogVisible.value = true
@ -192,6 +197,7 @@ const form = reactive({
email: '', email: '',
facultiesId: '', facultiesId: '',
phone: '', phone: '',
workNo:'',
}) })
// //
@ -218,6 +224,7 @@ const submit = async () => {
facultiesId: form.facultiesId, facultiesId: form.facultiesId,
phone: form.phone, phone: form.phone,
avatar: avatar.value, avatar: avatar.value,
workNo: form.workNo
} }
for (const key in data) { for (const key in data) {
if (data[key] === '') { if (data[key] === '') {

Loading…
Cancel
Save