协会、活动测试整改

暂提交
feat: 提取通用 Word/PDF 模板渲染方法，支持 DOC、DOCX 和循环表格
2026-10-30 19:02:48 +08:00 · 2026-10-30 10:56:22 +08:00 · 2026-10-30 10:16:46 +08:00
29 changed files with 760 additions and 235 deletions
@@ -1,10 +1,16 @@
 package com.budwk.app.base.utils;

 import cn.hutool.core.io.FileUtil;
+import com.aspose.cells.FontConfigs;
 import com.aspose.cells.PdfSaveOptions;
 import com.aspose.cells.Workbook;
+import com.aspose.slides.FontsLoader;
+import com.aspose.slides.LoadOptions;
 import com.aspose.slides.Presentation;
 import com.aspose.words.Document;
+import com.aspose.words.FontSettings;
+import com.aspose.words.FontSourceBase;
+import com.aspose.words.MemoryFontSource;
 import com.aspose.words.SaveFormat;
 import com.budwk.app.base.exception.BaseException;
 import lombok.extern.slf4j.Slf4j;
@@ -12,6 +18,8 @@ import lombok.extern.slf4j.Slf4j;
 import java.io.File;
 import java.io.FileOutputStream;
 import java.io.IOException;
+import java.io.InputStream;
+import java.util.Arrays;

 /**
 * 文档转换
@@ -19,6 +27,81 @@ import java.io.IOException;
@Slf4j
 public class OfficePlusUtil {

+    private static final String DEFAULT_FONT_NAME = "Noto Sans SC";
+    private static final String DEFAULT_FONT_RESOURCE = "/fonts/NotoSansSC-VF.ttf";
+    private static final Object FONT_CONFIG_LOCK = new Object();
+    private static volatile boolean fontConfigured;
+
+    /**
+     * 注册系统内置字体，并将其作为 Office 文档缺失字体或缺失字形时的默认回退字体。
+     * 原文档字体在服务器可用时仍优先使用，只有找不到原字体时才使用内置字体。
+     */
+    private static void configureDefaultFont() {
+        if (fontConfigured) {
+            return;
+        }
+        synchronized (FONT_CONFIG_LOCK) {
+            if (fontConfigured) {
+                return;
+            }
+            byte[] fontData = loadDefaultFontData();
+            configureWordFont(fontData);
+            configureExcelFont(fontData);
+            FontsLoader.loadExternalFont(fontData);
+            fontConfigured = true;
+        }
+    }
+
+    /**
+     * 从 classpath 读取随应用打包的字体，避免依赖线上服务器安装字体。
+     *
+     * @return 默认字体的二进制数据
+     */
+    private static byte[] loadDefaultFontData() {
+        try (InputStream inputStream = OfficePlusUtil.class.getResourceAsStream(DEFAULT_FONT_RESOURCE)) {
+            if (inputStream == null) {
+                throw new BaseException("系统内置默认字体不存在");
+            }
+            return inputStream.readAllBytes();
+        } catch (IOException e) {
+            log.error("读取系统内置默认字体失败", e);
+            throw new BaseException("读取系统内置默认字体失败");
+        }
+    }
+
+    /**
+     * 为 Word 转换保留已有字体源并追加内置字体，同时配置缺失字体和缺失字形回退。
+     *
+     * @param fontData 默认字体的二进制数据
+     */
+    private static void configureWordFont(byte[] fontData) {
+        FontSettings fontSettings = FontSettings.getDefaultInstance();
+        FontSourceBase[] currentSources = fontSettings.getFontsSources();
+        FontSourceBase[] fontSources = Arrays.copyOf(currentSources, currentSources.length + 1);
+        fontSources[currentSources.length] = new MemoryFontSource(fontData);
+        fontSettings.setFontsSources(fontSources);
+        fontSettings.getSubstitutionSettings().getDefaultFontSubstitution().setDefaultFontName(DEFAULT_FONT_NAME);
+        try {
+            fontSettings.getFallbackSettings().loadNotoFallbackSettings();
+        } catch (Exception e) {
+            log.error("配置 Word 默认字体回退规则失败", e);
+            throw new BaseException("配置 Word 默认字体失败");
+        }
+    }
+
+    /**
+     * 为 Excel 转换追加内置字体，并将其设置为找不到原字体时的默认字体。
+     *
+     * @param fontData 默认字体的二进制数据
+     */
+    private static void configureExcelFont(byte[] fontData) {
+        com.aspose.cells.FontSourceBase[] currentSources = FontConfigs.getFontSources();
+        com.aspose.cells.FontSourceBase[] fontSources = Arrays.copyOf(currentSources, currentSources.length + 1);
+        fontSources[currentSources.length] = new com.aspose.cells.MemoryFontSource(fontData);
+        FontConfigs.setFontSources(fontSources);
+        FontConfigs.setDefaultFontName(DEFAULT_FONT_NAME);
+    }
+
    /**
     * 转换
     *
@@ -47,7 +130,11 @@ public class OfficePlusUtil {
    public static void presentationConvertPdf(String sourcePath, String targetPath) {
        Presentation presentation = null;
        try {
-            presentation = new Presentation(sourcePath);
+            configureDefaultFont();
+            LoadOptions loadOptions = new LoadOptions();
+            loadOptions.setDefaultRegularFont(DEFAULT_FONT_NAME);
+            loadOptions.setDefaultAsianFont(DEFAULT_FONT_NAME);
+            presentation = new Presentation(sourcePath, loadOptions);
            presentation.save(targetPath, com.aspose.slides.SaveFormat.Pdf);
        } catch (Exception e) {
            log.info("转换pdf报错", e);
@@ -68,10 +155,12 @@ public class OfficePlusUtil {
    public static void excelConvertPdf(String sourcePath, String targetPath) {
        FileOutputStream fileOS = null;
        try {
+            configureDefaultFont();
            Workbook wb = new Workbook(sourcePath);
            fileOS = new FileOutputStream(targetPath);
            PdfSaveOptions pdfSaveOptions = new PdfSaveOptions();
            pdfSaveOptions.setOnePagePerSheet(true);
+            pdfSaveOptions.setDefaultFont(DEFAULT_FONT_NAME);
 //            for (int i = 0; i < 3; i++) {
 //                wb.getWorksheets().get(i).getHorizontalPageBreaks().clear();
 //                wb.getWorksheets().get(i).getVerticalPageBreaks().clear();
@@ -105,6 +194,7 @@ public class OfficePlusUtil {
    public static void wordConvertPdf(String sourcePath, String targetPath) {
        FileOutputStream os = null;
        try {
+            configureDefaultFont();
            File file = new File(targetPath);
            os = new FileOutputStream(file);
            Document doc = new Document(sourcePath);
@@ -6,6 +6,8 @@ import com.budwk.app.base.exception.BaseException;
 import com.budwk.app.sys.models.Sys_file;
 import com.budwk.app.sys.models.Sys_office_template;
 import com.budwk.app.sys.utils.SysFileMinIoUtil;
+import com.deepoove.poi.XWPFTemplate;
+import com.deepoove.poi.config.Configure;
 import com.deepoove.poi.data.ByteArrayPictureRenderData;
 import com.deepoove.poi.data.PictureRenderData;
 import com.deepoove.poi.data.PictureType;
@@ -18,6 +20,12 @@ import org.nutz.ioc.loader.annotation.IocBean;

 import java.io.ByteArrayInputStream;
 import java.io.InputStream;
+import java.io.ByteArrayOutputStream;
+import java.io.File;
+import java.util.List;
+import java.util.ArrayList;
+import java.util.LinkedHashSet;
+import java.util.Set;
 import java.util.regex.Matcher;
 import java.util.regex.Pattern;

@@ -66,6 +74,88 @@ public class SysOfficeTemplateUtil {
        return new ByteArrayInputStream(fileBytes);
    }

+    /**
+     * 统一渲染 DOC/DOCX 模板，保留调用方的循环表格等策略；模板输入流由调用方关闭。
+     */
+    public byte[] renderTemplate(InputStream input, Object data, Configure config, boolean pdf, String context) throws Exception {
+        if (input == null) throw new BaseException("模板文件不存在");
+        byte[] templateBytes = input.readAllBytes();
+        try (ByteArrayInputStream formatInput = new ByteArrayInputStream(templateBytes)) {
+            if (com.aspose.words.FileFormatUtil.detectFileFormat(formatInput).getLoadFormat() != com.aspose.words.LoadFormat.DOCX) {
+                try (ByteArrayInputStream source = new ByteArrayInputStream(templateBytes);
+                     ByteArrayOutputStream converted = new ByteArrayOutputStream()) {
+                    new com.aspose.words.Document(source).save(converted, com.aspose.words.SaveFormat.DOCX);
+                    templateBytes = converted.toByteArray();
+                }
+            }
+        }
+        byte[] wordBytes;
+        try (ByteArrayInputStream templateInput = new ByteArrayInputStream(templateBytes);
+             ByteArrayOutputStream output = new ByteArrayOutputStream();
+             XWPFTemplate template = XWPFTemplate.compile(templateInput, config == null ? Configure.builder().build() : config)) {
+            template.render(data).write(output);
+            wordBytes = output.toByteArray();
+        } catch (Exception e) {
+            log.error("[Office模板渲染] Word模板渲染失败，context={}", context, e);
+            throw e;
+        }
+        log.info("[Office模板渲染] Word渲染完成，context={}, templateBytes={}, outputBytes={}", context, templateBytes.length, wordBytes.length);
+        if (!pdf) return wordBytes;
+        try (ByteArrayInputStream wordInput = new ByteArrayInputStream(wordBytes);
+             ByteArrayOutputStream output = new ByteArrayOutputStream()) {
+            com.aspose.words.Document document = new com.aspose.words.Document(wordInput);
+            configureDocumentFonts(document, context);
+            com.aspose.words.PdfSaveOptions options = new com.aspose.words.PdfSaveOptions();
+            options.setFontEmbeddingMode(com.aspose.words.PdfFontEmbeddingMode.EMBED_ALL);
+            document.save(output, options);
+            log.info("[Office模板渲染] PDF转换完成，context={}, outputBytes={}", context, output.size());
+            return output.toByteArray();
+        } catch (Exception e) {
+            log.error("[Office模板渲染] PDF转换失败，context={}", context, e);
+            throw e;
+        }
+    }
+
+    private void configureDocumentFonts(com.aspose.words.Document document, String context) throws Exception {
+        com.aspose.words.FontSettings settings = new com.aspose.words.FontSettings();
+        List<com.aspose.words.FontSourceBase> sources = new ArrayList<>(List.of(settings.getFontsSources()));
+        Set<String> folders = new LinkedHashSet<>();
+        String windowsDir = System.getenv("WINDIR");
+        if (StrUtil.isNotBlank(windowsDir)) folders.add(new File(windowsDir, "Fonts").getPath());
+        String localAppData = System.getenv("LOCALAPPDATA");
+        if (StrUtil.isNotBlank(localAppData)) folders.add(new File(localAppData, "Microsoft/Windows/Fonts").getPath());
+        folders.add(new File(System.getProperty("user.dir"), "fonts").getPath());
+        for (String folder : folders) {
+            File directory = new File(folder);
+            log.info("[Office模板渲染] 字体目录，context={}, path={}, readable={}", context, folder, directory.isDirectory() && directory.canRead());
+            if (directory.isDirectory() && directory.canRead()) sources.add(new com.aspose.words.FolderFontSource(folder, true));
+        }
+        settings.setFontsSources(sources.toArray(new com.aspose.words.FontSourceBase[0]));
+        Set<String> availableFonts = new LinkedHashSet<>();
+        for (com.aspose.words.FontSourceBase source : sources) {
+            for (com.aspose.words.PhysicalFontInfo font : source.getAvailableFonts()) availableFonts.add(font.getFontFamilyName());
+        }
+        String chineseFont = null;
+        for (String candidate : List.of("SimSun", "宋体", "Microsoft YaHei", "微软雅黑", "DengXian", "等线", "SimHei", "黑体", "FangSong", "仿宋", "Noto Serif CJK SC", "Noto Sans CJK SC")) {
+            if (availableFonts.contains(candidate)) {
+                chineseFont = candidate;
+                break;
+            }
+        }
+        log.info("[Office模板渲染] 中文字体选择，context={}, fontCount={}, chineseFont={}", context, availableFonts.size(), chineseFont);
+        if (chineseFont != null) {
+            settings.getSubstitutionSettings().getDefaultFontSubstitution().setDefaultFontName(chineseFont);
+            for (String name : List.of("宋体", "SimSun", "新宋体", "NSimSun", "黑体", "SimHei", "仿宋", "FangSong", "楷体", "KaiTi", "微软雅黑", "Microsoft YaHei")) {
+                if (!availableFonts.contains(name)) settings.getSubstitutionSettings().getTableSubstitution().setSubstitutes(name, chineseFont);
+            }
+        } else {
+            log.warn("[Office模板渲染] 未发现常用中文字体，context={}, availableFonts={}", context, availableFonts);
+        }
+        settings.getFallbackSettings().loadMsOfficeFallbackSettings();
+        document.setFontSettings(settings);
+        document.setWarningCallback(warning -> log.warn("[Office模板渲染] 字体或排版警告，context={}, type={}, detail={}", context, warning.getWarningType(), warning.getDescription()));
+    }
+
    /**
     * 签字url转换为poi的图片对象
     *
@@ -4,12 +4,14 @@ package com.budwk.app.zhgh.activity.sports.service.impl;
 import cn.afterturn.easypoi.excel.ExcelExportUtil;
 import cn.afterturn.easypoi.excel.entity.ExportParams;
 import cn.afterturn.easypoi.excel.entity.enmus.ExcelType;
+import com.budwk.app.base.exception.BaseException;
 import com.budwk.app.base.service.impl.BaseServiceImpl;
 import com.budwk.app.base.utils.CommonDownloadUtil;
 import com.budwk.app.base.utils.DateUtil;
 import com.budwk.app.sys.models.Sys_home_activity;
 import com.budwk.app.sys.models.Sys_home_template;
 import com.budwk.app.web.commons.auth.utils.SecurityUtil;
+import com.budwk.app.zhgh.activity.basic.models.ActivityEvent;
 import com.budwk.app.zhgh.activity.basic.models.ActivityBasicUnit;
 import com.budwk.app.zhgh.activity.basic.models.ActivityBasicUnion;
 import com.budwk.app.zhgh.activity.culture.models.ActivityTissue;
@@ -28,6 +30,7 @@ import org.nutz.dao.entity.Record;
 import org.nutz.dao.sql.Sql;
 import org.nutz.ioc.aop.Aop;
 import org.nutz.ioc.loader.annotation.IocBean;
+import org.nutz.json.Json;
 import org.nutz.lang.Lang;
 import org.nutz.lang.Strings;

@@ -55,6 +58,7 @@ public class ActivitySportsServiceImpl extends BaseServiceImpl<ActivitySchool> i
    @Override
    @Aop(TransAop.READ_COMMITTED)
    public String doAdd(ActivitySchool activitySchool, ActivitySchoolEvent[] events) {
+        events = validateAndApplySingleEventLimits(events);
        ActivityBasicUnit activityBasicUnit = dao().fetch(ActivityBasicUnit.class, Cnd.where("id", "=", SecurityUtil.getUserId()));

        if (activitySchool.getActivityLevel() == 40002) {
@@ -101,6 +105,7 @@ public class ActivitySportsServiceImpl extends BaseServiceImpl<ActivitySchool> i
    @Override
    @Aop(TransAop.READ_COMMITTED)
    public void doEdit(ActivitySchool activitySchool, ActivitySchoolEvent[] events) {
+        events = validateAndApplySingleEventLimits(events);
        ActivitySchool school = dao().fetch(ActivitySchool.class, activitySchool.getId());
        if (school.getActivityLevel() == 40002) {
            school.setBelongUnionId(SecurityUtil.getUnionId());
@@ -161,6 +166,56 @@ public class ActivitySportsServiceImpl extends BaseServiceImpl<ActivitySchool> i
        dao().insertOrUpdate(sysHomeActivity);
    }

+    /**
+     * 校验单项人数限制，并在具体单项未设置限制时应用“所有单项”的默认值。
+     *
+     * @param events 页面提交的项目配置，允许包含 eventId 为 allItems 的默认配置
+     * @return 已移除 allItems 临时配置、可直接持久化的项目配置数组
+     */
+    private ActivitySchoolEvent[] validateAndApplySingleEventLimits(ActivitySchoolEvent[] events) {
+        if (events == null || events.length == 0) {
+            return new ActivitySchoolEvent[0];
+        }
+
+        ActivitySchoolEvent allItems = Arrays.stream(events)
+                .filter(event -> event != null && "allItems".equals(event.getEventId()))
+                .findFirst()
+                .orElse(null);
+        List<ActivitySchoolEvent> result = new ArrayList<>();
+        for (ActivitySchoolEvent event : events) {
+            if (event == null || "allItems".equals(event.getEventId())) {
+                continue;
+            }
+            ActivityEvent activityEvent = dao().fetch(ActivityEvent.class, event.getEventId());
+            if (activityEvent != null && "1".equals(activityEvent.getProjectType())) {
+                applySingleEventDefaultLimit(event, allItems);
+            }
+            result.add(event);
+        }
+        return result.toArray(new ActivitySchoolEvent[0]);
+    }
+
+    /**
+     * 单项的两个限制必须同时设置；均未设置或均为0时继承“所有单项”的对应值。
+     */
+    private void applySingleEventDefaultLimit(ActivitySchoolEvent event, ActivitySchoolEvent allItems) {
+        Integer athletesMaxNum = event.getAthletesMaxNum();
+        Integer restrictRegNumber = event.getRestrictRegNumber();
+        if ((athletesMaxNum == null) != (restrictRegNumber == null)) {
+            throw new BaseException("每队（项）运动员最多人数和每人限报项目必须同时设置");
+        }
+
+        boolean useDefault = athletesMaxNum == null || (athletesMaxNum == 0 && restrictRegNumber == 0);
+        if (!useDefault) {
+            return;
+        }
+        if (allItems == null || allItems.getAthletesMaxNum() == null || allItems.getRestrictRegNumber() == null) {
+            throw new BaseException("请先设置所有单项的运动员最多人数和每人限报项目");
+        }
+        event.setAthletesMaxNum(allItems.getAthletesMaxNum());
+        event.setRestrictRegNumber(allItems.getRestrictRegNumber());
+    }
+
    @Aop(TransAop.READ_COMMITTED)
    private void addTeam(String schoolId, ActivitySchoolEvent[] events) {
        if (events.length > 0) {
@@ -271,33 +326,19 @@ public class ActivitySportsServiceImpl extends BaseServiceImpl<ActivitySchool> i
                    WHERE
                    	app.activityId = @id
                    	and app.status = 2
-                    	$cnd
+                        and (@filterUnion = 0 or app.activityUnionId = @unionId)
                    ORDER BY
                        ev.allName DESC,
                    	u.unionname DESC,
                     	app.`team` asc
-                    """).setParam("id", id)
-                    .setVar("cnd", "");
-            if (Strings.isNotBlank(unionId)) {
-                sql.setVar("cnd", "and u.unionid = @unionId");
-                sql.setParam("unionId", unionId);
-            }
+                    """).setParam("id", id);
+            // 参数必须声明在原始SQL中；setVar追加的字符串不会再次解析其中的@参数。
+            // 未选择分工会时导出整个活动，选择时按报名记录中的活动分工会过滤。
+            sql.setParam("filterUnion", Strings.isNotBlank(unionId) ? 1 : 0);
+            sql.setParam("unionId", Strings.isNotBlank(unionId) ? unionId : "");
            List<Record> list = list(sql);
-            String activityName;
-            if (Lang.isNotEmpty(list)) {
-                activityName = list.get(0).getString("activityName");
-            } else {
-                activityName = "暂无人员";
-            }
-
            List<ActivitySchoolApply> excels = new ArrayList<>();
-
-            list.forEach(z -> {
-                ActivitySchoolApply schoolApply = z.toPojo(ActivitySchoolApply.class);
-                String s = schoolApply.getIdentity().stream().map(personType::getName).toList().toString();
-                schoolApply.setSf(s);
-                excels.add(schoolApply);
-            });
+            list.forEach(record -> excels.add(toActivitySchoolApplyExport(record)));

            ExportParams exportParams = new ExportParams();
            exportParams.setType(ExcelType.XSSF);
@@ -305,10 +346,42 @@ public class ActivitySportsServiceImpl extends BaseServiceImpl<ActivitySchool> i
            CommonDownloadUtil.download(getUnionApplyExportFileName(unionId), workbook, response);
        } catch (Exception e) {
            e.printStackTrace();
+            throw new BaseException("导出报名信息失败：" + e.getMessage());
        }

    }

