From 7f66787c4fc2330debb1cb562082c65e6f4eed86 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=E9=A9=AC=E6=A2=93=E5=BD=AD?= <tianbohe0@163.com>
Date: Mon, 20 Apr 2026 14:35:18 +0800
Subject: [PATCH] =?UTF-8?q?=E8=B5=9B=E4=BA=8B=E8=AE=B0=E5=BD=95=E6=9B=B4?=
 =?UTF-8?q?=E6=8D=A2=E9=98=9F=E5=91=98=E9=94=99=E8=AF=AF=E6=98=BE=E7=A4=BA?=
 =?UTF-8?q?=E5=8C=BA=E5=9F=9F=E8=B0=83=E6=95=B4?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/api/match/usereventrecord..js |  1 +
 src/views/user/record/index.vue   | 47 +++++++++++++++++++++----------
 2 files changed, 33 insertions(+), 15 deletions(-)

diff --git a/src/api/match/usereventrecord..js b/src/api/match/usereventrecord..js
index 22142d0..e501dd1 100644
--- a/src/api/match/usereventrecord..js
+++ b/src/api/match/usereventrecord..js
@@ -299,6 +299,7 @@ export const usereventrecordMemberValidatePost = (data) => {
  * @param {Array<number>} data.memberIds - 队员ID列表
  * @param {Array<number>} data.groupIds - 组别ID列表
  * @param {Array<{groupId: number, memberIds: Array<number>}>} data.groupMembers - 组别队员分配
+ * @param {number} [data.excludeRegistrationId] - 要排除的报名ID（更换队员时使用）
  * @returns {Promise<{
  *   hasLimit: boolean,
  *   limitDetails: Array<{
diff --git a/src/views/user/record/index.vue b/src/views/user/record/index.vue
index 1a37c3b..e57e352 100644
--- a/src/views/user/record/index.vue
+++ b/src/views/user/record/index.vue
@@ -289,18 +289,6 @@
 									</el-tag>
 									<span v-if="!(changeMembersMap[item.registrationItemId]?.length)" class="assign-card-placeholder">点击此卡片后，从右侧选择队员</span>
 								</div>
-								
-								<!-- 队员验证错误提示 -->
-								<div v-if="hasValidationErrorsForItem(item)" class="validation-error-section">
-									<div class="validation-error-item"
-										v-for="m in (changeMembersMap[item.registrationItemId] ?? [])"
-										:key="m.userId ?? m.id">
-										<el-alert v-if="!getMemberValidationResult(m, item).isValid"
-											:title="getMemberValidationResult(m, item).message"
-											type="error" :closable="false"
-											size="small" style="margin-top: 4px;" />
-									</div>
-								</div>
 							</div>
 							<el-empty v-if="!changeMembersItems.length" description="暂无项目" />
 						</div>
@@ -344,8 +332,17 @@
 					
 					<!-- 验证提示区域 -->
 					<div class="validation-notes-section" style="margin-top: 16px;">
-						<!-- 年龄性别不符合要求提示 -->
-						<el-alert v-if="hasAnyValidationErrors()" title="队员信息不符合组别要求" type="error" :closable="false" style="margin-bottom: 12px;" />
+						<!-- 所有队员验证错误提示 -->
+						<template v-if="hasAnyValidationErrors()">
+							<el-alert title="队员信息不符合组别要求" type="error" :closable="false" style="margin-bottom: 12px;" />
+							<div class="validation-error-list">
+								<el-alert v-for="(itemError, idx) in getAllValidationErrors()"
+									:key="idx"
+									:title="itemError.message"
+									type="error" :closable="false"
+									size="small" style="margin-top: 4px;" />
+							</div>
+						</template>
 						
 						<!-- 限报提示 -->
 						<template v-if="hasAnyRegistrationLimit()">
@@ -1261,6 +1258,25 @@ const hasAnyValidationErrors = () => {
 	return changeMembersItems.value.some(item => hasValidationErrorsForItem(item));
 };
 
+// 获取所有验证错误
+const getAllValidationErrors = () => {
+	const errors = [];
+	for (const item of changeMembersItems.value) {
+		const members = changeMembersMap.value[item.registrationItemId] || [];
+		for (const member of members) {
+			const result = getMemberValidationResult(member, item);
+			if (!result.isValid && result.message) {
+				errors.push({
+					item: item,
+					member: member,
+					message: `【${formatItemTitle(item)}】${member.name}：${result.message}`
+				});
+			}
+		}
+	}
+	return errors;
+};
+
 // 检查是否有任何报名限制
 const hasAnyRegistrationLimit = () => {
 	return registrationLimitCheckResult.value?.hasLimit ?? false;
@@ -1471,7 +1487,8 @@ const validateAllMembers = async () => {
 			// 检查报名限制
 			const { succeeded, data } = await usereventrecordRegistrationLimitCheckPost({
 				eventId: changeMembersData.value.eventId,
-				groupMembers: groupMembers
+				groupMembers: groupMembers,
+				excludeRegistrationId: changeMembersData.value.registrationId
 			});
 
 			if (succeeded && data) {