修改

src/views/center/match.vue

@@ -30,7 +30,7 @@
             </el-table-column>
             <el-table-column align="center" label="操作" width="250">
               <template #default="{ row }">
-                <el-link v-if="row.form == '4'" :underline="false" type="primary" @click="toPreliminary(row)" style="margin-right: 10px">初赛报名名单</el-link>
+                <!-- <el-link v-if="row.form == '4'" :underline="false" type="primary" @click="toPreliminary(row)" style="margin-right: 10px">报名名单</el-link> -->
                 <el-link v-if="row.status == '-2'" :underline="false" type="warning" @click="toExam(row)" style="margin-right: 10px">提交审核</el-link>
                 <el-link v-if="row.match_status == '2' && row.form != '4' && row.form != '3'" :underline="false" type="primary" @click="toScore(row)" style="margin-right: 10px"> 分数 </el-link>
                 <el-link v-if="row.form != '4'" :underline="false" type="warning" @click="toSign(row)" style="margin-right: 10px">报名</el-link>
@@ -523,10 +523,10 @@ const toScore = (data) => {
   form.value = data
   dialog.value = { type: '4', show: true, title: '分数管理' }
 }
-// 查看初赛信息
+// 查看初审信息
 const toPreliminary = (data) => {
   form.value = data
-  dialog.value = { type: '5', show: true, title: '初赛信息' }
+  dialog.value = { type: '5', show: true, title: '报名信息' }
 }
 // 赛事设置
 const toExtOne = (data) => {
@@ -628,9 +628,18 @@ const toExam = async (row) => {
 // 修改赛事状态
 const toMatchSave = async (row) => {
   const data = cloneDeep(row)
-  let res = await store.update({ id: data.id, match_status: data.match_status })
-  if ($checkRes(res, true)) {
-    toClose()
+  console.log(data)
+
+  if (data.form == '4' && data.match_status == '2') {
+    const res = await store.step1({ match_id: data.id })
+    if ($checkRes(res, true)) {
+      toClose()
+    }
+  } else {
+    const res = await store.update({ id: data.id, match_status: data.match_status })
+    if ($checkRes(res, true)) {
+      toClose()
+    }
   }
 }
 const toClose = async () => {

src/views/center/parts/extOne.vue

@@ -2,8 +2,8 @@
   <div class="index">
     <div v-if="type == '1'">
       <el-form ref="ruleFormRef" :model="form" :rules="rules" label-width="auto" class="form" label-position="left">
-        <el-form-item label="初赛开始时间" prop="start_time">
-          <el-date-picker format="YYYY-MM-DD" value-format="YYYY-MM-DD" v-model="form.start_time" type="date" placeholder="请选择初赛开始时间" style="width: 100%" />
+        <el-form-item label="初审开始时间" prop="start_time">
+          <el-date-picker format="YYYY-MM-DD" value-format="YYYY-MM-DD" v-model="form.start_time" type="date" placeholder="请选择初审开始时间" style="width: 100%" />
         </el-form-item>
         <el-col :span="24" class="button">
           <el-button type="primary" @click="submitForm(ruleFormRef)">保存</el-button>
@@ -37,7 +37,7 @@ const form = ref({})
 // 表单
 const ruleFormRef = ref()
 const rules = reactive({
-  start_time: [{ required: true, message: '请选择初赛开始时间', trigger: 'blur' }]
+  start_time: [{ required: true, message: '请选择初审开始时间', trigger: 'blur' }]
 })
 // 保存
 const submitForm = async (formEl) => {

src/views/center/parts/preliminaryMatch.vue

@@ -12,6 +12,11 @@
         <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="time" align="center" label="报名时间" />
+        <el-table-column prop="ext_status" align="center" label="流程状态" width="100">
+          <template #default="scope">
+            {{ getDict(scope.row.ext_status, 'ext_status') || '暂无' }}
+          </template>
+        </el-table-column>
         <el-table-column prop="status" align="center" label="状态" width="100">
           <template #default="scope">
             <el-tag v-if="scope.row.status == '0'" type="primary">待审核</el-tag>
@@ -93,7 +98,8 @@ const info = ref([])
 
 const form = ref({})
 const dialog = ref({ type: '1', show: false, title: '报名信息' })
-
+// 流程状态字典表
+const extList = inject('extList')
 // 批量导出
 const selectionList = ref([])
 const is_look = ref(false)
@@ -144,6 +150,14 @@ const toExam = (status) => {
     })
     .catch(() => {})
 }
+// 字典数据转换
+const getDict = (data, model) => {
+  if (data) {
+    let res
+    if (model == 'ext_status') res = extList.value.find((f) => f.value == data)
+    return get(res, 'label')
+  }
+}
 // 分页
 const changePage = (page = currentPage.value) => {
   search({ skip: (page - 1) * limit, limit: limit })
@@ -155,7 +169,7 @@ const sizeChange = (limits) => {
 }
 // 根据数据项中的canSelect字段判断是否可选
 const handleRowSelectable = (row) => {
-  return row.status == '0'
+  return row.status == '1'
 }
 // 导出
 const toExport = () => {

src/views/center/parts/preliminaryUser.vue

@@ -144,6 +144,7 @@
           <el-descriptions-item label="是否进入决赛">{{ getDict(form.final_confirm, 'final_confirm') || '暂无' }}</el-descriptions-item>
           <el-descriptions-item label="决赛时间">{{ form.final_start_time }}</el-descriptions-item>
           <el-descriptions-item label="决赛分数">{{ form.final_score }}</el-descriptions-item>
+          <el-descriptions-item label="流程状态">{{ getDict(form.ext_status, 'ext_status') || '暂无' }}</el-descriptions-item>
         </el-descriptions>
       </div>
       <div v-if="dialog.type == '3'">

src/views/detail/matchDetail.vue

@@ -142,7 +142,7 @@
           </div>
         </div>
         <div class="info_3" v-if="info.form == '4'">
-          <div class="title">初赛结果公示</div>
+          <div class="title">初审结果公示</div>
           <div class="content" style="margin: 20px 0 0 0">
             <el-table :data="preliminaryList" stripe style="width: 100%">
               <el-table-column align="center" prop="name" label="姓名" />