diff --git a/backend/ruoyi-modules/ruoyi-stgl/src/main/java/org/dromara/stgl/controller/StglMyController.java b/backend/ruoyi-modules/ruoyi-stgl/src/main/java/org/dromara/stgl/controller/StglMyController.java index 6f12bd15..c76f423f 100644 --- a/backend/ruoyi-modules/ruoyi-stgl/src/main/java/org/dromara/stgl/controller/StglMyController.java +++ b/backend/ruoyi-modules/ruoyi-stgl/src/main/java/org/dromara/stgl/controller/StglMyController.java @@ -80,8 +80,9 @@ public class StglMyController extends BaseController { @GetMapping("/registrations") public TableDataInfo getMyRegistrations( @Parameter(description = "分页参数") PageQuery pageQuery, - @Parameter(description = "报名类型(1-社团 2-志愿团队 3-活动)") @RequestParam(required = false) String registrationType) { - return stglMyService.queryMyRegistrations(pageQuery, registrationType); + @Parameter(description = "报名类型(1-社团 2-志愿团队 3-活动)") @RequestParam(required = false) String registrationType, + @Parameter(description = "名称(模糊查询)") @RequestParam(required = false) String name) { + return stglMyService.queryMyRegistrations(pageQuery, registrationType, name); } /** diff --git a/backend/ruoyi-modules/ruoyi-stgl/src/main/java/org/dromara/stgl/mapper/StglMyMapper.java b/backend/ruoyi-modules/ruoyi-stgl/src/main/java/org/dromara/stgl/mapper/StglMyMapper.java index 1ae29933..56237a84 100644 --- a/backend/ruoyi-modules/ruoyi-stgl/src/main/java/org/dromara/stgl/mapper/StglMyMapper.java +++ b/backend/ruoyi-modules/ruoyi-stgl/src/main/java/org/dromara/stgl/mapper/StglMyMapper.java @@ -54,10 +54,12 @@ public interface StglMyMapper { * * @param userId 用户ID * @param registrationType 报名类型(可选) + * @param name 名称(可选，模糊查询) * @return 报名记录列表 */ List selectMyRegistrations(@Param("userId") Long userId, - @Param("registrationType") String registrationType); + @Param("registrationType") String registrationType, + @Param("name") String name); /** * 分页查询我的报名记录(社团+志愿团队+活动) @@ -65,11 +67,13 @@ public interface StglMyMapper { * @param page 分页对象 * @param userId 用户ID * @param registrationType 报名类型(可选) + * @param name 名称(可选，模糊查询) * @return 分页结果 */ Page selectMyRegistrationsPage(@Param("page") Page page, @Param("userId") Long userId, - @Param("registrationType") String registrationType); + @Param("registrationType") String registrationType, + @Param("name") String name); /** * 查询我的报名记录总数 diff --git a/backend/ruoyi-modules/ruoyi-stgl/src/main/java/org/dromara/stgl/service/IStglMyService.java b/backend/ruoyi-modules/ruoyi-stgl/src/main/java/org/dromara/stgl/service/IStglMyService.java index c04bf3a2..e056827d 100644 --- a/backend/ruoyi-modules/ruoyi-stgl/src/main/java/org/dromara/stgl/service/IStglMyService.java +++ b/backend/ruoyi-modules/ruoyi-stgl/src/main/java/org/dromara/stgl/service/IStglMyService.java @@ -47,9 +47,10 @@ public interface IStglMyService { * * @param pageQuery 分页参数 * @param registrationType 报名类型(可选) + * @param name 名称(可选，模糊查询) * @return 报名记录分页信息 */ - TableDataInfo queryMyRegistrations(PageQuery pageQuery, String registrationType); + TableDataInfo queryMyRegistrations(PageQuery pageQuery, String registrationType, String name); /** * 对活动进行评分 diff --git a/backend/ruoyi-modules/ruoyi-stgl/src/main/java/org/dromara/stgl/service/impl/StglMyServiceImpl.java b/backend/ruoyi-modules/ruoyi-stgl/src/main/java/org/dromara/stgl/service/impl/StglMyServiceImpl.java index 592c1bae..6cb9406c 100644 --- a/backend/ruoyi-modules/ruoyi-stgl/src/main/java/org/dromara/stgl/service/impl/StglMyServiceImpl.java +++ b/backend/ruoyi-modules/ruoyi-stgl/src/main/java/org/dromara/stgl/service/impl/StglMyServiceImpl.java @@ -72,10 +72,10 @@ public class StglMyServiceImpl implements IStglMyService { * 分页查询我的报名记录 */ @Override - public TableDataInfo queryMyRegistrations(PageQuery pageQuery, String registrationType) { + public TableDataInfo queryMyRegistrations(PageQuery pageQuery, String registrationType, String name) { Long userId = LoginHelper.getUserId(); - Page result = stglMyMapper.selectMyRegistrationsPage(pageQuery.build(), userId, registrationType); + Page result = stglMyMapper.selectMyRegistrationsPage(pageQuery.build(), userId, registrationType, name); return TableDataInfo.build(result); } diff --git a/backend/ruoyi-modules/ruoyi-stgl/src/main/resources/mapper/StglMyMapper.xml b/backend/ruoyi-modules/ruoyi-stgl/src/main/resources/mapper/StglMyMapper.xml index 6188531c..2df4193b 100644 --- a/backend/ruoyi-modules/ruoyi-stgl/src/main/resources/mapper/StglMyMapper.xml +++ b/backend/ruoyi-modules/ruoyi-stgl/src/main/resources/mapper/StglMyMapper.xml @@ -267,8 +267,8 @@ NULL as approval_time, NULL as approval_by, m.remark, - CASE WHEN m.status = '1' THEN '正常' ELSE '待审核' END as current_status, - (SELECT dict_label FROM sys_dict_data WHERE dict_type = 'stgl_member_role' AND dict_value = CAST(m.role_type AS CHAR) AND tenant_id = '000000') as role, + (SELECT dict_label FROM sys_dict_data WHERE dict_type = 'stgl_member_status' AND dict_value = CAST(m.status AS CHAR) AND tenant_id = '000000') as current_status, + m.role_type as role, c.president_name as organizer, c.establish_date as time_info, '' as location, @@ -279,6 +279,9 @@ FROM stgl_member m INNER JOIN stgl_club c ON m.relation_id = c.id AND m.member_type = 1 AND m.tenant_id = '000000' AND c.tenant_id = '000000' WHERE m.user_id = #{userId} AND m.deleted = 0 AND c.deleted = 0 + + AND c.club_name LIKE CONCAT('%', #{name}, '%') + ) UNION ALL ( @@ -293,7 +296,7 @@ NULL as approval_time, NULL as approval_by, m.remark, - CASE WHEN m.status = '1' THEN '正常' ELSE '待审核' END as current_status, + (SELECT dict_label FROM sys_dict_data WHERE dict_type = 'stgl_member_status' AND dict_value = CAST(m.status AS CHAR) AND tenant_id = '000000') as current_status, (SELECT dict_label FROM sys_dict_data WHERE dict_type = 'stgl_volunteer_role' AND dict_value = CAST(m.role_type AS CHAR) AND tenant_id = '000000') as role, vt.leader_name as organizer, vt.establish_date as time_info, @@ -305,6 +308,9 @@ FROM stgl_member m INNER JOIN stgl_volunteer_team vt ON m.relation_id = vt.id AND m.member_type = 2 AND m.tenant_id = '000000' AND vt.tenant_id = '000000' WHERE m.user_id = #{userId} AND m.deleted = 0 AND vt.deleted = 0 + + AND vt.team_name LIKE CONCAT('%', #{name}, '%') + ) UNION ALL ( @@ -319,7 +325,7 @@ ar.approval_time, ar.approval_by, ar.remark, - CASE WHEN ar.approval_status = '1' THEN '已报名' ELSE '待审核' END as current_status, + (SELECT dict_label FROM sys_dict_data WHERE dict_type = 'stgl_approval_status' AND dict_value = CAST(ar.approval_status AS CHAR) AND tenant_id = '000000') as current_status, '参与者' as role, a.organizer_name as organizer, a.start_time as time_info, @@ -331,10 +337,18 @@ FROM stgl_activity_registration ar INNER JOIN stgl_activity a ON ar.activity_id = a.id AND ar.tenant_id = '000000' AND a.tenant_id = '000000' WHERE ar.user_id = #{userId} AND ar.deleted = 0 AND a.deleted = 0 + + AND a.activity_name LIKE CONCAT('%', #{name}, '%') + ) - - WHERE registration_type = #{registrationType} - + + + AND registration_type = #{registrationType} + + + AND target_name LIKE CONCAT('%', #{name}, '%') + + ORDER BY registration_time DESC @@ -379,8 +393,8 @@ NULL as approval_time, NULL as approval_by, m.remark, - CASE WHEN m.status = '1' THEN '正常' ELSE '待审核' END as current_status, - (SELECT dict_label FROM sys_dict_data WHERE dict_type = 'stgl_member_role' AND dict_value = CAST(m.role_type AS CHAR) AND tenant_id = '000000') as role, + (SELECT dict_label FROM sys_dict_data WHERE dict_type = 'stgl_member_status' AND dict_value = CAST(m.status AS CHAR) AND tenant_id = '000000') as current_status, + m.role_type as role, c.president_name as organizer, c.establish_date as time_info, '' as location, @@ -391,6 +405,9 @@ FROM stgl_member m INNER JOIN stgl_club c ON m.relation_id = c.id AND m.member_type = 1 AND m.tenant_id = '000000' AND c.tenant_id = '000000' WHERE m.user_id = #{userId} AND m.deleted = 0 AND c.deleted = 0 + + AND c.club_name LIKE CONCAT('%', #{name}, '%') + ) UNION ALL ( @@ -405,7 +422,7 @@ NULL as approval_time, NULL as approval_by, m.remark, - CASE WHEN m.status = '1' THEN '正常' ELSE '待审核' END as current_status, + (SELECT dict_label FROM sys_dict_data WHERE dict_type = 'stgl_member_status' AND dict_value = CAST(m.status AS CHAR) AND tenant_id = '000000') as current_status, (SELECT dict_label FROM sys_dict_data WHERE dict_type = 'stgl_volunteer_role' AND dict_value = CAST(m.role_type AS CHAR) AND tenant_id = '000000') as role, vt.leader_name as organizer, vt.establish_date as time_info, @@ -417,6 +434,9 @@ FROM stgl_member m INNER JOIN stgl_volunteer_team vt ON m.relation_id = vt.id AND m.member_type = 2 AND m.tenant_id = '000000' AND vt.tenant_id = '000000' WHERE m.user_id = #{userId} AND m.deleted = 0 AND vt.deleted = 0 + + AND vt.team_name LIKE CONCAT('%', #{name}, '%') + ) UNION ALL ( @@ -431,7 +451,7 @@ ar.approval_time, ar.approval_by, ar.remark, - CASE WHEN ar.approval_status = '1' THEN '已报名' ELSE '待审核' END as current_status, + (SELECT dict_label FROM sys_dict_data WHERE dict_type = 'stgl_approval_status' AND dict_value = CAST(ar.approval_status AS CHAR) AND tenant_id = '000000') as current_status, '参与者' as role, a.organizer_name as organizer, a.start_time as time_info, @@ -443,11 +463,19 @@ FROM stgl_activity_registration ar INNER JOIN stgl_activity a ON ar.activity_id = a.id AND ar.tenant_id = '000000' AND a.tenant_id = '000000' WHERE ar.user_id = #{userId} AND ar.deleted = 0 AND a.deleted = 0 + + AND a.activity_name LIKE CONCAT('%', #{name}, '%') + ) ) all_registrations - - WHERE registration_type = #{registrationType} - + + + AND registration_type = #{registrationType} + + + AND target_name LIKE CONCAT('%', #{name}, '%') + + ORDER BY registration_time DESC diff --git a/web/src/api/stgl/my/types.ts b/web/src/api/stgl/my/types.ts index 50c92546..056375f0 100644 --- a/web/src/api/stgl/my/types.ts +++ b/web/src/api/stgl/my/types.ts @@ -211,8 +211,8 @@ export interface MyRegistrationQuery { pageNum?: number; /** 每页显示记录数 */ pageSize?: number; + /** 名称 */ + name?: string; /** 报名类型 */ registrationType?: string; - /** 审核状态 */ - approvalStatus?: string; } diff --git a/web/src/views/stgl/activity/components/ActivityDetailView.vue b/web/src/views/stgl/activity/components/ActivityDetailView.vue index 22a247c9..ad70a5eb 100644 --- a/web/src/views/stgl/activity/components/ActivityDetailView.vue +++ b/web/src/views/stgl/activity/components/ActivityDetailView.vue @@ -3,186 +3,69 @@ - - -
- -
{{ activity.activityName || '暂无' }}
-
- - -
- -
- -
-
- - + + 基本信息 + + {{ activity.activityName || '暂无' }} + + + + {{ activity.activityTheme || '暂无' }} + {{ activity.location || '暂无' }} + {{ activity.startTime || '暂无' }} + {{ activity.endTime || '暂无' }} + + + + {{ activity.relatedClubName || '暂无' }} + - - -
- -
{{ activity.activityTheme || '暂无' }}
-
- - -
- -
{{ activity.location || '暂无' }}
-
- - - - - -
- -
{{ activity.startTime || '暂无' }}
-
- - -
- -
{{ activity.endTime || '暂无' }}
-
- - - - - -
- -
- -
-
- - -
- -
{{ activity.relatedClubName || '暂无' }}
-
- - - -
- -
-
- -
-
- 暂无海报 -
-
+ + 活动海报 +
+ +
+
+ 暂无海报
-
- -
-
- {{ activity.description || '暂无简介' }} -
-
+ + 活动简介 +
+ {{ activity.description || '暂无简介' }}
- -
-

主办方信息

-
- - -
- -
{{ activity.organizerName || '暂无' }}
-
- - - - -
- -
{{ activity.organizerContact || '暂无' }}
-
- - -
- -
{{ activity.organizerPhone || '暂无' }}
-
- - + + 主办方信息 + + {{ activity.organizerName || '暂无' }} + {{ activity.organizerContact || '暂无' }} + {{ activity.organizerPhone || '暂无' }} + - -
-

承办方信息

-
+ + 承办方信息
-
- - -
- -
{{ organizer.name || '暂无' }}
-
- - -
- -
{{ organizer.type || '暂无' }}
-
- - -
- -
{{ organizer.contact || '暂无' }}
-
- - -
- -
{{ organizer.phone || '暂无' }}
-
- - +
+ + {{ organizer.name || '暂无' }} + {{ organizer.contact || '暂无' }} + {{ organizer.phone || '暂无' }} +
暂无承办方信息
- -
-

指导老师信息

-
+ + 指导老师信息
-
- - -
- -
{{ instructor.name || '暂无' }}
-
- - -
- -
{{ instructor.dept || '暂无' }}
-
- - -
- -
{{ instructor.phone || '暂无' }}
-
- - -
- -
{{ instructor.email || '暂无' }}
-
- - +
+ + {{ instructor.name || '暂无' }} + {{ instructor.dept || '暂无' }} + {{ instructor.phone || '暂无' }} + {{ instructor.email || '暂无' }} +
暂无指导老师信息
@@ -190,100 +73,46 @@ - - -
- -
- -
-
- - -
- -
- - 需要审核 - 无需审核 - {{ activity.needApproval }} -
-
- - + + 报名方式和审核设置 + + + + + + + 需要审核 + 无需审核 + {{ activity.needApproval }} + + + + + + + + - - -
- -
- -
-
- - + + 报名时间 + + {{ activity.registrationStart || '暂无' }} + {{ activity.registrationEnd || '暂无' }} + - - -
- -
{{ activity.registrationStart || '暂无' }}
-
- - -
- -
{{ activity.registrationEnd || '暂无' }}
-
- - + + 人数限制 + + {{ activity.maxParticipants }} + {{ activity.maxTeams }} + {{ activity.teamSizeMin }} + {{ activity.teamSizeMax }} + - - -
- -
{{ activity.maxParticipants }}
-
- - - - - -
- -
{{ activity.maxTeams }}
-
- - -
- -
{{ activity.teamSizeMin }}
-
- - -
- -
{{ activity.teamSizeMax }}
-
- - - - - -
- -
- -
-
- - -
- -
{{ activity.registrationCount || 0 }}
-
- - + +
+ 暂无人数限制设置 +
@@ -506,36 +335,149 @@ onMounted(() => { padding: 16px; } -/* 详情项样式 */ -.detail-item { +/* el-descriptions组件相关样式 */ +.basic-info-section, +.organizer-info-section, +.registration-info-section, +.registration-time-section, +.registration-limit-section { margin-bottom: 20px; } -.detail-label { - display: inline-block; - width: 120px; - color: #606266; - font-weight: 500; - font-size: 14px; - margin-bottom: 8px; - text-align: right; - padding-right: 12px; +/* 自定义宽度的报名信息表格 */ +.custom-width-registration :deep(.el-descriptions__table) { + table-layout: fixed !important; + width: 100% !important; +} + +.custom-width-registration :deep(.el-descriptions__cell) { vertical-align: top; } -.detail-value { - display: inline-block; - vertical-align: top; - width: calc(100% - 120px); - color: #303133; - font-size: 14px; - line-height: 1.5; +/* 强制设置标签和内容的宽度 */ +.custom-width-registration :deep(.el-descriptions__label) { + width: 20% !important; + min-width: 20% !important; } +.custom-width-registration :deep(.el-descriptions__content) { + width: 30% !important; + min-width: 30% !important; +} + +/* 自定义宽度的主办方信息表格 */ +.custom-width-organizer :deep(.el-descriptions__table) { + table-layout: fixed !important; + width: 100% !important; +} + +.custom-width-organizer :deep(.el-descriptions__cell) { + vertical-align: top; +} + +/* 强制设置主办方信息标签和内容的宽度 */ +.custom-width-organizer :deep(.el-descriptions__label) { + box-sizing: border-box !important; + word-wrap: break-word !important; +} + +.custom-width-organizer :deep(.el-descriptions__content) { + box-sizing: border-box !important; + word-wrap: break-word !important; +} + +/* 主办方信息区域 - 具体宽度控制 */ +.custom-width-organizer :deep(.el-descriptions__table tr td:nth-child(1)) { + width: 13% !important; +} +.custom-width-organizer :deep(.el-descriptions__table tr td:nth-child(2)) { + width: 35% !important; +} +.custom-width-organizer :deep(.el-descriptions__table tr td:nth-child(3)) { + width: 10% !important; +} +.custom-width-organizer :deep(.el-descriptions__table tr td:nth-child(4)) { + width: 15% !important; +} +.custom-width-organizer :deep(.el-descriptions__table tr td:nth-child(5)) { + width: 10% !important; +} +.custom-width-organizer :deep(.el-descriptions__table tr td:nth-child(6)) { + width: 17% !important; +} + +/* 承办方信息区域 - 具体宽度控制 */ +.custom-width-co-organizer :deep(.el-descriptions__table tr td:nth-child(1)) { + width: 12% !important; +} +.custom-width-co-organizer :deep(.el-descriptions__table tr td:nth-child(2)) { + width: 36% !important; +} +.custom-width-co-organizer :deep(.el-descriptions__table tr td:nth-child(3)) { + width: 10% !important; +} +.custom-width-co-organizer :deep(.el-descriptions__table tr td:nth-child(4)) { + width: 16% !important; +} +.custom-width-co-organizer :deep(.el-descriptions__table tr td:nth-child(5)) { + width: 10% !important; +} +.custom-width-co-organizer :deep(.el-descriptions__table tr td:nth-child(6)) { + width: 16% !important; +} + +/* 自定义宽度的指导老师信息表格 */ +.custom-width-instructor :deep(.el-descriptions__table) { + table-layout: fixed !important; + width: 100% !important; +} + +.custom-width-instructor :deep(.el-descriptions__cell) { + vertical-align: top; +} + +/* 强制设置指导老师信息标签和内容的宽度 */ +.custom-width-instructor :deep(.el-descriptions__label) { + box-sizing: border-box !important; + word-wrap: break-word !important; +} + +.custom-width-instructor :deep(.el-descriptions__content) { + box-sizing: border-box !important; + word-wrap: break-word !important; +} + +/* 指导老师信息区域 - 具体宽度控制 (8+15+8+17+8+15+8+17) */ +.custom-width-instructor :deep(.el-descriptions__table tr td:nth-child(1)) { + width: 8% !important; +} +.custom-width-instructor :deep(.el-descriptions__table tr td:nth-child(2)) { + width: 15% !important; +} +.custom-width-instructor :deep(.el-descriptions__table tr td:nth-child(3)) { + width: 8% !important; +} +.custom-width-instructor :deep(.el-descriptions__table tr td:nth-child(4)) { + width: 17% !important; +} +.custom-width-instructor :deep(.el-descriptions__table tr td:nth-child(5)) { + width: 8% !important; +} +.custom-width-instructor :deep(.el-descriptions__table tr td:nth-child(6)) { + width: 15% !important; +} +.custom-width-instructor :deep(.el-descriptions__table tr td:nth-child(7)) { + width: 8% !important; +} +.custom-width-instructor :deep(.el-descriptions__table tr td:nth-child(8)) { + width: 17% !important; +} + +/* 海报显示区域样式 */ .view-poster { display: flex; align-items: center; - justify-content: flex-start; + justify-content: center; padding: 20px 0; } @@ -548,6 +490,7 @@ onMounted(() => { border: 1px dashed #dcdfe6; border-radius: 4px; background-color: #fafafa; + margin: 20px auto; } .no-poster-text { @@ -556,6 +499,7 @@ onMounted(() => { text-align: center; } +/* 描述文本区域样式 */ .view-description { padding: 12px; border: 1px solid #e4e7ed; @@ -567,26 +511,12 @@ onMounted(() => { white-space: pre-wrap; word-break: break-word; background-color: #fafafa; + margin-bottom: 20px; } -/* 章节分隔样式 */ -.section-divider { - margin: 24px 0 16px 0; - padding-top: 16px; - border-top: 1px solid #e4e7ed; -} - -.section-title { - margin: 0 0 16px 0; - color: #303133; - font-size: 16px; - font-weight: 600; - border-bottom: 2px solid #409eff; - padding-bottom: 8px; -} - -/* 承办方项目样式 */ -.co-organizer-item { +/* 承办方和指导老师项目样式 */ +.co-organizer-item, +.instructor-item { margin-bottom: 16px; padding: 16px; background: #f8f9fa; @@ -594,24 +524,14 @@ onMounted(() => { border: 1px solid #e9ecef; } -.co-organizer-item:last-child { - margin-bottom: 0; -} - -/* 指导老师项目样式 */ -.instructor-item { - margin-bottom: 16px; - padding: 16px; - background: #fafafa; - border-radius: 6px; - border: 1px solid #ebeef5; -} - +.co-organizer-item:last-child, .instructor-item:last-child { margin-bottom: 0; } -.no-data { +/* 无数据提示样式 */ +.no-data, +.no-limit-data { color: #909399; font-size: 13px; font-style: italic; @@ -620,10 +540,9 @@ onMounted(() => { background: #f8f9fa; border-radius: 4px; border: 1px solid #e9ecef; + margin-bottom: 20px; } - - /* 附件显示区域样式 */ .attachment-list { display: flex; @@ -647,4 +566,78 @@ onMounted(() => { .attachment-icon { font-size: 14px; } + +/* el-divider样式优化 */ +:deep(.el-divider--horizontal) { + margin: 24px 0 16px 0; +} + +:deep(.el-divider__text) { + background-color: #fff; + color: #303133; + font-size: 16px; + font-weight: 600; + padding: 0 20px; +} + +/* el-descriptions样式优化 */ +:deep(.el-descriptions) { + .el-descriptions__header { + margin-bottom: 20px; + } + + .el-descriptions__title { + font-size: 16px; + font-weight: 600; + color: #303133; + } + + .el-descriptions__body { + .el-descriptions__table { + .el-descriptions__cell { + padding: 12px 16px; + } + + .el-descriptions__label { + font-weight: 500; + color: #606266; + background-color: #fafafa; + } + + .el-descriptions__content { + color: #303133; + } + } + } +} + +/* 标签样式优化 */ +:deep(.el-tag) { + border-radius: 4px; + font-size: 12px; + height: 24px; + line-height: 22px; +} + +/* 响应式布局优化 */ +@media (max-width: 768px) { + .activity-detail-view { + padding: 12px; + } + + :deep(.el-descriptions) { + .el-descriptions__body { + .el-descriptions__table { + .el-descriptions__cell { + padding: 8px 12px; + } + } + } + } + + .co-organizer-item, + .instructor-item { + padding: 12px; + } +} diff --git a/web/src/views/stgl/club/info/components/JoinedMembersTab.vue b/web/src/views/stgl/club/info/components/JoinedMembersTab.vue index 5931e03c..1cd6b896 100644 --- a/web/src/views/stgl/club/info/components/JoinedMembersTab.vue +++ b/web/src/views/stgl/club/info/components/JoinedMembersTab.vue @@ -479,10 +479,11 @@ const getList = async () => { console.log('JoinedMembersTab: getList 开始查询，参数:', queryData); - // 如果状态字段为空或未选择，则查询已加入（status=2）和已退出（status=3）的成员 + // 已加入页面：查询已加入（status=2）和已退出（status=4）的成员 + // 字典配置：0-待审核，1-审核中，2-已加入，3-已驳回，4-已退出 if (!queryData.status) { // 使用params传递多状态查询 - queryData.params = { ...queryData.params, statusList: ['2', '3'] } as any; + queryData.params = { ...queryData.params, statusList: ['2', '4'] } as any; delete queryData.status; // 删除单个status字段 } diff --git a/web/src/views/stgl/club/info/components/PendingMembersTab.vue b/web/src/views/stgl/club/info/components/PendingMembersTab.vue index 55503a6b..348cd06f 100644 --- a/web/src/views/stgl/club/info/components/PendingMembersTab.vue +++ b/web/src/views/stgl/club/info/components/PendingMembersTab.vue @@ -283,10 +283,11 @@ const getList = async () => { console.log('PendingMembersTab: getList 开始查询，参数:', queryData); - // 如果状态字段为空或未选择，则查询待审核（status=0）和已驳回（status=4）的成员 + // 待审核页面：查询待审核（status=0）和已驳回（status=3）的成员 + // 字典配置：0-待审核，1-审核中，2-已加入，3-已驳回，4-已退出 if (!queryData.status) { // 使用params传递多状态查询 - queryData.params = { ...queryData.params, statusList: ['0', '4'] } as any; + queryData.params = { ...queryData.params, statusList: ['0', '3'] } as any; delete queryData.status; // 删除单个status字段 } diff --git a/web/src/views/stgl/my/club/index.vue b/web/src/views/stgl/my/club/index.vue index 640960ca..2b07e062 100644 --- a/web/src/views/stgl/my/club/index.vue +++ b/web/src/views/stgl/my/club/index.vue @@ -63,7 +63,7 @@ @@ -124,7 +124,7 @@ - + {{ detailForm.myRole || '暂无' }} {{ parseTime(detailForm.joinTime, '{y}-{m}-{d} {h}:{i}') }} @@ -166,8 +166,8 @@ import type { MyClubVO, MyClubQuery } from '@/api/stgl/my/types'; import { UserFilled } from '@element-plus/icons-vue'; const { proxy } = getCurrentInstance() as ComponentInternalInstance; -const { stgl_club_type, sys_normal_disable, stgl_member_role, stgl_member_status } = toRefs( - proxy?.useDict('stgl_club_type', 'sys_normal_disable', 'stgl_member_role', 'stgl_member_status') +const { stgl_club_type, sys_normal_disable, stgl_member_status } = toRefs( + proxy?.useDict('stgl_club_type', 'sys_normal_disable', 'stgl_member_status') ); const queryRef = ref(); diff --git a/web/src/views/stgl/my/record/index.vue b/web/src/views/stgl/my/record/index.vue index e151464e..5f92e816 100644 --- a/web/src/views/stgl/my/record/index.vue +++ b/web/src/views/stgl/my/record/index.vue @@ -16,15 +16,17 @@ - - - - - - - + + + @@ -69,13 +71,7 @@ {{ parseTime(scope.row.registrationTime, '{y}-{m}-{d} {h}:{i}') }} - - - + - + + @@ -520,6 +522,8 @@ function resetQuery() { function handleTabChange(tabName: string) { activeTab.value = tabName; queryParams.value.pageNum = 1; + // 注释掉"我的申请"页签相关逻辑 + /* if (tabName === 'my') { // 切换到"我的申请"页签时，直接打开申请列表对话框 handleMyApplications(); @@ -531,6 +535,9 @@ function handleTabChange(tabName: string) { // 切换到"志愿者大厅"页签时，刷新队伍列表 getList(); } + */ + // 简化逻辑，只刷新队伍列表 + getList(); } /** 查看详情 */