From 0b6390bce944624c53e96594576cffbd7c4972d2 Mon Sep 17 00:00:00 2001
From: yujialong <479214531@qq.com>
Date: Wed, 15 May 2024 14:16:34 +0800
Subject: [PATCH] fix

---
 src/pages/match/add/index.vue        |  9 ++++++++-
 src/pages/match/manage/matchInfo.vue |  8 ++++----
 src/pages/station/preview/index.vue  |  2 +-
 src/pages/student/list/index.vue     | 15 ++++++++++-----
 src/pages/system/list/staff.vue      |  7 ++++++-
 5 files changed, 29 insertions(+), 12 deletions(-)

diff --git a/src/pages/match/add/index.vue b/src/pages/match/add/index.vue
index 32c2bfb..973c39e 100644
--- a/src/pages/match/add/index.vue
+++ b/src/pages/match/add/index.vue
@@ -223,7 +223,14 @@ export default {
     // 发布后的逻辑
     next (next, setupId, competitionId, type) {
       if (!next) {
-        this.$router.push(`/match`)
+        if (this.step === 3 && this.$refs['step' + this.step].form[0].contentId) {
+          // 处于第三步 && 编辑
+          this.editing = 0
+          this.step = 1
+        } else {
+          // 新增
+          this.$router.push(`/match`)
+        }
       } else if (next === 2) {
         if (setupId) this.setupId = setupId
         if (competitionId) {
diff --git a/src/pages/match/manage/matchInfo.vue b/src/pages/match/manage/matchInfo.vue
index 3e41105..1be62af 100644
--- a/src/pages/match/manage/matchInfo.vue
+++ b/src/pages/match/manage/matchInfo.vue
@@ -124,7 +124,7 @@
                   <td>{{ i + 1 }}</td>
                   <td>{{ item.stageName }}</td>
                   <template v-if="form.completeCompetitionSetup.competitionType">
-                    <td>{{ item.teamNumLimit || '不限制' }}</td>
+                    <td>{{ item.customNumber || '不限制' }}</td>
                     <td>
                       <template v-if="item.participants">
                         <el-tag v-for="tag in item.participants"
@@ -233,8 +233,8 @@
                      :key="i"
                      :label="item.accountId">{{ item.userName }}</el-checkbox>
       </el-checkbox-group>
-      <p v-if="info.teamLimit && curRow.teamNumLimit"
-         style="margin-top: 15px;font-size: 12px;">注：当前阶段限制{{ curRow.teamNumLimit }}人参赛，且此竞赛每个成员只能参加一个阶段赛项。</p>
+      <p v-if="info.teamLimit && curRow.customNumber"
+         style="margin-top: 15px;font-size: 12px;">注：当前阶段限制{{ curRow.customNumber }}人参赛，且此竞赛每个成员只能参加一个阶段赛项。</p>
       <span slot="footer"
             class="dialog-footer">
         <el-button size="small"
@@ -600,7 +600,7 @@ export default {
       const accountIds = this.checkedMembers
       if (!accountIds.length) return Util.errorMsg('请选择参赛成员！')
       const limit = this.curRow.teamNumLimit // 参赛人数限制
-      if (limit && accountIds.length > limit) return Util.errorMsg(`请选择${limit}个以下参赛成员！`) // 选择的参赛人员个数不能大于参赛人数限制
+      if (limit && accountIds.length > limit) return Util.errorMsg(`请选择${this.curRow.customNumber}个以下参赛成员！`) // 选择的参赛人员个数不能大于参赛人数限制
       this.$post(this.api.stageSelectParticipants, {
         accountIds,
         competitionId: this.id,
diff --git a/src/pages/station/preview/index.vue b/src/pages/station/preview/index.vue
index b12dc58..50594c7 100644
--- a/src/pages/station/preview/index.vue
+++ b/src/pages/station/preview/index.vue
@@ -998,7 +998,7 @@ export default {
           `${location.origin}/pyTrials`
     },
     // 进入子系统
-    toSub () {
+    async toSub () {
       let curProject = this.projects.find(e => e.projectId == this.curProject)
       if (!curProject && this.projects.length) {
         curProject = this.projects[0]
diff --git a/src/pages/student/list/index.vue b/src/pages/student/list/index.vue
index ac0521c..cc659a5 100644
--- a/src/pages/student/list/index.vue
+++ b/src/pages/student/list/index.vue
@@ -218,13 +218,13 @@
             <el-col :span="12">
               <el-form-item prop="workNumber"
                             label="学生学号">
-                <el-input v-model="form.workNumber"
+                <el-input v-model.trim="form.workNumber"
                           placeholder="学生学号"
                           @blur="workNumberChange"></el-input>
               </el-form-item>
               <el-form-item prop="userName"
                             label="学生姓名">
-                <el-input v-model="form.userName"
+                <el-input v-model.trim="form.userName"
                           placeholder="请输入学生姓名"></el-input>
               </el-form-item>
               <el-form-item prop="roleId"
@@ -234,13 +234,13 @@
 
               <el-form-item prop="phone"
                             label="手机号">
-                <el-input v-model="form.phone"
+                <el-input v-model.trim="form.phone"
                           placeholder="可用于登录平台，以及找回密码"
                           maxlength="11"></el-input>
               </el-form-item>
               <el-form-item prop="email"
                             label="邮箱">
-                <el-input v-model="form.email"
+                <el-input v-model.trim="form.email"
                           placeholder="可用于登录平台，以及找回密码"></el-input>
               </el-form-item>
               <el-form-item prop="uniqueIdentification"
@@ -416,7 +416,12 @@ export default {
           { required: true, message: "请输入名称", trigger: "blur" }
         ],
         userName: [
-          { required: true, message: "请输入学生姓名", trigger: "blur" }
+          { required: true, message: "请输入学生姓名", trigger: "blur" },
+          {
+            pattern: /^\S+$/,
+            message: "请输入正确的学生姓名",
+            trigger: "blur"
+          }
         ],
         workNumber: [
           { required: true, message: "请输入学号", trigger: 'blur' },
diff --git a/src/pages/system/list/staff.vue b/src/pages/system/list/staff.vue
index d772bd6..d446f16 100644
--- a/src/pages/system/list/staff.vue
+++ b/src/pages/system/list/staff.vue
@@ -236,7 +236,12 @@ export default {
       },
       rules: {
         userName: [
-          { required: true, message: "请输入用户姓名", trigger: "blur" }
+          { required: true, message: "请输入用户姓名", trigger: "blur" },
+          {
+            pattern: /^\S+$/,
+            message: "请输入正确的用户姓名",
+            trigger: "blur"
+          }
         ],
         roleValue: [
           { required: true, message: "请选择账号角色", trigger: "change" }