diff --git a/src/views/match/manage/Steps/Step3ProjectConfig.vue b/src/views/match/manage/Steps/Step3ProjectConfig.vue
index d6adbc5..f9bc560 100644
--- a/src/views/match/manage/Steps/Step3ProjectConfig.vue
+++ b/src/views/match/manage/Steps/Step3ProjectConfig.vue
@@ -54,7 +54,7 @@
 
 			<el-card shadow="never">
 				<template #header>限报配置</template>
-				<div v-if="localFormData.projects?.length" class="project-limit-section">
+				<div v-if="localFormData.projects?.length && !isOnlyIndividual" class="project-limit-section">
 					<div class="project-limit-section__header">
 						<div class="project-limit-section__title">
 							<span class="required-star" v-if="!readonly">*</span>
@@ -77,7 +77,7 @@
 							<template #default="{ row, $index }">
 								<el-form-item v-if="!readonly"
 									:prop="`projects.${$index}.limitCount`"
-									:rules="[{ required: true, message: '请填写项目限报数', trigger: 'change' }]"
+									:rules="isOnlyIndividual ? [] : [{ required: true, message: '请填写项目限报数', trigger: 'change' }]"
 									style="margin: 0; justify-content: center;"
 								>
 									<el-input-number v-model="row.limitCount" :min="0" :step="1" :precision="0" :controls="true" class="project-limit-input" :disabled="readonly" />
diff --git a/src/views/match/manage/Steps/Step4FeeConfig.vue b/src/views/match/manage/Steps/Step4FeeConfig.vue
index 65a0ad5..36a7bc2 100644
--- a/src/views/match/manage/Steps/Step4FeeConfig.vue
+++ b/src/views/match/manage/Steps/Step4FeeConfig.vue
@@ -163,7 +163,8 @@ import { merchantPageGet } from '/@/api/match/merchant';
 
 const props = defineProps({ 
 	modelValue: { type: Object, required: true },
-	readonly: { type: Boolean, default: false }
+	readonly: { type: Boolean, default: false },
+	projects: { type: Array, default: () => [] }
 });
 const emit = defineEmits(['update:modelValue']);
 