+    /**
+     * 将原生SQL查询结果转换为报名信息导出对象。
+     * identity 是数据库JSON文本，需要显式转换为身份编码集合，避免 Record.toPojo 自动转换失败导致整表无数据。
+     *
+     * @param record 导出SQL返回的一行报名数据
+     * @return EasyPoi 使用的 ActivitySchoolApply 导出对象
+     */
+    private ActivitySchoolApply toActivitySchoolApplyExport(Record record) {
+        ActivitySchoolApply schoolApply = new ActivitySchoolApply();
+        schoolApply.setUnionname(record.getString("unionname"));
+        schoolApply.setTeam(record.getString("team"));
+        schoolApply.setAllName(record.getString("allName"));
+        schoolApply.setLoginname(record.getString("loginname"));
+        schoolApply.setUsername(record.getString("username"));
+        schoolApply.setMobile(record.getString("mobile"));
+        schoolApply.setIdCard(record.getString("idCard"));
+        schoolApply.setProfessionalLevel(record.getString("professionalLevel"));
+        schoolApply.setSex(record.getString("sex"));
+
+        String identityJson = record.getString("identity");
+        List<String> identities = Strings.isBlank(identityJson)
+                ? new ArrayList<>()
+                : Json.fromJsonAsList(String.class, identityJson);
+        String identityName = identities.stream()
+                .map(personType::getName)
+                .filter(Strings::isNotBlank)
+                .collect(Collectors.joining("、"));
+        schoolApply.setSf(identityName);
+        return schoolApply;
+    }
+
    private String getUnionApplyExportFileName(String unionId) {
        String unionName = "分工会";
        if (Strings.isNotBlank(unionId)) {
@@ -17,7 +17,6 @@ import com.budwk.app.flow.enums.ProcessInstanceStateEnum;
 import com.budwk.app.flow.enums.ProcessSubmitTypeEnum;
 import com.budwk.app.flow.service.FlowCommonService;
 import com.budwk.app.web.commons.auth.utils.SecurityUtil;
-import com.budwk.app.zhgh.club.model.ClubUser;
 import com.budwk.app.zhgh.club.model.SysClub;
 import com.budwk.app.zhgh.club.model.SysClubExamineRegister;
 import com.budwk.app.zhgh.club.service.SysClubExamineService;
@@ -119,10 +118,7 @@ public class ClubExamineApplyController {
 		if(StrUtil.isBlank(clubId)) {
 			return Result.error("社团信息为空，请核查");
 		}
-		int count = dao.count(ClubUser.class, Cnd.where("clubId", "=", clubId));
-		SysClub club = dao.fetch(SysClub.class, clubId);
-		int money = count * (club.getDue() != null ? Integer.parseInt(club.getDue()) : 0);
-		return Result.success(money);
+		return Result.success(sysClubExamineService.getClubMemberMoney(clubId));
 	}

 	@At
@@ -175,6 +171,10 @@ public class ClubExamineApplyController {
 	public Result save(@Param("data") SysClubExamineRegister examineRegister,
 					   @Param("incomeDetailed") String incomeDetailed,
 					   @Param("incomeCensus") String incomeCensus) {
+		String validateMessage = sysClubExamineService.validateActivityRequired(examineRegister);
+		if (validateMessage != null) {
+			return Result.error(validateMessage);
+		}
 		if (StrUtil.isBlank(examineRegister.getId())) {
 			sysClubExamineService.doAdd(examineRegister, incomeDetailed, incomeCensus);
 		} else {
@@ -190,6 +190,10 @@ public class ClubExamineApplyController {
 	public Result submit(@Param("data") SysClubExamineRegister examineRegister,
 						 @Param("incomeDetailed") String incomeDetailed,
 						 @Param("incomeCensus") String incomeCensus) {
+		String validateMessage = sysClubExamineService.validateActivityRequired(examineRegister);
+		if (validateMessage != null) {
+			return Result.error(validateMessage);
+		}
 		SysClubExamineRegister reg;
 		if (StrUtil.isBlank(examineRegister.getId())) {
 			reg = sysClubExamineService.doAdd(examineRegister, incomeDetailed, incomeCensus);
@@ -221,6 +225,10 @@ public class ClubExamineApplyController {
 							  @Param("incomeDetailed") String incomeDetailed,
 							  @Param("incomeCensus") String incomeCensus,
 							  @Param("taskId") Long taskId) {
+		String validateMessage = sysClubExamineService.validateActivityRequired(examineRegister);
+		if (validateMessage != null) {
+			return Result.error(validateMessage);
+		}
 		if (StrUtil.isBlank(examineRegister.getId())) {
 			sysClubExamineService.doAdd(examineRegister, incomeDetailed, incomeCensus);
 		} else {
@@ -86,7 +86,7 @@ public class ClubExamineMineController {
        //nutMap.setv("schoolName", Globals.MyConfig.getString("AppName"));
        nutMap.setv("clubName", register.getClubName());
        nutMap.setv("create_time", register.getFoundTime());
-        nutMap.setv("dues_standard", register.getDue());
+        nutMap.setv("dues_standard", register.getDue() == null ? "--" : register.getDue() + "元/年");
        // 生成材料中的年度与列表展示的登记年度保持一致。
        nutMap.setv("year", register.getYear());
        nutMap.setv("registerDate", register.getRegisterDate());
@@ -91,8 +91,8 @@ public class SysClub extends BaseModel {

    @Column
    @Comment("会费标准")
-    @ColDefine(type = ColType.VARCHAR, width = 50)
-    private String due;
+    @ColDefine(type = ColType.DOUBLE, width = 10, precision = 2)
+    private Double due;

    @Column
    @Comment("附件")
@@ -57,8 +57,8 @@ public class SysClubExamineRegister extends BaseModel {

    @Column
    @Comment("会费标准")
-    @ColDefine(type = ColType.VARCHAR, width = 32)
-    private String due;
+    @ColDefine(type = ColType.DOUBLE, width = 10, precision = 2)
+    private Double due;

    @Column
    @Comment("年度活动情况")
@@ -24,6 +24,21 @@ public interface SysClubExamineService extends BaseService<SysClubExamineRegiste

    List<NutMap> getJgUser(@Valid String clubId);

+    /**
+     * 计算指定社团的年度会费收入。
+     *
+     * @param clubId 社团ID，用于查询当前会员数量和社团会费标准
+     * @return 会员数量乘以会费标准后的金额；社团或会费标准为空时返回0
+     */
+    Double getClubMemberMoney(@Valid String clubId);
+
+    /**
+     * 校验考核登记的两组活动明细。
+     * @param examineRegister 页面data参数对应的登记实体，yearActivityList为本年度活动，plans为下一年度计划
+     * @return String类型；通过返回null，否则返回缺失的明细行号及字段提示
+     */
+    String validateActivityRequired(SysClubExamineRegister examineRegister);
+
    SysClubExamineRegister doAdd(SysClubExamineRegister examineRegister, String incomeDetailed, String incomeCensus);

    SysClubExamineRegister doEdit(SysClubExamineRegister examineRegister, String incomeDetailed, String incomeCensus);
@@ -13,6 +13,7 @@ import com.budwk.app.flow.enums.ProcessInstanceStateEnum;
 import com.budwk.app.flow.enums.ProcessTaskStateEnum;
 import com.budwk.app.web.commons.auth.utils.AuthUtil;
 import com.budwk.app.web.commons.auth.utils.SecurityUtil;
+import com.budwk.app.zhgh.club.model.ClubUser;
 import com.budwk.app.zhgh.club.model.SysClub;
 import com.budwk.app.zhgh.club.model.SysClubExamineRegister;
 import com.budwk.app.zhgh.club.model.SysClubExamineRegisterDetailed;
@@ -50,6 +51,15 @@ public class SysClubExamineServiceImpl extends BaseServiceImpl<SysClubExamineReg
 		super(dao);
 	}

+	@Override
+	public Double getClubMemberMoney(String clubId) {
+		int memberCount = dao().count(ClubUser.class, Cnd.where(ClubUser::getClubId, "=", clubId));
+		SysClub club = dao().fetch(SysClub.class, clubId);
+		// 社团或会费标准为空时按0计算，保证考核登记初始化能够正常完成。
+		Double due = club == null || club.getDue() == null ? 0D : club.getDue();
+		return memberCount * due;
+	}
+
 	@Override
 	public List<NutMap> getClubUserNum(String clubId, Integer year) {
 		Date yearStart = DateUtil.parse(year + "-01-01 00:00:00");
@@ -345,6 +355,40 @@ public class SysClubExamineServiceImpl extends BaseServiceImpl<SysClubExamineReg
 		return listMap;
 	}

+	/**
+	 * 两组明细均至少填写一条；本年度主办单位和获奖情况保持选填。
+	 * @param examineRegister data参数绑定的登记实体，包含yearActivityList和plans两组JSON明细
+	 * @return 校验通过返回null，否则返回首个缺失字段的行号和名称
+	 */
+	@Override
+	public String validateActivityRequired(SysClubExamineRegister examineRegister) {
+		if (examineRegister == null) {
+			return "考核登记信息不能为空";
+		}
+		String message = validateActivityRows(examineRegister.getYearActivityList(), "本年度活动开展情况",
+				new String[]{"activityTime", "activityName", "activityAddress", "joinNum"},
+				new String[]{"活动时间", "活动主题/赛事名称", "活动地点", "参加人数"});
+		return message != null ? message : validateActivityRows(examineRegister.getPlans(), "下一年度活动计划",
+				new String[]{"activityName", "activityUnit", "activityAddress"},
+				new String[]{"活动主题/赛事名称", "活动/赛事主办单位", "活动地点"});
+	}
+
+	/** 检查空列表、空行及纯空白字段；数值0按已填写处理，不扩大为人数范围校验。 */
+	private String validateActivityRows(List<JSONObject> rows, String label, String[] fields, String[] names) {
+		if (rows == null || rows.isEmpty()) {
+			return label + "至少填写一条";
+		}
+		for (int i = 0; i < rows.size(); i++) {
+			JSONObject row = rows.get(i);
+			for (int j = 0; j < fields.length; j++) {
+				if (row == null || StrUtil.isBlank(row.getStr(fields[j]))) {
+					return label + "第" + (i + 1) + "条：" + names[j] + "不能为空";
+				}
+			}
+		}
+		return null;
+	}
+
 	@Override
 	public SysClubExamineRegister doAdd(SysClubExamineRegister examineRegister, String incomeDetailed, String incomeCensus) {
 		// JSON转换为实体列表（空值判断避免转换异常）
@@ -28,7 +28,6 @@ import com.budwk.app.web.commons.auth.utils.SecurityUtil;
 import com.budwk.app.zhgh.staffbenefit.condolence.model.Condolence;
 import com.budwk.app.zhgh.staffbenefit.condolence.model.CondolenceType;
 import com.budwk.app.zhgh.staffbenefit.condolence.service.CondolenceService;
-import com.deepoove.poi.XWPFTemplate;
 import com.deepoove.poi.data.PictureRenderData;
 import io.swagger.annotations.Api;
 import io.swagger.annotations.ApiOperation;
@@ -48,8 +47,6 @@ import org.nutz.mvc.annotation.Ok;
 import org.nutz.mvc.annotation.Param;

 import javax.servlet.http.HttpServletResponse;
-import java.io.ByteArrayInputStream;
-import java.io.ByteArrayOutputStream;
 import java.io.InputStream;
 import java.util.List;

@@ -187,27 +184,12 @@ public class CondolenceMineController {
 			log.info("[职工慰问导出] 渲染前图片字段，applyId={}, instanceId={}, field={}, valueType={}", id, instance.getId(), field, value == null ? "null" : value.getClass().getName());
 		}
 		String fileName = "重庆工贸职业技术学院职工慰问申请表_" + StrUtil.nullToEmpty(condolence.getHelpUserName());
-		try (InputStream input = getClass().getResourceAsStream("/templates/condolence/重庆工贸职业技术学院职工慰问申请表.doc");
-			 ByteArrayOutputStream templateOutput = new ByteArrayOutputStream();
-			 ByteArrayOutputStream output = new ByteArrayOutputStream()) {
+		try (InputStream input = getClass().getResourceAsStream("/templates/condolence/重庆工贸职业技术学院职工慰问申请表.doc")) {
 			if (input == null) throw new BaseException("职工慰问申请表模板不存在");
-			com.aspose.words.Document document = new com.aspose.words.Document(input);
-			document.save(templateOutput, com.aspose.words.SaveFormat.DOCX);
-			log.info("[职工慰问导出] 模板转换完成，applyId={}, templateBytes={}", id, templateOutput.size());
-			try (ByteArrayInputStream templateInput = new ByteArrayInputStream(templateOutput.toByteArray())) {
-				XWPFTemplate.compile(templateInput).render(docData).writeAndClose(output);
-			}
-			log.info("[职工慰问导出] Word渲染完成，applyId={}, outputBytes={}", id, output.size());
-			if (Boolean.TRUE.equals(print)) {
-				try (ByteArrayInputStream wordInput = new ByteArrayInputStream(output.toByteArray());
-					 ByteArrayOutputStream pdfOutput = new ByteArrayOutputStream()) {
-					new com.aspose.words.Document(wordInput).save(pdfOutput, com.aspose.words.SaveFormat.PDF);
-					log.info("[职工慰问导出] PDF转换完成，applyId={}, outputBytes={}", id, pdfOutput.size());
-					CommonDownloadUtil.download(fileName + ".pdf", pdfOutput.toByteArray(), response);
-				}
-			} else {
-				CommonDownloadUtil.download(fileName + ".docx", output.toByteArray(), response);
-			}
+			boolean pdf = Boolean.TRUE.equals(print);
+			byte[] bytes = sysOfficeTemplateUtil.renderTemplate(input, docData, null, pdf, "condolence:" + id);
+			log.info("[职工慰问导出] 渲染完成，applyId={}, format={}, outputBytes={}", id, pdf ? "PDF" : "Word", bytes.length);
+			CommonDownloadUtil.download(fileName + (pdf ? ".pdf" : ".docx"), bytes, response);
 		} catch (Exception e) {
 			log.error("[职工慰问导出] 模板渲染或文件输出失败，applyId={}, instanceId={}, format={}", id, instance.getId(), Boolean.TRUE.equals(print) ? "PDF" : "Word", e);
 			throw e;
@@ -9,7 +9,6 @@ import cn.dev33.satoken.annotation.SaCheckLogin;
 import cn.dev33.satoken.annotation.SaCheckPermission;
 import cn.hutool.core.date.DateUtil;
 import cn.hutool.core.io.FileUtil;
-import cn.hutool.core.io.IoUtil;
 import cn.hutool.core.util.StrUtil;
 import cn.hutool.json.JSONUtil;
 import com.alibaba.excel.EasyExcel;
@@ -18,7 +17,6 @@ import com.budwk.app.base.page.Pagination;
 import com.budwk.app.base.result.Result;
 import com.budwk.app.base.utils.CommonDownloadUtil;
 import com.budwk.app.base.utils.MoneyUtil;
-import com.budwk.app.base.utils.OfficePlusUtil;
 import com.budwk.app.base.utils.SysOfficeTemplateUtil;
 import com.budwk.app.flow.engine.FlowEngine;
 import com.budwk.app.flow.entity.ProcessInstance;
@@ -39,7 +37,6 @@ import com.budwk.app.zhgh.staffbenefit.difficulthelp.service.DifficultHelpCommon
 import com.budwk.app.zhgh.staffbenefit.difficulthelp.vo.DifficultHelpPageParam;
 import com.budwk.app.zhgh.staffbenefit.difficulthelp.vo.moneyImportVo;
 import com.budwk.app.zhgh.staffbenefit.medicalMutualAid.aidFund.param.AidFundPageForm;
-import com.deepoove.poi.XWPFTemplate;
 import com.deepoove.poi.config.Configure;
 import com.deepoove.poi.data.PictureRenderData;
 import com.deepoove.poi.plugin.table.LoopRowTableRenderPolicy;
@@ -74,8 +71,6 @@ import javax.servlet.http.HttpServletResponse;
 import java.awt.image.BufferedImage;
 import java.io.*;
 import java.net.URLEncoder;
-import java.nio.file.Files;
-import java.nio.file.StandardOpenOption;
 import java.util.ArrayList;
 import java.util.Date;
 import java.util.HashMap;
@@ -319,9 +314,9 @@ public class DifficultHelpReadingController {
                LoopRowTableRenderPolicy policy = new LoopRowTableRenderPolicy();
                Configure config = Configure.builder().bind("familyList", policy).build();

-                XWPFTemplate.compile(sysOfficeTemplateUtil.getTemplate("difficulty_apply"), config)
-                        .render(docData)
-                        .write(zipOutputStream);
+                try (InputStream input = sysOfficeTemplateUtil.getTemplate("difficulty_apply")) {
+                    zipOutputStream.write(sysOfficeTemplateUtil.renderTemplate(input, docData, config, false, "difficulthelp:batch:" + record.getString("id")));
+                }
                zipOutputStream.closeEntry();
            }
            zipOutputStream.flush();
@@ -379,17 +374,18 @@ public class DifficultHelpReadingController {
        String[] taskKeys = {"36ebafda-44c2-4bd3-bd7f-10839a575a0d", "715ece82-4ae3-433c-ad18-ed875f45d1e3", "e405f96c-5fc0-4f63-b323-e69dfe853253"};
        String[] fields = {"firstApproval", "secondApproval", "thirdApproval"};
        for (String field : fields) {
-            for (String suffix : List.of("", "Opinion", "User", "Date", "Year", "Month", "Day", "Sign")) docData.put(field + suffix, "");
+            for (String suffix : List.of("", "Opinion", "User", "Date", "Year", "Month", "Day", "Sign")) docData.put(field + suffix, "Sign".equals(suffix) ? null : "");
        }
        ProcessInstance instance = dao.fetch(ProcessInstance.class, Cnd.where("businessNo", "=", businessId).desc("id"));
        if (instance == null) return;
        List<ProcessTask> tasks = dao.query(ProcessTask.class, Cnd.where("processInstanceId", "=", instance.getId()).asc("id"));
        for (ProcessTask task : tasks) {
            ProcessTaskVO taskVO = flowEngine.processTaskService().findById(task.getId());
-            if ("startTask".equals(task.getTaskName()) || (taskVO.getExt() != null && Boolean.TRUE.equals(taskVO.getExt().getBool("isFirstTaskNode")))) {
+            if ("startTask".equals(task.getTaskName()) || (!List.of(taskKeys).contains(task.getTaskName())
+                    && taskVO.getExt() != null && Boolean.TRUE.equals(taskVO.getExt().getBool("isFirstTaskNode")))) {
                // 重新申请后，仅导出本轮审批，避免混入上一次退回或撤销前的意见。
                for (String field : fields) {
-                    for (String suffix : List.of("", "Opinion", "User", "Date", "Year", "Month", "Day", "Sign")) docData.put(field + suffix, "");
+                    for (String suffix : List.of("", "Opinion", "User", "Date", "Year", "Month", "Day", "Sign")) docData.put(field + suffix, "Sign".equals(suffix) ? null : "");
                }
                continue;
            }
@@ -453,22 +449,9 @@ public class DifficultHelpReadingController {
        String fileName = FileUtil.mainName(sysOfficeTemplateUtil.getTemplateFileName(templateName)) + "_" + difficultHelp.getUserName() + "_" +
                DateUtil.format(difficultHelp.getApplyTime(), "yyyyMMdd") + ".pdf";

-        try (ByteArrayOutputStream byteArrayOutputStream = new ByteArrayOutputStream()) {
-            XWPFTemplate.compile(getApplyTemplate(templateName),config)
-                    .render(docData)
-                    .writeAndClose(byteArrayOutputStream);
-            byte[] bytes = byteArrayOutputStream.toByteArray();
-            File sourceFile = File.createTempFile("file_convert_origin", ".docx");
-            Files.write(sourceFile.toPath(), bytes, StandardOpenOption.WRITE);
-
-            File pdfFile = File.createTempFile("file_convert", ".pdf");
-            OfficePlusUtil.convert(sourceFile.getPath(), pdfFile.getPath());
-            CommonDownloadUtil.download(fileName, IoUtil.readBytes(FileUtil.getInputStream(pdfFile)), response);
-            // 删除临时文件
-            FileUtil.del(sourceFile);
-            FileUtil.del(pdfFile.toPath());
-        } catch (IOException e) {
-            log.error("困难慰问申请表导出PDF失败,id:{},错误信息：{}", difficultHelp.getId(), e.getMessage());
+        try (InputStream input = getApplyTemplate(templateName)) {
+            byte[] bytes = sysOfficeTemplateUtil.renderTemplate(input, docData, config, true, "difficulthelp:" + difficultHelp.getId());
+            CommonDownloadUtil.download(fileName, bytes, response);
        }
    }

@@ -478,13 +461,9 @@ public class DifficultHelpReadingController {
        String fileName = FileUtil.mainName(sysOfficeTemplateUtil.getTemplateFileName(templateName)) + "_" + difficultHelp.getUserName() + "_" +
                DateUtil.format(difficultHelp.getApplyTime(), "yyyyMMdd") + ".docx";

-        try (ByteArrayOutputStream byteArrayOutputStream = new ByteArrayOutputStream()) {
-            XWPFTemplate.compile(getApplyTemplate(templateName),config)
-                    .render(docData)
-                    .writeAndClose(byteArrayOutputStream);
-            CommonDownloadUtil.download(fileName, byteArrayOutputStream.toByteArray(), response);
-        } catch (IOException e) {
-            log.error("困难慰问申请表导出Word失败,id:{},错误信息：{}", difficultHelp.getId(), e.getMessage());
+        try (InputStream input = getApplyTemplate(templateName)) {
+            byte[] bytes = sysOfficeTemplateUtil.renderTemplate(input, docData, config, false, "difficulthelp:" + difficultHelp.getId());
+            CommonDownloadUtil.download(fileName, bytes, response);
        }
    }

@@ -562,15 +541,13 @@ public class DifficultHelpReadingController {
                throw new RuntimeException("导出Excel汇总表失败：" + e.getMessage());
            }
        } else if ("docx".equals(flag)) {
-            try (ByteArrayOutputStream out = new ByteArrayOutputStream()) {
+            try (InputStream input = sysOfficeTemplateUtil.getTemplate(resource)) {
                Configure config = Configure.builder()
                        .bind("da", new LoopRowTableRenderPolicy())
                        .build();

-                XWPFTemplate.compile(sysOfficeTemplateUtil.getTemplate(resource), config)
-                        .render(result)
-                        .writeAndClose(out);
-                CommonDownloadUtil.download(fileName + ".docx", out.toByteArray(), response);
+                byte[] bytes = sysOfficeTemplateUtil.renderTemplate(input, result, config, false, "difficulthelp:summary:" + resource);
+                CommonDownloadUtil.download(fileName + ".docx", bytes, response);
            }
        }
    }
@@ -0,0 +1,92 @@
+This Font Software is licensed under the SIL Open Font License,
+Version 1.1.
+
+This license is copied below, and is also available with a FAQ at:
+http://scripts.sil.org/OFL
+
+-----------------------------------------------------------
+SIL OPEN FONT LICENSE Version 1.1 - 26 February 2007
+-----------------------------------------------------------
+
+PREAMBLE
+The goals of the Open Font License (OFL) are to stimulate worldwide
+development of collaborative font projects, to support the font
+creation efforts of academic and linguistic communities, and to
+provide a free and open framework in which fonts may be shared and
+improved in partnership with others.
+
+The OFL allows the licensed fonts to be used, studied, modified and
+redistributed freely as long as they are not sold by themselves. The
+fonts, including any derivative works, can be bundled, embedded,
+redistributed and/or sold with any software provided that any reserved
+names are not used by derivative works. The fonts and derivatives,
+however, cannot be released under any other type of license. The
+requirement for fonts to remain under this license does not apply to
+any document created using the fonts or their derivatives.
+
+DEFINITIONS
+"Font Software" refers to the set of files released by the Copyright
+Holder(s) under this license and clearly marked as such. This may
+include source files, build scripts and documentation.
+
+"Reserved Font Name" refers to any names specified as such after the
+copyright statement(s).
+
+"Original Version" refers to the collection of Font Software
+components as distributed by the Copyright Holder(s).
+
+"Modified Version" refers to any derivative made by adding to,
+deleting, or substituting -- in part or in whole -- any of the
+components of the Original Version, by changing formats or by porting
+the Font Software to a new environment.
+
+"Author" refers to any designer, engineer, programmer, technical
+writer or other person who contributed to the Font Software.
+
+PERMISSION & CONDITIONS
+Permission is hereby granted, free of charge, to any person obtaining
+a copy of the Font Software, to use, study, copy, merge, embed,
+modify, redistribute, and sell modified and unmodified copies of the
+Font Software, subject to the following conditions:
+
+1) Neither the Font Software nor any of its individual components, in
+Original or Modified Versions, may be sold by itself.
+
+2) Original or Modified Versions of the Font Software may be bundled,
+redistributed and/or sold with any software, provided that each copy
+contains the above copyright notice and this license. These can be
+included either as stand-alone text files, human-readable headers or
+in the appropriate machine-readable metadata fields within text or
+binary files as long as those fields can be easily viewed by the user.
+
+3) No Modified Version of the Font Software may use the Reserved Font
+Name(s) unless explicit written permission is granted by the
+corresponding Copyright Holder. This restriction only applies to the
+primary font name as presented to the users.
+
+4) The name(s) of the Copyright Holder(s) or the Author(s) of the Font
+Software shall not be used to promote, endorse or advertise any
+Modified Version, except to acknowledge the contribution(s) of the
+Copyright Holder(s) and the Author(s) or with their explicit written
+permission.
+
+5) The Font Software, modified or unmodified, in part or in whole,
+must be distributed entirely under this license, and must not be
+distributed under any other license. The requirement for fonts to
+remain under this license does not apply to any document created using
+the Font Software.
+
+TERMINATION
+This license becomes null and void if any of the above conditions are
+not met.
+
+DISCLAIMER
+THE FONT SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND,
+EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO ANY WARRANTIES OF
+MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT
+OF COPYRIGHT, PATENT, TRADEMARK, OR OTHER RIGHT. IN NO EVENT SHALL THE
+COPYRIGHT HOLDER BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY,
+INCLUDING ANY GENERAL, SPECIAL, INDIRECT, INCIDENTAL, OR CONSEQUENTIAL
+DAMAGES, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING
+FROM, OUT OF THE USE OR INABILITY TO USE THE FONT SOFTWARE OR FROM
+OTHER DEALINGS IN THE FONT SOFTWARE.
@@ -380,7 +380,7 @@
      </el-form>
      <span slot="footer" class="dialog-footer">
        <el-button @click="setDialogVisible = false">取消</el-button>
-        <el-button type="primary" @click="doSetActivityUser" v-loading="settingLoading">确定</el-button>
+        <el-button type="primary" :disabled="settingLoading" @click="doSetActivityUser">确定</el-button>
      </span>
    </el-dialog>

@@ -646,7 +646,7 @@ module.exports = {
    doSearch(showFullLoading = false) {
      this.tableKey = new Date().getTime()
      this.pageForm.pageNumber = 1
-      this.pageData(showFullLoading === true)
+      return this.pageData(showFullLoading === true)
    },
    async pageData(showFullLoading = false) {
      this.tableLoading = true
@@ -679,43 +679,74 @@ module.exports = {
        }
      }
    },
-    async doSetActivityUser() {
-      const valid = await this.$refs.setForm.validate()
-      if (!valid) {
+    doSetActivityUser() {
+      // 方法级状态保护与整页遮罩共同阻止慢请求期间的重复确认。
+      if (this.settingLoading) {
        return
      }

-      if (this.formData.groupType !== 2 && this.tableData.length === 0) {
-        this.$message.warning("请先指定筛选条件！")
-        return
-      }
-
-      const confirm = await this.$confirm("是否将符合搜索条件的用户设为活动人员？", "提示", {
-        confirmButtonText: "确定",
-        cancelButtonText: "取消",
-        type: "warning"
-      })
-
-      if (confirm === "confirm") {
-        this.settingLoading = true
-        const pageForm = this.normalizePageForm(this.pageForm)
-        Object.assign(pageForm, this.formData)
-        const resp = await $.post("/platform/activity/basic/scope/doSetActivityUser", {
-          data: JSON.stringify(pageForm)
-        })
-        if (resp.code === 0) {
-          this.setDialogVisible = false
-          await this.getActivityGroup()
-          this.doSearch()
-          this.$message.success(resp.msg)
-          this.formData = this.getDefaultFormData()
-        } else {
-          this.$message.error(resp.msg)
+      this.$refs.setForm.validate((valid) => {
+        if (!valid) {
+          return
        }
-        this.settingLoading = false
-        this.$emit("update:group_id", resp.data)
-        this.$emit("group_change")
-      }
+
+        if (this.formData.groupType !== 2 && this.tableData.length === 0) {
+          this.$message.warning("请先指定筛选条件！")
+          return
+        }
+
+        this.$confirm("是否将符合搜索条件的用户设为活动人员？", "提示", {
+          confirmButtonText: "确定",
+          cancelButtonText: "取消",
+          type: "warning"
+        }).then(() => {
+          if (this.settingLoading) {
+            return
+          }
+
+          this.settingLoading = true
+          const loading = this.$loading({
+            lock: true,
+            text: "正在设置活动人员，请稍候...",
+            spinner: "el-icon-loading",
+            background: "rgba(255, 255, 255, 0.65)"
+          })
+          const pageForm = this.normalizePageForm(this.pageForm)
+          Object.assign(pageForm, this.formData)
+
+          $.post("/platform/activity/basic/scope/doSetActivityUser", {
+            data: JSON.stringify(pageForm)
+          }).then((resp) => {
+            if (resp.code !== 0) {
+              // 将后端业务错误转入统一失败分支，直接展示接口返回的真实原因。
+              throw new Error(resp.msg || "设置活动人员失败")
+            }
+
+            this.setDialogVisible = false
+            // 设置成功后等待分组和人员列表刷新完成，再解除整页操作锁定。
+            return this.getActivityGroup()
+              .then(() => this.doSearch())
+              .then(() => {
+                this.$message.success(resp.msg)
+                this.formData = this.getDefaultFormData()
+                this.$emit("update:group_id", resp.data)
+                this.$emit("group_change")
+              })
+          }).then(null, (error) => {
+            // 兼容业务错误、权限异常和网络异常，避免请求失败后页面持续加载。
+            const response = error && error.responseJSON ? error.responseJSON : null
+            const errorMessage = response && response.msg
+              ? response.msg
+              : error && error.message
+                ? error.message
+                : "设置活动人员失败"
+            this.$message.error(errorMessage)
+          }).always(() => {
+            this.settingLoading = false
+            loading.close()
+          })
+        })
+      })
    },
    async getActivityGroup() {
      const resp = await $.get("/platform/activity/basic/scope/getActivityUserScopeGroup")
@@ -52,6 +52,7 @@ module.exports = {
     */
    init() {
      this.signatureAddress = origin + "/platform/signature/scanPcCode?id=" + this.id
+      console.log(this.signatureAddress)
      return this.$axios.post("/platform/signature/get")
          .then((res) => {
            if (this._isBeingDestroyed || this._isDestroyed) {
@@ -75,7 +75,7 @@

        <!-- 引入 form-create 和 designer -->
        <script src="${base!}/assets/platform/plugins/form-create/form-create.min.js"></script>
-        <script src="${base!}/assets/platform/plugins/form-create/index.umd.js"></script>
+        <script src="${base!}/assets/platform/plugins/form-create/index.umd.js?v=20261030"></script>

        <!-- swiper -->
        <script src="${base!}/assets/platform/plugins/swiper/swiper-bundle.js"></script>
@@ -139,7 +139,7 @@ const act = {
            }
            if (act.url === "/platform/activity/apply"
                && !this.$auth.hasRoleOr(["SYSADMIN", "SCHOOL_UNION_ADMIN", "BRANCH_UNION_CHAIRMAN", "BRANCH_UNION_WENTI_SPORTS"])) {
-                return this.$message.warning("PC端暂未开放报名，请前往移动端报名！")
+                return this.$message.warning("温馨提示：您没有参加该活动的权限！")

            }
            window.open(act.url)
@@ -116,6 +116,69 @@ layout("/layouts/v4/baseLayout.html"){
        object-fit: contain;
    }

+    /* 最新活动的作用域样式会在组件挂载后注入，首屏先固定布局和图片尺寸，避免刷新时放大闪烁。 */
+    #v4-home-app .act-card .activity-section-wrapper,
+    #v4-home-app .act-card .section-act,
+    #v4-home-app .act-card .activity-swiper {
+        width: 100%;
+        min-width: 0;
+        max-width: 100%;
+        box-sizing: border-box;
+        overflow: hidden;
+    }
+
+    #v4-home-app .act-card .activity-swiper-container {
+        position: relative;
+        width: 100%;
+        min-width: 0;
+        max-width: 100%;
+        box-sizing: border-box;
+        padding: 9px 54px 12px;
+        overflow: hidden;
+    }
+
+    #v4-home-app .act-card .activity-swiper .swiper-slide {
+        width: 100%;
+        height: auto;
+        min-width: 0;
+        flex-shrink: 0;
+        margin-right: 18px;
+    }
+
+    #v4-home-app .act-card .activity-swiper .img-box {
+        width: 100%;
+        height: 128px;
+        border-radius: 8px;
+        overflow: hidden;
+    }
+
+    #v4-home-app .act-card .activity-swiper .img-box img {
+        display: block;
+        width: 100% !important;
+        height: 100% !important;
+        max-width: 100% !important;
+        max-height: 128px !important;
+        object-fit: fill !important;
+    }
+
+    @media (min-width: 768px) {
+        #v4-home-app .act-card .activity-swiper .swiper-slide {
+            width: calc((100% - 18px) / 2);
+        }
+    }
+
+    @media (min-width: 1024px) {
+        #v4-home-app .act-card .activity-swiper .swiper-slide {
+            width: calc((100% - 54px) / 4);
+        }
+    }
+
+    @media (min-width: 1200px) {
+        #v4-home-app .act-card .activity-swiper .swiper-slide {
+            width: calc((100% - 72px) / 5);
+        }
+    }
+
 </style>

 <div class="v4-container" id="v4-home-app">
@@ -221,8 +221,7 @@ layout("/layouts/platform.html"){
                                           placeholder="请输入姓名" filterable clearable
                                           style="width: 100%" size="small" v-if="awardsMode==1">
                                    <el-option
-                                            v-for="item in userList"
-                                            :disabled="item.disabled"
+                                            v-for="item in getSelectableUserList(row)"
                                            :key="item.id"
                                            :label="item.username+'（'+item.loginname+'）'+item.sex"
                                            :value="item.id">
@@ -721,10 +720,15 @@ layout("/layouts/platform.html"){
                }
                return score;
            },
+            getSelectableUserList(row) {
+                // 其他行已经选择的人员不再显示，当前行人员保留用于姓名正常回显。
+                const selectedUserIds = this.userData
+                    .map(item => item.userId)
+                    .filter(userId => userId)
+                return this.userList.filter(item => item.id === row.userId || !selectedUserIds.includes(item.id))
+            },
            userDetailsChange(val, row) {
-                const useridArr = this.userData.map(v => v.userId)
                this.userList.forEach(v => {
-                    v.disabled = useridArr.includes(v.id)
                    if (row && row.userId === v.id) {
                        const o = {
                            unionId: v.unionId,
@@ -601,6 +601,8 @@
            eventForm: {
                isLeader: false
            },
+            // 独立记录当前编辑项目，避免下拉框切换后丢失切换前项目标识。
+            currentEventId: "",
            eventsIds: [],
            rightChecked: [],
            checkedEventInfo: [],
@@ -778,8 +780,10 @@
            this.checkedEventInfo = this.checkedEvents.map((v) => {
                v.eventId = v.id
                if (v.projectType === "1") {
-                    v.athletesMaxNum = 3
-                    v.restrictRegNumber = 2
+                    // “所有单项”保存默认值，具体单项以0表示尚未个性化设置。
+                    const isAllItems = v.eventId === "allItems"
+                    v.athletesMaxNum = isAllItems ? 3 : 0
+                    v.restrictRegNumber = isAllItems ? 2 : 0
                    v.leanderNum = 0
                    v.coachNum = 0
                    v.applyUserModel = 1
@@ -791,7 +795,23 @@
                return v
            })
        },
+        cacheCurrentEventForm() {
+            if (!this.currentEventId || !this.eventForm) {
+                return
+            }
+            const current = clone(this.eventForm)
+            current.checkedEventId = this.currentEventId
+            current.eventId = this.currentEventId
+
+            const index = this.checkedEventInfo.findIndex((item) => item.eventId === this.currentEventId)
+            if (index >= 0) {
+                this.checkedEventInfo.splice(index, 1, current)
+            } else {
+                this.checkedEventInfo.push(current)
+            }
+        },
        async eventChange(val) {
+            this.cacheCurrentEventForm()
            const data = this.checkedEventInfo.find((v) => v.eventId === val)
            const resp = await $.get("/platform/activity/sports/common/getEventData", { id: val })
            await this.$nextTick()
@@ -804,10 +824,10 @@
                    projectType: resp.data.projectType,
                    leanderNum: 0,
                    coachNum: 0,
-                    athletesMaxNum: resp.data.projectType === 1 ? 3 : null,
+                    athletesMaxNum: resp.data.projectType === 1 ? 0 : null,
                    restrictTotalTeam: 1,
                    substituteNum: 0,
-                    restrictRegNumber: resp.data.projectType === 1 ? 2 : null,
+                    restrictRegNumber: resp.data.projectType === 1 ? 0 : null,
                    isLeader: false,
                    applyUserModel: 1
                }
@@ -815,33 +835,27 @@
                this.projectType = resp.data.projectType
            }
            this.$set(this.eventForm, "checkedEventId", val)
+            this.currentEventId = val
        },
-        async saveEvent() {
+        saveEvent() {
            const data = clone(this.eventForm)
            if (data.checkedEventId === "allItems") {
-                this.checkedEventInfo.forEach((v) => {
-                    if (v.projectType === "1") {
-                        v.applyUserModel = this.eventForm.applyUserModel
-                        v.athletesMaxNum = data.athletesMaxNum
-                        v.restrictRegNumber = data.restrictRegNumber
-                        v.unionLimit = data.unionLimit
-                    }
-                })
+                const allItemsIndex = this.checkedEventInfo.findIndex((v) => v.eventId === "allItems")
+                if (allItemsIndex >= 0) {
+                    this.checkedEventInfo.splice(allItemsIndex, 1, data)
+                }
            } else {
                const info = this.checkedEventInfo.find((v) => v.eventId === data.checkedEventId)
                if (info != null) {
                    const index = this.checkedEventInfo.findIndex((v) => v.eventId === data.checkedEventId)
                    this.checkedEventInfo.splice(index, 1)
-                    if (info.projectType === "1") {
-                        this.$set(this.eventForm, "athletesMaxNum", data.athletesMaxNum)
-                        this.$set(this.eventForm, "restrictRegNumber", data.restrictRegNumber)
-                    }
-                    this.$set(this.eventForm, "checkedEventId", info.eventId)
                }
                data.eventId = data.checkedEventId
                this.checkedEventInfo.push(data)
            }
-            await this.doSave()
+            this.eventForm = clone(data)
+            this.currentEventId = data.checkedEventId
+            return this.doSave()
        },
        prev() {
            this.active--
@@ -949,6 +963,7 @@
            this.copyTemplateMode = false
            this.copyTemplateName = ""
            this.pushTodoFlag = false
+            this.currentEventId = ""
            this.events = await this.getEvents(2)
            await this.getActivityGroup()
            this.active = 0
@@ -1028,6 +1043,7 @@
        async openEdit(row, flag, copyTemplateMode = false) {
            this.copyTemplateMode = !!copyTemplateMode
            this.pushTodoFlag = false
+            this.currentEventId = ""
            this.active = flag ? 0 : this.active
            await this.getActivityGroup()
            const { id } = row
@@ -1184,7 +1200,8 @@
            }

            if (this.eventForm.checkedEventId == "allItems") {
-                events = events.filter((v) => v.projectType == 1 && v.id != "allItems")
+                // “所有单项”配置随具体单项提交，由后端统一校验并补齐继承值。
+                events = events.filter((v) => v.projectType == 1)
            } else {
                this.$set(this.eventForm, "activityId", this.formData.id)
                this.$set(this.eventForm, "eventId", this.eventForm.checkedEventId)
@@ -1192,9 +1209,10 @@
                    this.$set(this.eventForm, "startAgeDate", this.eventForm.ageDate[0])
                    this.$set(this.eventForm, "endAgeDate", this.eventForm.ageDate[1])
                }
-                events = this.eventForm
+                const allItems = this.checkedEventInfo.find((v) => v.eventId === "allItems")
+                events = allItems ? [clone(allItems), this.eventForm] : [this.eventForm]
                if (this.copyTemplateMode) {
-                    this.cleanCopyTemplateData(null, [events])
+                    this.cleanCopyTemplateData(null, events)
                }
            }
            const loading = this.$loading({
@@ -1215,6 +1233,7 @@
                    this.copyTemplateMode = false
                }
                await this.openEdit(formData, false)
+                this.currentEventId = this.eventForm.checkedEventId || ""
                this.$message.success(resp.msg)
            } else {
                this.$message.error(resp.msg)
@@ -1,4 +1,11 @@
 const REGISTER_INFO_COMPONENT = {
+    // 默认展示换届报告，仅由不需要查看该字段的业务页面显式关闭。
+    props: {
+        hideReplaceReport: {
+            type: Boolean,
+            default: false
+        }
+    },
    template: `
            <div>
                <el-tabs tab-position="top" v-model="activeName">
@@ -36,7 +43,7 @@ const REGISTER_INFO_COMPONENT = {
                              {{viewData.createTime}}
                            </el-descriptions-item>
                            <el-descriptions-item label="会费标准" :span="4">
-                              {{viewData.due}}
+                              {{ viewData.due === null || viewData.due === undefined ? "--" : viewData.due + " 元/年" }}
                            </el-descriptions-item>
                            <el-descriptions-item :span="4">
                              <template slot="label">社团介绍</template>
@@ -66,7 +73,7 @@ const REGISTER_INFO_COMPONENT = {
                              <template slot="label">其他附件</template>
                              <file-preview :files="viewData.files" complete_result></file-preview>
                            </el-descriptions-item>
-                            <el-descriptions-item :span="2">
+                            <el-descriptions-item :span="2" v-if="!hideReplaceReport">
                              <template slot="label">换届报告</template>
                              <file-preview :files="viewData.replaceReport" complete_result></file-preview>
                            </el-descriptions-item>
@@ -68,10 +68,12 @@ layout("/layouts/platform.html"){
            </el-steps>

            <!-- 第一步：基础信息表单 -->
+            <!-- 本表单自行提示首个必填错误，关闭全局校验弹窗增强以免重复提示。 -->
            <el-form
                    v-show="step === 0"
                    :model="formData"
                    ref="baseForm"
+                    no-auto-enhance
                    :rules="baseRules"
                    label-width="150px"
                    class="main-form"
@@ -135,7 +137,9 @@ layout("/layouts/platform.html"){
                                    v-model="formData.due"
                                    placeholder="请输入会费标准"
                                    readonly
-                            ></el-input>
+                            >
+                                <template slot="append">元/年</template>
+                            </el-input>
                        </el-form-item>
                    </el-col>
                </el-row>
@@ -146,7 +150,7 @@ layout("/layouts/platform.html"){
                        <el-form-item
                                class="is-required"
                                label="本年度活动开展情况"
-                                prop="yearActivity"
+                                prop="yearActivityList"
                        >
                            <span class="tip-text">说明：非赛事活动无需填写赛事举办单位、获奖情况。</span>
                            <el-table
@@ -638,6 +642,7 @@ layout("/layouts/platform.html"){
                id: GetQueryString("bizId"),
                taskId: GetQueryString("taskId"),
                step: 0, // 当前步骤（0-基础信息，1-财务收支，2-成员名单）
+                formLoading: false,
                isRegistered: false, // 是否已登记
                currentClubId: "", // 当前选中社团ID

@@ -656,7 +661,7 @@ layout("/layouts/platform.html"){
                    year: new Date().getFullYear() + "", // 默认当前年度
                    clubId: "",
                    foundTime: "",
-                    due: "",
+                    due: null,
                    clubName: "",
                    yearActivityList: [{}], // 本年度活动列表
                    plans: [{}], // 下年度计划列表
@@ -671,7 +676,10 @@ layout("/layouts/platform.html"){
                },

                // 表单校验规则
-                baseRules: {},
+                baseRules: {
+                    yearActivityList: [{validator: this.validateActivityRows, trigger: ['change', 'blur']}],
+                    plans: [{validator: this.validateActivityRows, trigger: ['change', 'blur']}]
+                },
                financeRules: {},
                memberRules: {}
            };
@@ -724,6 +732,28 @@ layout("/layouts/platform.html"){
            }
        },
        methods: {
+            // 在列表级逐行校验，避免嵌套表单项未注册、空数组或纯空白文本绕过必填。
+            validateActivityRows(rule, value, callback) {
+                const currentYear = rule.field === 'yearActivityList';
+                const label = currentYear ? '本年度活动开展情况' : '下一年度活动计划';
+                const fields = currentYear
+                    ? [['activityTime', '活动时间'], ['activityName', '活动主题/赛事名称'], ['activityAddress', '活动地点'], ['joinNum', '参加人数']]
+                    : [['activityName', '活动主题/赛事名称'], ['activityUnit', '活动/赛事主办单位'], ['activityAddress', '活动地点']];
+                if (!Array.isArray(value) || value.length === 0) {
+                    callback(new Error(label + '至少填写一条'));
+                    return;
+                }
+                for (let i = 0; i < value.length; i++) {
+                    for (const field of fields) {
+                        const content = value[i] && value[i][field[0]];
+                        if (content === null || content === undefined || String(content).trim() === '') {
+                            callback(new Error(label + '第' + (i + 1) + '条：' + field[1] + '不能为空'));
+                            return;
+                        }
+                    }
+                }
+                callback();
+            },
            /************************ 通用工具方法 ************************/
            // 格式化数字（保留2位小数，空值显示0）
            formatNumber(num) {
@@ -1110,7 +1140,7 @@ layout("/layouts/platform.html"){
                if (!val) return;
                const club = this.clubOptions.find(item => item.id === val);
                // 更新社团基础信息
-                this.formData.due = club?.due || "";
+                this.formData.due = club && club.due !== null && club.due !== undefined ? club.due : null;
                this.formData.foundTime = club?.foundTime
                    ? this.$moment(club.foundTime).format("YYYY-MM-DD")
                    : this.$moment().format("YYYY-MM-DD");
@@ -1161,73 +1191,63 @@ layout("/layouts/platform.html"){
                // 步骤前进
                this.step++;
            },
-            // 保存
-            async handleSave() {
-                try {
-                    this.recalculateCensus();
-                    const resp = await this.$axios.post("/platform/club/examine/apply/save", {
-                        data: JSON.stringify(this.formData),
-                        incomeDetailed: JSON.stringify(this.financeData.incomeDetailed),
-                        incomeCensus: JSON.stringify(this.financeData.incomeCensus)
-                    });
-                    if (resp.code === 0) {
-                        this.$message.success(resp.msg);
-                        commonUtil.pjaxPush('/platform/club/examine/mine');
+            // 三个操作共用基础信息校验，失败时返回第一步展示行号和必填字段。
+            validateBaseBeforeAction(action) {
+                if (this.formLoading) return;
+                this.$refs.baseForm.validate((valid, fields) => {
+                    if (!valid) {
+                        this.step = 0;
+                        const firstError = Object.values(fields || {}).flat()[0];
+                        this.$message.warning('温馨提示：' + (firstError ? firstError.message : '请补全基础信息必填项'));
+                        return;
                    }
-                } catch (error) {
-                    this.handleError(error, "保存失败");
-                }
+                    action();
+                });
            },
-            // 提交（新增）
-            async handleSubmit() {
-                try {
-                    this.recalculateCensus();
-                    await this.$confirm("确定要提交此申请吗？", "提示", {
-                        confirmButtonText: "确定",
-                        cancelButtonText: "取消",
-                        type: "info"
+            // 仅接收本页三个固定操作的接口后缀；data为登记实体JSON，另两项为财务数组JSON。
+            // 接口返回{code,msg,data}，code为0时保存成功，否则展示后端校验提示。
+            requestExamineAction(action) {
+                if (this.formLoading) return;
+                this.recalculateCensus();
+                const params = {
+                    data: JSON.stringify(this.formData),
+                    incomeDetailed: JSON.stringify(this.financeData.incomeDetailed),
+                    incomeCensus: JSON.stringify(this.financeData.incomeCensus)
+                };
+                if (action === 'submitAgain') params.taskId = this.taskId;
+                this.formLoading = true;
+                return this.$axios.post('/platform/club/examine/apply/' + action, params)
+                    .then((resp) => {
+                        if (resp.code === 0) {
+                            this.$message.success(resp.msg);
+                            commonUtil.pjaxPush('/platform/club/examine/mine');
+                        } else {
+                            this.$message.warning(resp.msg);
+                        }
+                    })
+                    .catch(() => {
+                        // 后端校验和网络异常已由全局axios拦截器提示，此处仅结束失败请求，避免再次弹窗。
+                    })
+                    .finally(() => {
+                        this.formLoading = false;
                    });
-                    const resp = await this.$axios.post("/platform/club/examine/apply/submit", {
-                        data: JSON.stringify(this.formData),
-                        incomeDetailed: JSON.stringify(this.financeData.incomeDetailed),
-                        incomeCensus: JSON.stringify(this.financeData.incomeCensus)
-                    });
-                    if (resp.code === 0) {
-                        this.$message.success(resp.msg);
-                        commonUtil.pjaxPush('/platform/club/examine/mine');
-                    } else {
-                        this.$message.warning(resp.msg);
-                    }
-                } catch (error) {
-                    if (error !== "cancel") {
-                        this.handleError(error, "提交失败");
-                    }
-                }
            },
-            // 提交（任务处理）
-            async handleFinishTask() {
-                try {
-                    this.recalculateCensus();
-                    await this.$confirm("您确定要提交吗？", "提示", {
-                        confirmButtonText: "确定",
-                        cancelButtonText: "取消",
-                        type: "warning"
-                    });
-                    const resp = await this.$axios.post('/platform/club/examine/apply/submitAgain', {
-                        data: JSON.stringify(this.formData),
-                        incomeDetailed: JSON.stringify(this.financeData.incomeDetailed),
-                        incomeCensus: JSON.stringify(this.financeData.incomeCensus),
-                        taskId: this.taskId
-                    });
-                    if (resp.code === 0) {
-                        this.$message.success(resp.msg);
-                        commonUtil.pjaxPush('/platform/club/examine/mine');
-                    }
-                } catch (error) {
-                    if (error !== "cancel") {
-                        this.handleError(error, "提交失败");
-                    }
-                }
+            handleSave() {
+                this.validateBaseBeforeAction(() => this.requestExamineAction('save'));
+            },
+            handleSubmit() {
+                this.validateBaseBeforeAction(() => {
+                    this.$confirm('确定要提交此申请吗？', '提示', {
+                        confirmButtonText: '确定', cancelButtonText: '取消', type: 'info'
+                    }).then(() => this.requestExamineAction('submit')).catch(() => {});
+                });
+            },
+            handleFinishTask() {
+                this.validateBaseBeforeAction(() => {
+                    this.$confirm('您确定要提交吗？', '提示', {
+                        confirmButtonText: '确定', cancelButtonText: '取消', type: 'warning'
+                    }).then(() => this.requestExamineAction('submitAgain')).catch(() => {});
+                });
            }
        }
    });
@@ -10,7 +10,7 @@
                      <el-descriptions v-if="viewData" :column="3" border class="table_fixed">
                        <el-descriptions-item label="社团名称">{{ viewData.clubName }}</el-descriptions-item>
                        <el-descriptions-item label="成立时间">{{ viewData.foundTime }} </el-descriptions-item>
-                        <el-descriptions-item label="会费标准">{{ viewData.due }}</el-descriptions-item>
+                        <el-descriptions-item label="会费标准">{{ viewData.due === null || viewData.due === undefined ? "--" : viewData.due + " 元/年" }}</el-descriptions-item>
                        <el-descriptions-item span="3">
                          <template slot="label">工作总结</template>
                          <file-preview :files="viewData.summaryFiles" complete_result></file-preview>
@@ -73,7 +73,7 @@ layout("/layouts/platform.html"){
                <el-descriptions-item label="联系人邮箱">{{viewData.concatPersonEmail}}</el-descriptions-item>
                <el-descriptions-item>
                    <template slot="label">会费标准</template>
-                    {{viewData.due}}
+                    {{ viewData.due === null || viewData.due === undefined ? "--" : viewData.due + " 元/年" }}
                </el-descriptions-item>
                <el-descriptions-item :span="2">
                    <template slot="label">当前人数</template>
@@ -63,7 +63,7 @@ layout("/layouts/platform.html"){
                        <el-descriptions-item label="社团编码">{{viewData.clubCode}}</el-descriptions-item>
                        <el-descriptions-item label="社团类型">{{viewData.typeName}}</el-descriptions-item>
                        <el-descriptions-item label="发起人">{{viewData.sponsorName}}</el-descriptions-item>
-                        <el-descriptions-item label="会费标准">{{viewData.due}}</el-descriptions-item>
+                        <el-descriptions-item label="会费标准">{{ viewData.due === null || viewData.due === undefined ? "--" : viewData.due + " 元/年" }}</el-descriptions-item>
                        <el-descriptions-item label="当前人数">{{viewData.currentPeopleNum}}</el-descriptions-item>
                        <el-descriptions-item span="2">
                            <template slot="label">社团介绍</template>
@@ -24,7 +24,13 @@ const CLUB_FORM_TEMPLATE = {
                            </el-col>
                            <el-col :span="12">
                                <el-form-item label="会费标准" prop="due">
-                                    <el-input placeholder="请填写会费标准" v-model="formData.due">
+                                    <el-input
+                                        min="0"
+                                        placeholder="请填写会费标准"
+                                        step="0.01"
+                                        type="number"
+                                        v-model.number="formData.due"
+                                    >
                                        <template slot="append">元/年</template>
                                    </el-input>
                                </el-form-item>
@@ -156,12 +162,15 @@ const CLUB_FORM_TEMPLATE = {
        return {
            formData: {
                clubName: "",
-                clubType: ""
+                clubType: "",
+                due: null
            },
            formRules: {
                clubName: [{ required: true, message: "请填写社团名称", trigger: ["blur", "change"] }],
                clubCode: [{ required: false, message: "请填写社团编码", trigger: ["blur", "change"] }],
                clubType: [{ required: true, message: "请选择社团类型", trigger: ["blur", "change"] }],
+                // 会费标准只保存数字，单位“元/年”由页面统一展示。
+                due: [{ type: "number", min: 0, message: "会费标准必须为不小于0的数字", trigger: ["blur", "change"] }],
                //concatPerson: [{ required: true, message: "请选择社团联系人", trigger: ["blur", "change"] }],
                foundTime: [{ required: true, message: "请选择成立时间", trigger: ["blur", "change"] }]
            }
@@ -73,7 +73,7 @@ layout("/layouts/platform.html"){
        </el-card>

        <template #public>
-            <register-info ref="registerInfoRef">
+            <register-info ref="registerInfoRef" :hide-replace-report="true">
                <div v-if="showApprovalForm">
                    <div class="process-title">
                        {{formData.taskName}}
@@ -77,7 +77,7 @@ layout("/layouts/platform_h5.html"){
                            <van-cell title="会长">{{ clubDetail.clubLeader || '--' }}</van-cell>
                            <van-cell title="秘书长">{{ clubDetail.clubSecretary || '--' }}</van-cell>
                            <van-cell title="当前人数">{{ clubDetail.currentPeopleNum || 0 }} 人</van-cell>
-                            <van-cell title="会费标准">{{ clubDetail.due || '--' }}</van-cell>
+                            <van-cell title="会费标准">{{ clubDetail.due === null || clubDetail.due === undefined ? '--' : clubDetail.due + ' 元/年' }}</van-cell>
                            <van-cell title="社团介绍" class="club-user-join-info-long-cell"><div v-if="hasClubContent(clubDetail.introduce)" v-html="clubDetail.introduce"></div><span v-else>暂无</span></van-cell>
                            <van-cell title="社团宗旨" class="club-user-join-info-long-cell"><div v-if="hasClubContent(clubDetail.purpose)" v-html="clubDetail.purpose"></div><span v-else>暂无</span></van-cell>
                            <van-cell title="社团章程" class="club-user-join-info-long-cell"><file-preview v-if="clubDetail.rulesFile && clubDetail.rulesFile.length" :files="clubDetail.rulesFile" complete_result></file-preview><span v-else>暂无</span></van-cell>
Author	SHA1	Message	Date
c-zhangr1	ceec8eb095	协会、活动测试整改	2026-10-30 19:02:48 +08:00
c-zhangr1	2a305a3f23	暂提交	2026-10-30 10:56:22 +08:00
c-chenxs1	29260423d5	feat: 提取通用 Word/PDF 模板渲染方法，支持 DOC、DOCX 和循环表格	2026-10-30 10:16:46 +08:00