zs hace 2 meses
padre
commit
7a770bd74e

+ 2 - 1
src/store/api/platform/matchExt.js

@@ -50,7 +50,8 @@ export const MatchExtStore = defineStore('matchExt', () => {
     return res
   }
   const step5Name = async (payload) => {
-    const res = await axios.$get(`${url}/step5/list/${payload}`)
+    const id = get(payload, 'match_id', get(payload, 'match_id'))
+    const res = await axios.$get(`${url}/step5/list/${id}`, payload)
     return res
   }
   return {

+ 0 - 5
src/views/center/achievement.vue

@@ -462,11 +462,6 @@ const checkedExportChange = (value) => {
 const toExpert = () => {
   dialog.value = { type: '4', show: true, title: '导入数据' }
 }
-// 导出数据
-const toDownload = () => {
-  dialog.value = { type: '3', show: true, title: '导出数据' }
-}
-
 // 下载导入模板
 const toTemplate = () => {
   importActive.value = importActive.value + 1

+ 3 - 2
src/views/center/parts/preliminaryUser.vue

@@ -7,6 +7,7 @@
         </template>
         <el-table-column prop="no" align="center" label="编号" width="100"> </el-table-column>
         <el-table-column prop="user_name" align="center" label="用户"> </el-table-column>
+        <el-table-column prop="match_name" align="center" label="赛事名称"> </el-table-column>
         <el-table-column prop="time" align="center" label="报名时间" />
         <el-table-column prop="start_time" align="center" label="初审时间"> </el-table-column>
         <el-table-column prop="score" align="center" label="初审分数"> </el-table-column>
@@ -32,8 +33,8 @@
         <el-table-column align="center" label="操作" width="180">
           <template #default="{ row }">
             <el-link :underline="false" type="primary" size="mini" @click="toView(row)" style="margin-right: 10px">查看</el-link>
-            <el-link v-if="row.status == '-1'" :underline="false" type="warning" size="mini" @click="toEdit(row)" style="margin-right: 10px">重新提交</el-link>
-            <el-link v-if="row.ext_status == '5' && row.final_start_time" :underline="false" type="primary" size="mini" @click="toFinals(row)">决赛时间确认</el-link>
+            <el-link v-if="row.ext_status == '0'" :underline="false" type="warning" size="mini" @click="toEdit(row)" style="margin-right: 10px">修改报名信息</el-link>
+            <el-link v-if="row.ext_status == '5' && row.status != '2' && row.final_start_time" :underline="false" type="primary" size="mini" @click="toFinals(row)">决赛时间确认</el-link>
           </template>
         </el-table-column>
       </el-table>

+ 8 - 3
src/views/detail/matchDetail.vue

@@ -154,7 +154,7 @@
             </el-table>
           </div>
         </div>
-        <div class="info_3" v-if="info.form == '4' && info.ext_status == '5'">
+        <div class="info_3" v-if="info.form == '4' && info.ext_status == '6'">
           <div class="title">决赛结果公示</div>
           <div class="content_1" style="margin: 20px 0 0 0">
             <el-table :data="finalsList" :header-cell-style="{ backgroundColor: '#edf3ff' }">
@@ -163,6 +163,7 @@
               </template>
               <el-table-column align="center" prop="no" label="编号" width="100" />
               <el-table-column align="center" prop="user_name" label="姓名" />
+              <el-table-column align="center" prop="start_time" label="初审时间" />
               <el-table-column align="center" prop="final_start_time" label="决赛时间" />
             </el-table>
           </div>
@@ -291,7 +292,7 @@ const search = async () => {
       if (res.data.form == '4' && res.data.ext_status == '3') {
         await searchStep3()
       }
-      if (res.data.form == '4' && res.data.ext_status == '5') {
+      if (res.data.form == '4' && res.data.ext_status == '6') {
         await searchStep5()
       }
     }
@@ -308,7 +309,11 @@ const searchStep3 = async () => {
 // 查询决赛公示名单
 const searchStep5 = async () => {
   let id = route.query.id
-  let res = await matchExtStore.step5Name(id)
+  const data = {
+    match_id: id,
+    final_confirm: '0'
+  }
+  let res = await matchExtStore.step5Name(data)
   if (res.errcode == '0') {
     finalsList.value = res.data
   }