diff --git a/src/views/registrationGroup/index.vue b/src/views/registrationGroup/index.vue
index fff3e0b..9d1ffc7 100644
--- a/src/views/registrationGroup/index.vue
+++ b/src/views/registrationGroup/index.vue
@@ -126,8 +126,9 @@
{{ isDisable ? '返回' : isEdit ? '取消修改' : '取消报名' }}
-
- {{ isEdit ? '确认修改' : '确认报名' }}
+ 暂存信息
+
+ {{ isEdit ? '确认修改' : '确认报名' }}
@@ -235,11 +236,11 @@ const stuRef = ref(null)
const teaRef = ref(null)
const loading = ref(false)
-const submit = () => {
+const submit = (substa:string) => {
if (!ruleForm.teamName) return ElMessage.warning('请输入队伍名称')
ruleForm.instructorSheetList = [...teaRef.value.submit()]
ruleForm.teamManagementList = [...stuRef.value.submit()]
- loading.value = true
+ ruleForm.substa = substa
ruleForm.id = route.query.id
// ruleForm.annualCompid = route.query.id
if(route.query.edit){
@@ -247,7 +248,10 @@ const submit = () => {
ruleForm.id = route.query.annualCompid
}
- ruleForm.substa = "1"
+ if(substa == '1'){
+ loading.value = true
+ }
+ // ruleForm.substa = "1"
getSignUpApi(ruleForm)
.then((res: any) => {
ElMessage({
diff --git a/src/views/registrationPersonage/index.vue b/src/views/registrationPersonage/index.vue
index 5624cc9..5a7ddd3 100644
--- a/src/views/registrationPersonage/index.vue
+++ b/src/views/registrationPersonage/index.vue
@@ -46,6 +46,31 @@
+
+
+ 比赛项目信息
+
+
+
+
+
项目名称
+
{{ ndbsXm.objName }}
+
要求人数
+
{{ ndbsXm.workCount }}
+
+
开始报名时间:
+
{{ ndbsXm.starttime?.split(' ')[0] }}
+
+
+
开始截至时间:
+
{{ ndbsXm.endtime?.split(' ')[0] }}
+
+
+
+
+
@@ -57,7 +82,6 @@
-
@@ -151,7 +175,7 @@
- 作品只允许上传一个,格式为{{ndbs.uploadWorksType}}
+ 作品只允许上传一个,格式为{{ndbsXm.uploadWorksType}}
@@ -210,8 +234,6 @@ const annualCompid = ref('')
const raceName = ref('')
const uploadZp = (id: any) => {
-
- console.log(id)
annualCompid.value = id
dialogVisible.value = true
}
@@ -256,8 +278,9 @@ const submitWork = async () => {
-// 比赛信息
+// 比赛信息、项目信息
const ndbs = ref({})
+const ndbsXm = ref({})
const subLoading = ref(false)
async function submit(substa:string) {
@@ -267,17 +290,11 @@ async function submit(substa:string) {
upData.value.workName = WorkName.value
upData.value.files = fileUrl.value
upData.value.substa = substa
- // if (!upData.value.teamName) {
- // ElMessage({
- // message: '队伍名称不能为空',
- // type: 'warning',
- // })
- // return
- // }
try {
+ if(substa == '1'){
subLoading.value = true
+ }
const res: any = await getSignUpApi({ ...upData.value })
- console.log(res, 999999999)
ElMessage({
message: res?.message || res?.result || '报名成功',
type: 'success',
@@ -311,21 +328,14 @@ 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 })
ruleForm.annualCompid = route.query.annualCompid
ruleForm.teamName = res.result.teamName
- ruleForm.topicid = res.result.topicObj ? res.result.topicObj.id : ''
- ruleForm.objName = res.result.annualCompPointName
ruleForm.requireUploadWorks = res.result.requireUploadWorks
- WorkName.value = res.result.uploadFile.topicName
- options.value = res.result.topicList.map((item) => {
- return {
- value: item.id,
- label: item.name,
- }
- })
+ ruleForm.objName = res.result.annualCompPointName
}
getOldRaceListEvent()
@@ -334,11 +344,12 @@ if (route.query.edit) {
getNdbswxqList(route.query.bcId as string).then((res: any) => {
if (res.result) ndbs.value = res.result
})
+ getComppxqList(route.query.id as string).then((res: any) => {
+ 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
@@ -429,7 +440,7 @@ getTopicListApi()*/
height: 300px;
.com {
- width: 100%;
+ width: 685px;
height: 300px;
border-radius: 6px 6px 6px 6px;
padding-top: 22px;
@@ -447,7 +458,7 @@ getTopicListApi()*/
margin-bottom: 18px;
}
-
+ margin-right: 22px;
.content {
display: flex;
@@ -498,7 +509,7 @@ getTopicListApi()*/
.right {
.info-box {
- width: 100%;
+ width: 210px;
.name {
height: 20px;