@@ -220,8 +221,8 @@ const syncMerchantInfo = () => {
 };
 
 watch(
-	() => props.modelValue,
-	(v) => {
+	[() => props.modelValue, () => props.projects],
+	([v, externalProjects]) => {
 		if (!v) return;
 		
 		// 直接复制所有属性，强制覆盖
@@ -233,7 +234,8 @@ watch(
 		localFormData.value.bankName = v.bankName ?? '';
 		localFormData.value.accountNumber = v.accountNumber ?? '';
 		localFormData.value.businessLicenseUrl = v.businessLicenseUrl ?? '';
-		localFormData.value.projects = v.projects ?? [];
+		// 优先使用外部传入的 projects，如果没有则使用 modelValue 中的
+		localFormData.value.projects = (externalProjects && externalProjects.length > 0) ? externalProjects : (v.projects ?? []);
 		
 		// 如果已经初始化完成，调用 syncMerchantInfo
 		if (isInitialized.value) {
diff --git a/src/views/match/manage/work.vue b/src/views/match/manage/work.vue
index 5ddbb34..11afada 100644
--- a/src/views/match/manage/work.vue
+++ b/src/views/match/manage/work.vue
@@ -6,7 +6,7 @@
                 <div style="height:50px;"></div>
                 <Step2Units v-model:modelValue="formData.units" :readonly="true" />
                 <div style="height:50px;"></div>
-                <Step3ProjectConfig v-model:modelValue="formData.projectConfig" :readonly="true" />
+                <Step3ProjectConfig v-model:modelValue="projectConfigWithRegistrationType" :readonly="true" />
                 <div style="height:50px;"></div>
                 <Step4FeeConfig v-model:modelValue="formData.feeConfig" :readonly="true" :projects="formData.projectConfig.projects" />
                 <div style="height:100px;"></div>
@@ -404,6 +404,12 @@ const formData = ref({
         projectPrices: {},
     },
 });
+
+// 合并 registrationType 的项目配置
+const projectConfigWithRegistrationType = computed(() => ({
+    ...formData.value.projectConfig,
+    registrationType: formData.value.basicInfo.registrationType,
+}));
 // 打开弹窗
 const openDialog = async (id) => {
     // 先设置 eventId，再显示对话框
diff --git a/src/views/team/athlete/index.vue b/src/views/team/athlete/index.vue
index 3633b7e..c1422ca 100644
--- a/src/views/team/athlete/index.vue
+++ b/src/views/team/athlete/index.vue
@@ -140,8 +140,10 @@
 
 				<!-- 性别 -->
 				<el-form-item label="性别" prop="gender">
-					<el-tag :type="formData.gender === 0 ? '' : 'success'">
-						{{ formData.gender === 0 ? '男' : '女' }}</el-tag>
+					<el-tag v-if="formData.gender !== ''" :type="formData.gender === 0 ? '' : 'success'">
+						{{ formData.gender === 0 ? '男' : '女' }}
+					</el-tag>
+					<span v-else style="color: #909399;">请选择性别</span>
 				</el-form-item>
 
 				<el-form-item v-if="ocrType === 'idcard'" label="身份证号" prop="idCardNumber">
@@ -198,7 +200,7 @@ const getDefaultFormData = () => ({
 	id: undefined,
 	name: '',
 	idCardNumber: '',
-	gender: 0,
+	gender: '',
 	idCardImageUrl: '',
 	birthDate: '',
 	mobile: '',
diff --git a/src/views/team/leader/index.vue b/src/views/team/leader/index.vue
index d8d8f59..88b4171 100644
--- a/src/views/team/leader/index.vue
+++ b/src/views/team/leader/index.vue
@@ -86,7 +86,7 @@ const getDefaultFormData = () => ({
 	id: undefined,
 	name: '',
 	age: '',
-	gender: 0,
+	gender: '',
 	mobile: '',
 });
 
diff --git a/src/views/user/record/index.vue b/src/views/user/record/index.vue
index df94366..e166dbe 100644
--- a/src/views/user/record/index.vue
+++ b/src/views/user/record/index.vue
@@ -265,7 +265,7 @@
 			<template #footer>
 				<span class="dialog-footer">
 					<el-button @click="isShowViewChangeMembersDialog = false">关闭</el-button>
-					<el-button type="primary" @click="openChangeMembersDialog">更换参赛队员</el-button>
+					<el-button type="primary" @click="openChangeMembersDialog" :disabled="isChangeMemberDisabled">更换参赛队员</el-button>
 				</span>
 			</template>
 		</el-dialog>
@@ -868,6 +868,33 @@ const isCancelDisabledByRow = (row) => {
     return !(payStatus === 1);
 };
 
+// 检查当前查看/更换队员弹窗中是否可以更换队员
+const isChangeMemberDisabled = computed(() => {
+    if (!viewChangeMembersData.value) return true;
+    
+    // 检查是否已超过赛事报名截止时间
+    if (viewChangeMembersData.value.registrationEndTime) {
+        try {
+            const endTime = new Date(viewChangeMembersData.value.registrationEndTime);
+            const currentTime = new Date();
+            if (currentTime > endTime) {
+                // 已超过报名截止时间，禁用更换队员
+                return true;
+            }
+        } catch {
+            // 日期解析失败，继续检查其他条件
+        }
+    }
+    
+    // 检查赛事状态，如果不是报名中(1)则禁用
+    const eventStatus = normalizeToNumber(viewChangeMembersData.value.eventStatus);
+    if (eventStatus !== 1) {
+        return true;
+    }
+    
+    return false;
+});
+
 // 格式化组别的年龄段（出生日期范围）
 const formatGroupDate = (item) => {
 	const start = item?.birthDateStart;
diff --git a/src/views/user/registration/index.vue b/src/views/user/registration/index.vue
index 5b95957..9c32769 100644
--- a/src/views/user/registration/index.vue
+++ b/src/views/user/registration/index.vue
@@ -63,7 +63,7 @@
 					<div style="height:50px;"></div>
 					<Step2Units v-model:modelValue="formData.units" :readonly="true" />
 					<div style="height:50px;"></div>
-					<Step3ProjectConfig v-model:modelValue="formData.projectConfig" :readonly="true" />
+					<Step3ProjectConfig v-model:modelValue="projectConfigWithRegistrationType" :readonly="true" />
 					<div style="height:50px;"></div>
 				<UserStep4FeeConfig v-model:modelValue="formData.feeConfig" :readonly="true" />
 					<div style="height:100px;"></div>
@@ -680,6 +680,12 @@ const formData = ref({
 	},
 });
 
+// 合并 registrationType 的项目配置
+const projectConfigWithRegistrationType = computed(() => ({
+	...formData.value.projectConfig,
+	registrationType: formData.value.basicInfo.registrationType,
+}));
+
 const clearDetailState = () => {
 	detailLoading.value = false;
 	detailData.value = null;