diff --git a/backend/ruoyi-modules/ruoyi-rs/src/main/java/org/dromara/rs/controller/.gitkeep b/backend/ruoyi-modules/ruoyi-rs/src/main/java/org/dromara/rs/controller/.gitkeep
deleted file mode 100644
index acf886df..00000000
--- a/backend/ruoyi-modules/ruoyi-rs/src/main/java/org/dromara/rs/controller/.gitkeep
+++ /dev/null
@@ -1,2 +0,0 @@
-# 人事管理模块 - 控制器层
-# 此目录用于存放REST API控制器类
diff --git a/backend/ruoyi-modules/ruoyi-rs/src/main/java/org/dromara/rs/controller/RsOverseasApplicationController.java b/backend/ruoyi-modules/ruoyi-rs/src/main/java/org/dromara/rs/controller/RsOverseasApplicationController.java
index a02dff6d..50c7fbbc 100644
--- a/backend/ruoyi-modules/ruoyi-rs/src/main/java/org/dromara/rs/controller/RsOverseasApplicationController.java
+++ b/backend/ruoyi-modules/ruoyi-rs/src/main/java/org/dromara/rs/controller/RsOverseasApplicationController.java
@@ -24,6 +24,7 @@ import org.dromara.common.core.domain.R;
 import org.dromara.common.core.validate.AddGroup;
 import org.dromara.common.core.validate.EditGroup;
 import org.dromara.common.excel.utils.ExcelUtil;
+import org.dromara.common.core.utils.StringUtils;
 import org.dromara.common.satoken.utils.LoginHelper;
 import cn.dev33.satoken.annotation.SaCheckPermission;
 import cn.dev33.satoken.annotation.SaMode;
@@ -97,6 +98,8 @@ public class RsOverseasApplicationController extends BaseController {
 
     /**
      * 查询当前用户的待审批申请列表（五级审批模式）
+     * 
+     * @deprecated 已废弃，请使用 pendingPageList 方法（支持分页和搜索）
      */
     @SaCheckPermission("rs:overseasapproval:list")
     @GetMapping("/pending/list")
@@ -105,6 +108,30 @@ public class RsOverseasApplicationController extends BaseController {
         return R.ok(list);
     }
 
+    /**
+     * 查询当前用户的待审批申请分页列表（根据角色过滤，支持分页和搜索）
+     * 
+     * 🔴 核心逻辑：
+     * 1. 根据用户角色确定审批级别列表
+     * 2. 部门负责人（rs_bmfzr）只能看到本部门的申请
+     * 3. 其他角色可以看到全校的申请
+     * 4. 支持分页和搜索（前往国家、出境事由）
+     * 5. 只返回status='0'（待审核）的申请
+     * 6. 按创建时间倒序排列
+     * 
+     * 角色映射：
+     * - rs_bmfzr → approval_level='1' + 部门过滤
+     * - hr_dept_role → approval_level='2'
+     * - discipline_committee_role → approval_level='3'
+     * - college_leader_role → approval_level='4'
+     * - party_secretary_role → approval_level='5'
+     */
+    @SaCheckPermission("rs:overseasapproval:list")
+    @GetMapping("/pending/page")
+    public TableDataInfo<RsOverseasApplicationVo> pendingPageList(RsOverseasApplicationQuery query) {
+        return applicationService.queryPendingPageListByRole(query);
+    }
+
     // ========================================
     // 五级审批模式说明
     //
@@ -321,7 +348,7 @@ public class RsOverseasApplicationController extends BaseController {
     @PostMapping("/approve")
     public R<Void> approve(@RequestBody ApprovalRequest request) {
         Long approverId = LoginHelper.getUserId();
-        String approverName = LoginHelper.getUsername();
+        String approverName = StringUtils.defaultIfBlank(LoginHelper.getNickname(), LoginHelper.getUsername());
 
         // 🔴 标准工作流模式：支持任务ID参数
         // 如果传入了taskId，将通过工作流引擎进行审批
@@ -488,12 +515,6 @@ public class RsOverseasApplicationController extends BaseController {
     public R<Map<String, Object>> uploadStampedFile(@RequestParam("file") MultipartFile file,
             @RequestParam("applicationId") Long applicationId) {
         try {
-            // 验证文件格式
-            String contentType = file.getContentType();
-            if (!isValidFileType(contentType)) {
-                return R.fail("不支持的文件格式，请上传PDF、JPG或PNG文件");
-            }
-
             // 验证文件大小（10MB）
             long maxSize = 10 * 1024 * 1024; // 10MB
             if (file.getSize() > maxSize) {
@@ -561,12 +582,6 @@ public class RsOverseasApplicationController extends BaseController {
     public R<Map<String, Object>> uploadPartyRetentionFile(@RequestParam("file") MultipartFile file,
             @RequestParam("applicationId") Long applicationId) {
         try {
-            // 验证文件格式
-            String contentType = file.getContentType();
-            if (!isValidFileType(contentType)) {
-                return R.fail("不支持的文件格式，请上传PDF、JPG或PNG文件");
-            }
-
             // 验证文件大小（10MB）
             long maxSize = 10 * 1024 * 1024; // 10MB
             if (file.getSize() > maxSize) {
@@ -583,7 +598,7 @@ public class RsOverseasApplicationController extends BaseController {
                     ossResult.getOriginalName(), // 原始文件名
                     new Date(), // 上传时间
                     "1", // 上传状态：已上传
-                    ossResult.getOssId() // OSS文件ID
+                    String.valueOf(ossResult.getOssId()) // OSS文件ID - 转换为字符串
             );
 
             // 返回结果
@@ -616,25 +631,24 @@ public class RsOverseasApplicationController extends BaseController {
                 return;
             }
 
+            // 处理多个OSS ID的情况（逗号分隔），取第一个ID进行下载
+            String ossIdStr = application.getPartyRetentionFileOssId();
+            Long ossId;
+            if (ossIdStr.contains(",")) {
+                // 如果包含逗号，取第一个ID
+                ossId = Long.parseLong(ossIdStr.split(",")[0].trim());
+            } else {
+                // 单个ID直接解析
+                ossId = Long.parseLong(ossIdStr);
+            }
+
             // 使用系统OSS服务进行安全下载
-            ossService.secureDownload(application.getPartyRetentionFileOssId(), response);
+            ossService.secureDownload(ossId, response);
         } catch (Exception e) {
             e.printStackTrace();
         }
     }
 
-    /**
-     * 验证文件类型
-     */
-    private boolean isValidFileType(String contentType) {
-        if (contentType == null)
-            return false;
-        return contentType.equals("application/pdf") ||
-                contentType.equals("image/jpeg") ||
-                contentType.equals("image/jpg") ||
-                contentType.equals("image/png");
-    }
-
     /**
      * 获取文件扩展名
      */
diff --git a/backend/ruoyi-modules/ruoyi-rs/src/main/java/org/dromara/rs/controller/RsOverseasItineraryChangeController.java b/backend/ruoyi-modules/ruoyi-rs/src/main/java/org/dromara/rs/controller/RsOverseasItineraryChangeController.java
index dbcd2194..1b0c7b97 100644
--- a/backend/ruoyi-modules/ruoyi-rs/src/main/java/org/dromara/rs/controller/RsOverseasItineraryChangeController.java
+++ b/backend/ruoyi-modules/ruoyi-rs/src/main/java/org/dromara/rs/controller/RsOverseasItineraryChangeController.java
@@ -62,17 +62,13 @@ public class RsOverseasItineraryChangeController extends BaseController {
     }
 
     /**
-     * 🔴 标准化改造：删除自定义待审批查询接口
-     * 
-     * 原因：出国行程变更工作流应使用标准工作流模式
-     * 用户应通过工作流API pageByTaskWait() 获取待办任务
-     * 而不是调用自定义的业务API
+     * 查询待审批的行程变更申请列表（status=0）
      */
     @SaCheckPermission("rs:itineraryChange:approve")
     @GetMapping("/pending/list")
-    public R<String> pendingList(RsOverseasItineraryChangeQuery query) {
-        // 提示用户使用标准工作流API
-        return R.fail("请使用标准工作流待办页面查看审批任务。访问：工作流 > 我的任务 > 待办任务");
+    public TableDataInfo<RsOverseasItineraryChangeVo> pendingList(RsOverseasItineraryChangeQuery query) {
+        query.setTenantId(LoginHelper.getTenantId());
+        return changeService.queryPendingList(query);
     }
 
     /**
@@ -167,7 +163,7 @@ public class RsOverseasItineraryChangeController extends BaseController {
     /**
      * 导出行程变更申请列表
      */
-    @SaCheckPermission("rs:itineraryChange:export")
+    // @SaCheckPermission("rs:itineraryChange:export")
     @Log(title = "行程变更申请", businessType = BusinessType.EXPORT)
     @PostMapping("/export")
     public void export(RsOverseasItineraryChangeQuery query, HttpServletResponse response) {
@@ -179,7 +175,7 @@ public class RsOverseasItineraryChangeController extends BaseController {
     /**
      * 查询某个出国记录的所有变更历史
      */
-    @SaCheckPermission("rs:itineraryChange:query")
+    // @SaCheckPermission("rs:itineraryChange:query")
     @GetMapping("/record/{recordId}/history")
     public R<List<RsOverseasItineraryChangeVo>> getChangeHistory(@PathVariable Long recordId) {
         return R.ok(changeService.queryByRecordId(recordId));
diff --git a/backend/ruoyi-modules/ruoyi-rs/src/main/java/org/dromara/rs/controller/RsOverseasRegistrationController.java b/backend/ruoyi-modules/ruoyi-rs/src/main/java/org/dromara/rs/controller/RsOverseasRegistrationController.java
index d73f0f0f..0b7cb56b 100644
--- a/backend/ruoyi-modules/ruoyi-rs/src/main/java/org/dromara/rs/controller/RsOverseasRegistrationController.java
+++ b/backend/ruoyi-modules/ruoyi-rs/src/main/java/org/dromara/rs/controller/RsOverseasRegistrationController.java
@@ -32,7 +32,7 @@ import org.dromara.rs.service.IRsOverseasRegistrationService;
 
 /**
  * 出国登记Controller
- * 
+ *
  * @author weizzzz
  * @date 2025-09-30
  */
@@ -47,7 +47,7 @@ public class RsOverseasRegistrationController extends BaseController {
     /**
      * 查询出国登记列表
      */
-    @SaCheckPermission("rs:overseas:registration:list")
+    // @SaCheckPermission("rs:overseasregistration:list")
     @GetMapping("/list")
     public TableDataInfo<RsOverseasRegistrationVo> list(RsOverseasRegistrationQuery query) {
         return registrationService.queryPageList(query);
@@ -56,7 +56,7 @@ public class RsOverseasRegistrationController extends BaseController {
     /**
      * 查询我的出国登记列表
      */
-    @SaCheckPermission("rs:overseas:registration:list")
+    // @SaCheckPermission("rs:overseasregistration:list")
     @GetMapping("/my/list")
     public TableDataInfo<RsOverseasRegistrationVo> myList(RsOverseasRegistrationQuery query) {
         return registrationService.queryMyRegistrationList(query);
@@ -65,7 +65,7 @@ public class RsOverseasRegistrationController extends BaseController {
     /**
      * 导出出国登记列表
      */
-    @SaCheckPermission("rs:overseas:registration:export")
+    // @SaCheckPermission("rs:overseasregistration:export")
     @Log(title = "出国登记", businessType = BusinessType.EXPORT)
     @PostMapping("/export")
     public void export(RsOverseasRegistrationQuery query, HttpServletResponse response) {
@@ -76,27 +76,26 @@ public class RsOverseasRegistrationController extends BaseController {
     /**
      * 获取出国登记详细信息
      */
-    @SaCheckPermission("rs:overseas:registration:query")
+    // @SaCheckPermission("rs:overseasregistration:query")
     @GetMapping("/{registrationId}")
-    public R<RsOverseasRegistrationVo> getInfo(@NotNull(message = "主键不能为空")
-                                                @PathVariable Long registrationId) {
+    public R<RsOverseasRegistrationVo> getInfo(@NotNull(message = "主键不能为空") @PathVariable Long registrationId) {
         return R.ok(registrationService.queryById(registrationId));
     }
 
     /**
      * 根据申请ID获取出国登记信息
      */
-    @SaCheckPermission("rs:overseas:registration:query")
+    // @SaCheckPermission("rs:overseasregistration:query")
     @GetMapping("/application/{applicationId}")
-    public R<RsOverseasRegistrationVo> getByApplicationId(@NotNull(message = "申请ID不能为空")
-                                                           @PathVariable Long applicationId) {
+    public R<RsOverseasRegistrationVo> getByApplicationId(
+            @NotNull(message = "申请ID不能为空") @PathVariable Long applicationId) {
         return R.ok(registrationService.queryByApplicationId(applicationId));
     }
 
     /**
      * 新增出国登记
      */
-    @SaCheckPermission("rs:overseas:registration:add")
+    // @SaCheckPermission("rs:overseasregistration:add")
     @Log(title = "出国登记", businessType = BusinessType.INSERT)
     @PostMapping()
     public R<Void> add(@Validated(AddGroup.class) @RequestBody RsOverseasRegistrationBo bo) {
@@ -106,7 +105,7 @@ public class RsOverseasRegistrationController extends BaseController {
     /**
      * 新增并提交出国登记
      */
-    @SaCheckPermission("rs:overseas:registration:add")
+    // @SaCheckPermission("rs:overseasregistration:add")
     @Log(title = "出国登记", businessType = BusinessType.INSERT)
     @PostMapping("/addAndSubmit")
     public R<Void> addAndSubmit(@Validated(AddGroup.class) @RequestBody RsOverseasRegistrationBo bo) {
@@ -116,7 +115,7 @@ public class RsOverseasRegistrationController extends BaseController {
     /**
      * 修改出国登记
      */
-    @SaCheckPermission("rs:overseas:registration:edit")
+    // @SaCheckPermission("rs:overseasregistration:edit")
     @Log(title = "出国登记", businessType = BusinessType.UPDATE)
     @PutMapping()
     public R<Void> edit(@Validated(EditGroup.class) @RequestBody RsOverseasRegistrationBo bo) {
@@ -126,67 +125,61 @@ public class RsOverseasRegistrationController extends BaseController {
     /**
      * 删除出国登记
      */
-    @SaCheckPermission("rs:overseas:registration:remove")
+    // @SaCheckPermission("rs:overseasregistration:remove")
     @Log(title = "出国登记", businessType = BusinessType.DELETE)
     @DeleteMapping("/{registrationIds}")
-    public R<Void> remove(@NotEmpty(message = "主键不能为空")
-                          @PathVariable Long[] registrationIds) {
+    public R<Void> remove(@NotEmpty(message = "主键不能为空") @PathVariable Long[] registrationIds) {
         return toAjax(registrationService.deleteWithValidByIds(List.of(registrationIds), true));
     }
 
     /**
      * 提交出国登记
      */
-    @SaCheckPermission("rs:overseas:registration:submit")
+    // @SaCheckPermission("rs:overseasregistration:submit")
     @Log(title = "出国登记", businessType = BusinessType.UPDATE)
     @PutMapping("/submit/{registrationId}")
-    public R<Void> submit(@NotNull(message = "主键不能为空")
-                          @PathVariable Long registrationId) {
+    public R<Void> submit(@NotNull(message = "主键不能为空") @PathVariable Long registrationId) {
         return toAjax(registrationService.submitRegistration(registrationId));
     }
 
     /**
      * 确认出国登记
      */
-    @SaCheckPermission("rs:overseas:registration:confirm")
+    // @SaCheckPermission("rs:overseasregistration:confirm")
     @Log(title = "出国登记", businessType = BusinessType.UPDATE)
     @PutMapping("/confirm/{registrationId}")
-    public R<Void> confirm(@NotNull(message = "主键不能为空")
-                           @PathVariable Long registrationId) {
+    public R<Void> confirm(@NotNull(message = "主键不能为空") @PathVariable Long registrationId) {
         return toAjax(registrationService.confirmRegistration(registrationId));
     }
 
     /**
      * 撤回出国登记
      */
-    @SaCheckPermission("rs:overseas:registration:withdraw")
+    // @SaCheckPermission("rs:overseasregistration:withdraw")
     @Log(title = "出国登记", businessType = BusinessType.UPDATE)
     @PutMapping("/withdraw/{registrationId}")
-    public R<Void> withdraw(@NotNull(message = "主键不能为空")
-                            @PathVariable Long registrationId) {
+    public R<Void> withdraw(@NotNull(message = "主键不能为空") @PathVariable Long registrationId) {
         return toAjax(registrationService.withdrawRegistration(registrationId));
     }
 
     /**
      * 基于出国申请创建登记记录
      */
-    @SaCheckPermission("rs:overseas:registration:create")
+    // @SaCheckPermission("rs:overseasregistration:create")
     @Log(title = "出国登记", businessType = BusinessType.INSERT)
     @PostMapping("/create/{applicationId}")
-    public R<Void> createFromApplication(@NotNull(message = "申请ID不能为空")
-                                          @PathVariable Long applicationId) {
+    public R<Void> createFromApplication(@NotNull(message = "申请ID不能为空") @PathVariable Long applicationId) {
         return toAjax(registrationService.createFromApplication(applicationId));
     }
 
     /**
      * 批准出国登记
      */
-    @SaCheckPermission("rs:registration:approve")
+    // @SaCheckPermission("rs:registration:approve")
     @Log(title = "出国登记", businessType = BusinessType.UPDATE)
     @PutMapping("/approve/{registrationId}")
-    public R<Void> approve(@NotNull(message = "主键不能为空")
-                           @PathVariable Long registrationId,
-                           @RequestBody(required = false) RsOverseasRegistrationBo bo) {
+    public R<Void> approve(@NotNull(message = "主键不能为空") @PathVariable Long registrationId,
+            @RequestBody(required = false) RsOverseasRegistrationBo bo) {
         String approveNotes = (bo != null && bo.getRemarks() != null) ? bo.getRemarks() : "同意";
         return toAjax(registrationService.approveRegistration(registrationId, approveNotes));
     }
@@ -194,13 +187,12 @@ public class RsOverseasRegistrationController extends BaseController {
     /**
      * 拒绝出国登记
      */
-    @SaCheckPermission("rs:registration:reject")
+    // @SaCheckPermission("rs:registration:reject")
     @Log(title = "出国登记", businessType = BusinessType.UPDATE)
     @PutMapping("/reject/{registrationId}")
-    public R<Void> reject(@NotNull(message = "主键不能为空")
-                          @PathVariable Long registrationId,
-                          @RequestBody(required = false) RsOverseasRegistrationBo bo) {
+    public R<Void> reject(@NotNull(message = "主键不能为空") @PathVariable Long registrationId,
+            @RequestBody(required = false) RsOverseasRegistrationBo bo) {
         String rejectReason = (bo != null && bo.getRemarks() != null) ? bo.getRemarks() : "不同意";
         return toAjax(registrationService.rejectRegistration(registrationId, rejectReason));
     }
-} 
\ No newline at end of file
+}
diff --git a/backend/ruoyi-modules/ruoyi-rs/src/main/java/org/dromara/rs/domain/RsOverseasApplication.java b/backend/ruoyi-modules/ruoyi-rs/src/main/java/org/dromara/rs/domain/RsOverseasApplication.java
index 55d544e1..1c587106 100644
--- a/backend/ruoyi-modules/ruoyi-rs/src/main/java/org/dromara/rs/domain/RsOverseasApplication.java
+++ b/backend/ruoyi-modules/ruoyi-rs/src/main/java/org/dromara/rs/domain/RsOverseasApplication.java
@@ -384,10 +384,10 @@ public class RsOverseasApplication extends BaseEntity {
     private String partyRetentionUploadStatus;
 
     /**
-     * 党籍保留附件OSS ID（用于安全下载）
+     * 党籍保留附件OSS ID（用于安全下载，支持多个ID用逗号分隔）
      */
     @ExcelIgnore
-    private Long partyRetentionFileOssId;
+    private String partyRetentionFileOssId;
 
     /**
      * 租户编号
diff --git a/backend/ruoyi-modules/ruoyi-rs/src/main/java/org/dromara/rs/domain/RsOverseasRegistration.java b/backend/ruoyi-modules/ruoyi-rs/src/main/java/org/dromara/rs/domain/RsOverseasRegistration.java
index ee06d702..755e76a1 100644
--- a/backend/ruoyi-modules/ruoyi-rs/src/main/java/org/dromara/rs/domain/RsOverseasRegistration.java
+++ b/backend/ruoyi-modules/ruoyi-rs/src/main/java/org/dromara/rs/domain/RsOverseasRegistration.java
@@ -29,7 +29,7 @@ public class RsOverseasRegistration extends BaseEntity {
     /**
      * 登记ID
      */
-    @TableId(value = "registration_id", type = IdType.AUTO)
+    @TableId(value = "registration_id", type = IdType.ASSIGN_ID)
     @ExcelProperty(value = "登记ID")
     private Long registrationId;
 
diff --git a/backend/ruoyi-modules/ruoyi-rs/src/main/java/org/dromara/rs/domain/bo/RsOverseasApplicationBo.java b/backend/ruoyi-modules/ruoyi-rs/src/main/java/org/dromara/rs/domain/bo/RsOverseasApplicationBo.java
index 6f97b7d7..903f7dca 100644
--- a/backend/ruoyi-modules/ruoyi-rs/src/main/java/org/dromara/rs/domain/bo/RsOverseasApplicationBo.java
+++ b/backend/ruoyi-modules/ruoyi-rs/src/main/java/org/dromara/rs/domain/bo/RsOverseasApplicationBo.java
@@ -317,6 +317,32 @@ public class RsOverseasApplicationBo extends BaseEntity {
      */
     private String stampedFileUploadStatus;
 
+    /**
+     * 党籍保留附件文件路径
+     */
+    private String partyRetentionFilePath;
+
+    /**
+     * 党籍保留附件文件名
+     */
+    private String partyRetentionFileName;
+
+    /**
+     * 党籍保留附件上传时间
+     */
+    @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss")
+    private Date partyRetentionUploadTime;
+
+    /**
+     * 党籍保留附件上传状态：0-未上传，1-已上传
+     */
+    private String partyRetentionUploadStatus;
+
+    /**
+     * 党籍保留附件OSS ID（支持多个ID用逗号分隔）
+     */
+    private String partyRetentionFileOssId;
+
     /**
      * 租户ID
      */
diff --git a/backend/ruoyi-modules/ruoyi-rs/src/main/java/org/dromara/rs/domain/vo/RsOverseasApplicationVo.java b/backend/ruoyi-modules/ruoyi-rs/src/main/java/org/dromara/rs/domain/vo/RsOverseasApplicationVo.java
index 8e722a56..1a4ef80b 100644
--- a/backend/ruoyi-modules/ruoyi-rs/src/main/java/org/dromara/rs/domain/vo/RsOverseasApplicationVo.java
+++ b/backend/ruoyi-modules/ruoyi-rs/src/main/java/org/dromara/rs/domain/vo/RsOverseasApplicationVo.java
@@ -365,9 +365,9 @@ public class RsOverseasApplicationVo implements Serializable {
     private String partyRetentionUploadStatus;
 
     /**
-     * 党籍保留附件OSS ID（用于安全下载）
+     * 党籍保留附件OSS ID（用于安全下载，支持多个ID用逗号分隔）
      */
-    private Long partyRetentionFileOssId;
+    private String partyRetentionFileOssId;
 
     /**
      * 租户编号
diff --git a/backend/ruoyi-modules/ruoyi-rs/src/main/java/org/dromara/rs/domain/vo/RsOverseasApprovalMonitorVo.java b/backend/ruoyi-modules/ruoyi-rs/src/main/java/org/dromara/rs/domain/vo/RsOverseasApprovalMonitorVo.java
index 9a3e3219..b43402d0 100644
--- a/backend/ruoyi-modules/ruoyi-rs/src/main/java/org/dromara/rs/domain/vo/RsOverseasApprovalMonitorVo.java
+++ b/backend/ruoyi-modules/ruoyi-rs/src/main/java/org/dromara/rs/domain/vo/RsOverseasApprovalMonitorVo.java
@@ -196,6 +196,11 @@ public class RsOverseasApprovalMonitorVo implements Serializable {
     @ExcelProperty(value = "应急联系人及电话")
     private String emergencyContact;
 
+    /**
+     * 申请人手写签名（base64）
+     */
+    private String signature;
+
     // ==================== 审批状态信息 ====================
 
     /**
diff --git a/backend/ruoyi-modules/ruoyi-rs/src/main/java/org/dromara/rs/mapper/RsOverseasApplicationMapper.java b/backend/ruoyi-modules/ruoyi-rs/src/main/java/org/dromara/rs/mapper/RsOverseasApplicationMapper.java
index d371ea95..6065b2d1 100644
--- a/backend/ruoyi-modules/ruoyi-rs/src/main/java/org/dromara/rs/mapper/RsOverseasApplicationMapper.java
+++ b/backend/ruoyi-modules/ruoyi-rs/src/main/java/org/dromara/rs/mapper/RsOverseasApplicationMapper.java
@@ -144,4 +144,23 @@ public interface RsOverseasApplicationMapper extends BaseMapperPlus<RsOverseasAp
      * @return 待审批申请列表
      */
     List<RsOverseasApplication> selectPendingApplications(List<String> approvalLevels, Long deptId);
+
+    /**
+     * 🔴 新增：根据角色查询待审批申请列表（支持分页和搜索）
+     * 
+     * 查询逻辑：
+     * 1. 根据用户角色确定审批级别列表
+     * 2. 关联 sys_user 表获取申请人的部门信息
+     * 3. 按审批级别过滤（approvalLevel IN (...)）
+     * 4. 按状态过滤（status = '0' 待审核）
+     * 5. 按部门过滤（部门负责人：u.dept_id = 当前用户部门ID）
+     * 6. 按搜索条件过滤（前往国家、出境事由）
+     * 7. 按创建时间倒序排列
+     * 
+     * @param query 查询条件（包含分页、搜索条件）
+     * @param approvalLevels 审批级别列表，例如：["1", "2"]
+     * @param deptId 部门ID（部门负责人需要），为null则不过滤部门
+     * @return 待审批申请分页列表
+     */
+    List<RsOverseasApplicationVo> selectPendingApplicationsByRole(RsOverseasApplicationQuery query, List<String> approvalLevels, Long deptId);
 }
\ No newline at end of file
diff --git a/backend/ruoyi-modules/ruoyi-rs/src/main/java/org/dromara/rs/service/IRsOverseasApplicationService.java b/backend/ruoyi-modules/ruoyi-rs/src/main/java/org/dromara/rs/service/IRsOverseasApplicationService.java
index cbdc7557..0b0b5dff 100644
--- a/backend/ruoyi-modules/ruoyi-rs/src/main/java/org/dromara/rs/service/IRsOverseasApplicationService.java
+++ b/backend/ruoyi-modules/ruoyi-rs/src/main/java/org/dromara/rs/service/IRsOverseasApplicationService.java
@@ -48,6 +48,14 @@ public interface IRsOverseasApplicationService {
          */
         List<RsOverseasApplicationVo> queryPendingByCurrentUser();
 
+        /**
+         * 查询当前用户的待审批申请分页列表（根据角色过滤）
+         *
+         * @param query 查询条件（包含分页、搜索条件）
+         * @return 待审批申请分页集合
+         */
+        TableDataInfo<RsOverseasApplicationVo> queryPendingPageListByRole(RsOverseasApplicationQuery query);
+
         /**
          * 查询出国申请详细信息
          *
@@ -207,7 +215,7 @@ public interface IRsOverseasApplicationService {
          * @return 是否成功
          */
         Boolean updatePartyRetentionFileInfo(Long applicationId, String filePath, String fileName,
-                        java.util.Date uploadTime, String uploadStatus, Long ossId);
+                        java.util.Date uploadTime, String uploadStatus, String ossId);
 
         /**
          * 校验出国登记前置条件
diff --git a/backend/ruoyi-modules/ruoyi-rs/src/main/java/org/dromara/rs/service/impl/RsOverseasApplicationServiceImpl.java b/backend/ruoyi-modules/ruoyi-rs/src/main/java/org/dromara/rs/service/impl/RsOverseasApplicationServiceImpl.java
index f9fa4656..1ca828af 100644
--- a/backend/ruoyi-modules/ruoyi-rs/src/main/java/org/dromara/rs/service/impl/RsOverseasApplicationServiceImpl.java
+++ b/backend/ruoyi-modules/ruoyi-rs/src/main/java/org/dromara/rs/service/impl/RsOverseasApplicationServiceImpl.java
@@ -51,7 +51,7 @@ import org.dromara.common.mybatis.core.page.PageQuery;
 
 /**
  * 出国申请Service业务层处理
- * 
+ *
  * @author weizzzz
  * @date 2025-07-28
  */
@@ -232,14 +232,14 @@ public class RsOverseasApplicationServiceImpl extends ServiceImpl<RsOverseasAppl
 
     /**
      * 查询当前用户的待审批申请列表（动态权限方案 + 部门过滤）
-     * 
+     *
      * 🆕 核心改进：
      * 1. 不再依赖 current_approver_id 字段（该字段仅作为冗余展示用）
      * 2. 动态查询用户的审批权限，转换为审批级别
      * 3. 根据审批级别和状态查询待审批申请
      * 4. 🔴 部门负责人只能看到本部门的申请
      * 5. 支持人员岗位变动：权限调整后立即生效
-     * 
+     *
      * 查询逻辑：
      * - 用户有 rs:overseas:approve1 权限（部门负责人）→ 查询本部门员工的、approval_level='1' 且
      * status='0' 的申请
@@ -307,6 +307,156 @@ public class RsOverseasApplicationServiceImpl extends ServiceImpl<RsOverseasAppl
         return result;
     }
 
+    /**
+     * 查询当前用户的待审批申请分页列表（根据角色过滤）
+     *
+     * 🔴 核心逻辑：
+     * 1. 根据用户角色确定审批级别列表
+     * 2. 部门负责人（rs_bmfzr）只能看到本部门的申请
+     * 3. 其他角色可以看到全校的申请
+     * 4. 支持分页和搜索（前往国家、出境事由）
+     * 5. 按创建时间倒序排列
+     * 6. 🔴 修复：当用户同时拥有多个角色时，分别查询后合并去重
+     *
+     * 角色映射：
+     * - rs_bmfzr → approval_level='1' + 部门过滤
+     * - hr_dept_role → approval_level='2'
+     * - discipline_committee_role → approval_level='3'
+     * - college_leader_role → approval_level='4'
+     * - party_secretary_role → approval_level='5'
+     */
+    @Override
+    public TableDataInfo<RsOverseasApplicationVo> queryPendingPageListByRole(RsOverseasApplicationQuery query) {
+        Long currentUserId = LoginHelper.getUserId();
+        String currentUserName = LoginHelper.getUsername();
+        String tenantId = LoginHelper.getTenantId();
+
+        log.info("🔍 查询用户待审批申请分页列表 - 用户ID: {}, 用户名: {}", currentUserId, currentUserName);
+
+        // 1. 获取当前用户的角色列表
+        List<SysRoleVo> userRoles = roleService.selectRolesByUserId(currentUserId);
+        if (userRoles == null || userRoles.isEmpty()) {
+            log.warn("❌ 用户 {} 没有任何角色，返回空列表", currentUserName);
+            return TableDataInfo.build();
+        }
+
+        // 2. 根据角色编码确定审批级别列表
+        List<String> deptHeadLevels = new ArrayList<>(); // 部门负责人审批级别
+        List<String> otherLevels = new ArrayList<>(); // 其他审批级别
+        Long deptIdForFilter = null;
+        boolean hasDeptHeadRole = false;
+        boolean hasOtherRole = false;
+
+        for (SysRoleVo role : userRoles) {
+            String roleKey = role.getRoleKey();
+            if (roleKey == null) {
+                continue;
+            }
+
+            // 角色编码映射到审批级别
+            if ("rs_bmfzr".equals(roleKey)) {
+                deptHeadLevels.add("1");
+                hasDeptHeadRole = true;
+            } else if ("hr_dept_role".equals(roleKey)) {
+                otherLevels.add("2");
+                hasOtherRole = true;
+            } else if ("discipline_committee_role".equals(roleKey)) {
+                otherLevels.add("3");
+                hasOtherRole = true;
+            } else if ("college_leader_role".equals(roleKey)) {
+                otherLevels.add("4");
+                hasOtherRole = true;
+            } else if ("party_secretary_role".equals(roleKey)) {
+                otherLevels.add("5");
+                hasOtherRole = true;
+            }
+        }
+
+        if (!hasDeptHeadRole && !hasOtherRole) {
+            log.warn("❌ 用户 {} 没有任何出国审批角色，返回空列表", currentUserName);
+            return TableDataInfo.build();
+        }
+
+        log.info("✅ 用户 {} 拥有审批级别 - 部门负责人: {}, 其他角色: {}",
+                currentUserName, deptHeadLevels, otherLevels);
+
+        // 3. 如果是部门负责人，获取部门ID进行过滤
+        if (hasDeptHeadRole) {
+            SysUserVo currentUser = userService.selectUserById(currentUserId);
+            if (currentUser != null && currentUser.getDeptId() != null) {
+                deptIdForFilter = currentUser.getDeptId();
+                log.info("🔒 [部门权限过滤] 部门负责人，用户: {}, 部门ID: {}, 只查看本部门待审批",
+                        currentUserName, deptIdForFilter);
+            } else {
+                log.warn("⚠️ 用户 {} 是部门负责人但没有部门信息，无法过滤", currentUserName);
+            }
+        }
+
+        // 4. 设置租户ID
+        if (StringUtils.isNotBlank(tenantId)) {
+            query.setTenantId(tenantId);
+        }
+
+        // 5. 🔴 修复：分别查询不同角色的数据，然后合并去重
+        List<RsOverseasApplicationVo> allList = new ArrayList<>();
+        Map<Long, RsOverseasApplicationVo> applicationMap = new HashMap<>(); // 用于去重，key=applicationId
+
+        // 5.1 查询部门负责人的数据（本部门，审批级别='1'）
+        if (hasDeptHeadRole && !deptHeadLevels.isEmpty() && deptIdForFilter != null) {
+            List<RsOverseasApplicationVo> deptList = baseMapper.selectPendingApplicationsByRole(
+                    query, deptHeadLevels, deptIdForFilter);
+            log.info("📋 [部门负责人] 查询到 {} 条本部门待审批申请", deptList.size());
+            for (RsOverseasApplicationVo vo : deptList) {
+                applicationMap.put(vo.getApplicationId(), vo);
+            }
+        }
+
+        // 5.2 查询其他角色的数据（全校，审批级别为其他级别）
+        if (hasOtherRole && !otherLevels.isEmpty()) {
+            List<RsOverseasApplicationVo> otherList = baseMapper.selectPendingApplicationsByRole(
+                    query, otherLevels, null); // deptIdForFilter=null，不限制部门
+            log.info("📋 [其他角色] 查询到 {} 条全校待审批申请", otherList.size());
+            for (RsOverseasApplicationVo vo : otherList) {
+                applicationMap.put(vo.getApplicationId(), vo);
+            }
+        }
+
+        // 5.3 合并去重后的结果，按创建时间倒序排列
+        allList = new ArrayList<>(applicationMap.values());
+        allList.sort((a, b) -> {
+            if (a.getCreateTime() != null && b.getCreateTime() != null) {
+                return b.getCreateTime().compareTo(a.getCreateTime());
+            }
+            return 0;
+        });
+
+        log.info("✅ [合并结果] 去重后共 {} 条待审批申请", allList.size());
+
+        // 6. 手动分页处理
+        int pageNum = query.getPageNum();
+        int pageSize = query.getPageSize();
+        int total = allList.size();
+        int start = (pageNum - 1) * pageSize;
+        int end = Math.min(start + pageSize, total);
+
+        List<RsOverseasApplicationVo> pageList;
+        if (start >= total) {
+            pageList = new ArrayList<>();
+        } else {
+            pageList = allList.subList(start, end);
+        }
+
+        // 7. 构建分页对象
+        Page<RsOverseasApplicationVo> page = new Page<>(pageNum, pageSize);
+        page.setRecords(pageList);
+        page.setTotal(total);
+
+        log.info("📋 用户 {} 查询到 {} 条待审批申请，分页显示第 {} 页，共 {} 条",
+                currentUserName, total, pageNum, pageList.size());
+
+        return TableDataInfo.build(page);
+    }
+
     /**
      * 转换实体为VO对象
      * 🔴 修复：使用Mapper查询完整的VO对象，包含字典翻译等扩展信息
@@ -514,7 +664,7 @@ public class RsOverseasApplicationServiceImpl extends ServiceImpl<RsOverseasAppl
 
     /**
      * 提交出国申请（动态审批人方案）
-     * 
+     *
      * 🆕 核心改进：
      * 1. 不再设置固定的 current_approver_id（该字段改为冗余展示字段）
      * 2. 仅设置 approval_level='1'，审批人根据权限动态查询
@@ -599,7 +749,7 @@ public class RsOverseasApplicationServiceImpl extends ServiceImpl<RsOverseasAppl
         RsOverseasApproval approval = new RsOverseasApproval();
         approval.setApplicationId(applicationId);
         approval.setApproverId(approverId);
-        approval.setApproverName(approverName);
+        approval.setApproverName(resolveApproverDisplayName(approverId, approverName));
         approval.setApprovalLevel(application.getApprovalLevel());
         approval.setApprovalStatus(approvalStatus);
         approval.setApprovalOpinion(approvalOpinion);
@@ -721,7 +871,7 @@ public class RsOverseasApplicationServiceImpl extends ServiceImpl<RsOverseasAppl
 
     /**
      * 修复已审批通过但未创建记录的申请
-     * 
+     *
      * @return 修复的记录数量
      */
     @Override
@@ -950,6 +1100,16 @@ public class RsOverseasApplicationServiceImpl extends ServiceImpl<RsOverseasAppl
         entity.setStampedFileUploadTime(bo.getStampedFileUploadTime());
         entity.setStampedFileUploadStatus(bo.getStampedFileUploadStatus());
 
+        // ==================== 党籍保留附件相关字段 ====================
+        entity.setPartyRetentionFilePath(bo.getPartyRetentionFilePath());
+        entity.setPartyRetentionFileName(bo.getPartyRetentionFileName());
+        entity.setPartyRetentionUploadTime(bo.getPartyRetentionUploadTime());
+        entity.setPartyRetentionUploadStatus(bo.getPartyRetentionUploadStatus());
+        entity.setPartyRetentionFileOssId(bo.getPartyRetentionFileOssId());
+
+        // ==================== 附件ID列表 ====================
+        entity.setAttachmentIds(bo.getAttachmentIds());
+
         // ==================== 租户信息 ====================
         // 🔴 关键修复：设置租户ID（如果Bo中有值则使用Bo的值，否则依赖MyBatis-Plus自动填充）
         if (bo.getTenantId() != null) {
@@ -975,6 +1135,22 @@ public class RsOverseasApplicationServiceImpl extends ServiceImpl<RsOverseasAppl
         }
     }
 
+    /**
+     * 解析审批人的展示名称：优先使用用户昵称，缺省时回退账号
+     */
+    private String resolveApproverDisplayName(Long approverId, String fallbackName) {
+        String displayName = fallbackName;
+        try {
+            SysUserVo approver = userService.selectUserById(approverId);
+            if (approver != null && StringUtils.isNotBlank(approver.getNickName())) {
+                displayName = approver.getNickName();
+            }
+        } catch (Exception e) {
+            log.warn("⚠️ 获取审批人昵称失败, 使用账号作为展示名称. approverId={}, error={}", approverId, e.getMessage());
+        }
+        return displayName;
+    }
+
     /**
      * 批量删除出国申请
      */
@@ -1008,7 +1184,7 @@ public class RsOverseasApplicationServiceImpl extends ServiceImpl<RsOverseasAppl
     @Override
     @Transactional
     public Boolean updatePartyRetentionFileInfo(Long applicationId, String filePath, String fileName,
-            java.util.Date uploadTime, String uploadStatus, Long ossId) {
+            java.util.Date uploadTime, String uploadStatus, String ossId) {
         return baseMapper.update(null,
                 new LambdaUpdateWrapper<RsOverseasApplication>()
                         .eq(RsOverseasApplication::getApplicationId, applicationId)
@@ -1087,7 +1263,7 @@ public class RsOverseasApplicationServiceImpl extends ServiceImpl<RsOverseasAppl
 
     /**
      * 根据申请人ID获取部门审批人ID
-     * 
+     *
      * @param applicantId 申请人ID
      * @return 部门审批人ID
      */
@@ -1134,7 +1310,7 @@ public class RsOverseasApplicationServiceImpl extends ServiceImpl<RsOverseasAppl
 
     /**
      * 根据申请人ID获取人事处审批人列表
-     * 
+     *
      * @param applicantId 申请人ID
      * @return 人事处审批人ID列表
      */
@@ -1176,7 +1352,7 @@ public class RsOverseasApplicationServiceImpl extends ServiceImpl<RsOverseasAppl
 
     /**
      * 根据申请人查找对应的部门负责人审批人ID
-     * 
+     *
      * @param applicantId 申请人ID
      * @return 部门负责人审批人ID
      */
@@ -1203,7 +1379,7 @@ public class RsOverseasApplicationServiceImpl extends ServiceImpl<RsOverseasAppl
 
     /**
      * 根据部门ID查找对应的部门负责人审批人
-     * 
+     *
      * @param deptId 部门ID
      * @return 部门负责人审批人ID
      */
@@ -1251,7 +1427,7 @@ public class RsOverseasApplicationServiceImpl extends ServiceImpl<RsOverseasAppl
 
     /**
      * 查找父部门的负责人审批人
-     * 
+     *
      * @param deptId    当前部门ID
      * @param approvers 所有部门负责人审批人列表
      * @return 父部门负责人审批人ID
@@ -1288,7 +1464,7 @@ public class RsOverseasApplicationServiceImpl extends ServiceImpl<RsOverseasAppl
 
     /**
      * 根据审批级别获取下一级审批人ID
-     * 
+     *
      * @param approvalLevel 审批级别
      * @return 下一级审批人ID
      */
@@ -1298,7 +1474,7 @@ public class RsOverseasApplicationServiceImpl extends ServiceImpl<RsOverseasAppl
 
     /**
      * 根据审批级别获取审批环节描述
-     * 
+     *
      * @param approvalLevel 审批级别
      * @return 审批环节描述
      */
@@ -1321,14 +1497,14 @@ public class RsOverseasApplicationServiceImpl extends ServiceImpl<RsOverseasAppl
 
     /**
      * 🆕 根据当前登录用户的审批权限，获取其可审批的级别列表
-     * 
+     *
      * 权限到级别的映射：
      * - rs:overseas:approve1 → 审批级别 "1" (部门负责人)
      * - rs:overseas:approve2 → 审批级别 "2" (人事处)
      * - rs:overseas:approve3 → 审批级别 "3" (纪委)
      * - rs:overseas:approve4 → 审批级别 "4" (学院分管领导)
      * - rs:overseas:approve5 → 审批级别 "5" (学院党委书记)
-     * 
+     *
      * @param userId 用户ID
      * @return 可审批的级别列表，例如：["2", "3"]
      */
@@ -1371,7 +1547,7 @@ public class RsOverseasApplicationServiceImpl extends ServiceImpl<RsOverseasAppl
 
     /**
      * 🆕 根据审批级别获取对应的权限标识
-     * 
+     *
      * @param approvalLevel 审批级别（2-5）
      * @return 权限标识，例如："rs:overseas:approve2"
      */
@@ -1396,7 +1572,7 @@ public class RsOverseasApplicationServiceImpl extends ServiceImpl<RsOverseasAppl
 
     /**
      * 🔴 新增方法：验证审批人是否有指定级别的审批权限
-     * 
+     *
      * @param approverId    审批人ID
      * @param approvalLevel 需要的审批级别（1-5）
      * @return true-有权限，false-无权限
@@ -1423,4 +1599,4 @@ public class RsOverseasApplicationServiceImpl extends ServiceImpl<RsOverseasAppl
         return hasPermission;
     }
 
-}
\ No newline at end of file
+}
diff --git a/backend/ruoyi-modules/ruoyi-rs/src/main/java/org/dromara/rs/service/impl/RsOverseasApprovalMonitorServiceImpl.java b/backend/ruoyi-modules/ruoyi-rs/src/main/java/org/dromara/rs/service/impl/RsOverseasApprovalMonitorServiceImpl.java
index 352e2069..82e58af6 100644
--- a/backend/ruoyi-modules/ruoyi-rs/src/main/java/org/dromara/rs/service/impl/RsOverseasApprovalMonitorServiceImpl.java
+++ b/backend/ruoyi-modules/ruoyi-rs/src/main/java/org/dromara/rs/service/impl/RsOverseasApprovalMonitorServiceImpl.java
@@ -311,6 +311,7 @@ public class RsOverseasApprovalMonitorServiceImpl implements IRsOverseasApproval
         vo.setMobilePhone(application.getMobilePhone());
         vo.setContactPhone(application.getContactPhone());
         vo.setEmergencyContact(application.getEmergencyContact());
+        vo.setSignature(application.getSignature());
 
         // 审批状态信息
         vo.setStatus(application.getStatus());
diff --git a/backend/ruoyi-modules/ruoyi-rs/src/main/java/org/dromara/rs/service/impl/RsOverseasItineraryChangeServiceImpl.java b/backend/ruoyi-modules/ruoyi-rs/src/main/java/org/dromara/rs/service/impl/RsOverseasItineraryChangeServiceImpl.java
index 6bef51cc..5b69358d 100644
--- a/backend/ruoyi-modules/ruoyi-rs/src/main/java/org/dromara/rs/service/impl/RsOverseasItineraryChangeServiceImpl.java
+++ b/backend/ruoyi-modules/ruoyi-rs/src/main/java/org/dromara/rs/service/impl/RsOverseasItineraryChangeServiceImpl.java
@@ -6,6 +6,7 @@ import com.baomidou.mybatisplus.core.toolkit.Wrappers;
 import lombok.RequiredArgsConstructor;
 import lombok.extern.slf4j.Slf4j;
 import org.dromara.common.core.exception.ServiceException;
+import org.dromara.common.core.utils.StringUtils;
 import org.dromara.common.mybatis.core.page.TableDataInfo;
 import org.dromara.common.satoken.utils.LoginHelper;
 import org.dromara.rs.domain.RsOverseasItineraryChange;
@@ -13,14 +14,23 @@ import org.dromara.rs.domain.bo.RsOverseasItineraryChangeBo;
 import org.dromara.rs.domain.query.RsOverseasItineraryChangeQuery;
 import org.dromara.rs.domain.vo.RsOverseasItineraryChangeVo;
 import org.dromara.rs.mapper.RsOverseasItineraryChangeMapper;
+import org.dromara.rs.mapper.RsOverseasApplicationMapper;
+import org.dromara.rs.mapper.RsOverseasRecordMapper;
+import org.dromara.rs.domain.RsOverseasApplication;
+import org.dromara.rs.domain.RsOverseasRecord;
+import org.dromara.rs.domain.vo.RsOverseasRecordVo;
 import org.dromara.rs.service.IRsOverseasItineraryChangeService;
 import org.dromara.rs.service.IRsOverseasApplicationService;
+import org.dromara.rs.service.IRsOverseasRecordService;
 import org.springframework.stereotype.Service;
 import org.springframework.transaction.annotation.Transactional;
+import com.baomidou.mybatisplus.core.conditions.update.LambdaUpdateWrapper;
 
 import java.util.Arrays;
+import java.util.ArrayList;
 import java.util.Date;
 import java.util.List;
+import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
 
 /**
  * 出国行程变更申请Service业务层处理
@@ -35,14 +45,38 @@ public class RsOverseasItineraryChangeServiceImpl implements IRsOverseasItinerar
 
     private final RsOverseasItineraryChangeMapper changeMapper;
     private final IRsOverseasApplicationService applicationService;
+    private final RsOverseasApplicationMapper applicationMapper;
+    private final IRsOverseasRecordService recordService;
+    private final RsOverseasRecordMapper recordMapper;
 
     /**
      * 查询出国行程变更申请分页列表
      */
     @Override
     public TableDataInfo<RsOverseasItineraryChangeVo> queryPageList(RsOverseasItineraryChangeQuery query) {
+        // 查询所有符合条件的数据（不分页）
         List<RsOverseasItineraryChangeVo> list = changeMapper.selectChangeList(query);
-        return TableDataInfo.build(list);
+
+        // 手动分页处理
+        int pageNum = query.getPageNum();
+        int pageSize = query.getPageSize();
+        int total = list.size();
+        int start = (pageNum - 1) * pageSize;
+        int end = Math.min(start + pageSize, total);
+
+        List<RsOverseasItineraryChangeVo> pageList;
+        if (start >= total) {
+            pageList = new ArrayList<>();
+        } else {
+            pageList = list.subList(start, end);
+        }
+
+        // 构建分页对象
+        Page<RsOverseasItineraryChangeVo> page = new Page<>(pageNum, pageSize);
+        page.setRecords(pageList);
+        page.setTotal(total);
+
+        return TableDataInfo.build(page);
     }
 
     /**
@@ -89,11 +123,12 @@ public class RsOverseasItineraryChangeServiceImpl implements IRsOverseasItinerar
     @Transactional(rollbackFor = Exception.class)
     public Boolean insertByBo(RsOverseasItineraryChangeBo bo) {
         // 查询出国申请信息
-        org.dromara.rs.domain.vo.RsOverseasApplicationVo application = applicationService.queryById(bo.getApplicationId());
+        org.dromara.rs.domain.vo.RsOverseasApplicationVo application = applicationService
+                .queryById(bo.getApplicationId());
         if (application == null) {
             throw new ServiceException("出国申请不存在");
         }
-        
+
         // 检查申请状态是否为已通过
         if (!"1".equals(application.getStatus())) {
             throw new ServiceException("只能为已通过审批的出国申请提交变更申请");
@@ -102,8 +137,8 @@ public class RsOverseasItineraryChangeServiceImpl implements IRsOverseasItinerar
         // 检查是否有未完成的变更申请
         LambdaQueryWrapper<RsOverseasItineraryChange> wrapper = Wrappers.lambdaQuery();
         wrapper.eq(RsOverseasItineraryChange::getApplicationId, bo.getApplicationId())
-            .in(RsOverseasItineraryChange::getStatus, Arrays.asList("0")) // 待审核
-            .eq(RsOverseasItineraryChange::getDeleted, 0);
+                .in(RsOverseasItineraryChange::getStatus, Arrays.asList("0")) // 待审核
+                .eq(RsOverseasItineraryChange::getDeleted, 0);
         Long count = changeMapper.selectCount(wrapper);
         if (count > 0) {
             throw new ServiceException("该出国申请已有待审核的变更申请，请先处理");
@@ -117,11 +152,12 @@ public class RsOverseasItineraryChangeServiceImpl implements IRsOverseasItinerar
         entity.setApplicantId(userId);
         entity.setApplicantName(LoginHelper.getUsername());
         entity.setApplicationId(bo.getApplicationId());
-        
+
         // 从出国申请中复制原始信息
         entity.setOriginalDestination(application.getDestination());
         entity.setOriginalDestinationCity(application.getDestinationCity());
-        entity.setOriginalExitReason(application.getExitReason() != null ? application.getExitReason() : application.getPurposeDetail());
+        entity.setOriginalExitReason(
+                application.getExitReason() != null ? application.getExitReason() : application.getPurposeDetail());
         entity.setOriginalStartDate(application.getStartDate());
         entity.setOriginalEndDate(application.getEndDate());
         entity.setOriginalDuration(application.getDuration());
@@ -148,9 +184,10 @@ public class RsOverseasItineraryChangeServiceImpl implements IRsOverseasItinerar
             throw new ServiceException("变更申请不存在");
         }
 
-        // 只有待审核或已拒绝的申请可以修改
-        if (!"0".equals(original.getStatus()) && !"2".equals(original.getStatus())) {
-            throw new ServiceException("只有待审核或已拒绝的变更申请可以修改");
+        // 只有待审核、已拒绝或已撤回的申请可以修改
+        if (!"0".equals(original.getStatus()) && !"2".equals(original.getStatus())
+                && !"3".equals(original.getStatus())) {
+            throw new ServiceException("只有待审核、已拒绝或已撤回的变更申请可以修改");
         }
 
         // 检查权限：只能修改自己的申请
@@ -161,7 +198,7 @@ public class RsOverseasItineraryChangeServiceImpl implements IRsOverseasItinerar
 
         // 转换BO到Entity
         RsOverseasItineraryChange entity = BeanUtil.toBean(bo, RsOverseasItineraryChange.class);
-        
+
         // 重新提交时，状态改为待审核
         entity.setStatus("0");
         entity.setApprovalOpinion(null);
@@ -179,24 +216,24 @@ public class RsOverseasItineraryChangeServiceImpl implements IRsOverseasItinerar
     @Transactional(rollbackFor = Exception.class)
     public Boolean deleteByIds(List<Long> changeIds) {
         Long userId = LoginHelper.getUserId();
-        
+
         for (Long changeId : changeIds) {
             RsOverseasItineraryChange change = changeMapper.selectById(changeId);
             if (change == null) {
                 continue;
             }
-            
+
             // 检查权限：只能删除自己的申请
             if (!userId.equals(change.getApplicantId())) {
                 throw new ServiceException("只能删除自己的变更申请");
             }
-            
+
             // 只有待审核或已拒绝的申请可以删除
             if (!"0".equals(change.getStatus()) && !"2".equals(change.getStatus())) {
                 throw new ServiceException("只有待审核或已拒绝的变更申请可以删除");
             }
         }
-        
+
         return changeMapper.deleteBatchIds(changeIds) > 0;
     }
 
@@ -229,6 +266,12 @@ public class RsOverseasItineraryChangeServiceImpl implements IRsOverseasItinerar
 
     /**
      * 审批变更申请
+     *
+     * 🔴 审批通过后，需要更新原申请单和记录的数据：
+     * 1. 前往国家 → 更新到 rs_overseas_application 和 rs_overseas_record
+     * 2. 实际出行开始时间、结束时间 → 更新到 rs_overseas_application 和 rs_overseas_record
+     * 3. 行程安排 → 更新到 rs_overseas_application 和 rs_overseas_record
+     * 4. 出境事由 → 追加到 rs_overseas_application 的备注字段
      */
     @Override
     @Transactional(rollbackFor = Exception.class)
@@ -249,9 +292,139 @@ public class RsOverseasItineraryChangeServiceImpl implements IRsOverseasItinerar
         change.setApprovalOpinion(opinion);
         change.setApprovalTime(new Date());
         change.setApproverId(userId);
-        change.setApproverName(LoginHelper.getUsername());
+        String displayName = StringUtils.defaultIfBlank(LoginHelper.getNickname(), LoginHelper.getUsername());
+        change.setApproverName(displayName);
 
-        return changeMapper.updateById(change) > 0;
+        // 更新变更申请状态
+        boolean updateChangeResult = changeMapper.updateById(change) > 0;
+        if (!updateChangeResult) {
+            throw new ServiceException("更新变更申请状态失败");
+        }
+
+        // 🔴 如果审批通过，需要更新原申请单和记录的数据
+        if (approved && change.getApplicationId() != null) {
+            log.info("🔧 [审批通过] 开始更新原申请单和记录数据，变更ID: {}, 申请ID: {}", changeId, change.getApplicationId());
+
+            try {
+                // 1. 更新 rs_overseas_application 表
+                RsOverseasApplication application = applicationMapper.selectById(change.getApplicationId());
+                if (application != null) {
+                    LambdaUpdateWrapper<RsOverseasApplication> appUpdateWrapper = new LambdaUpdateWrapper<>();
+                    appUpdateWrapper.eq(RsOverseasApplication::getApplicationId, change.getApplicationId());
+
+                    // 更新前往国家（destination 和 destinationCountry 同步更新）
+                    if (change.getNewDestination() != null && !change.getNewDestination().trim().isEmpty()) {
+                        appUpdateWrapper.set(RsOverseasApplication::getDestination, change.getNewDestination());
+                        appUpdateWrapper.set(RsOverseasApplication::getDestinationCountry, change.getNewDestination());
+                        log.info("✅ [更新申请单] 前往国家: {} (同步更新 destination 和 destinationCountry)",
+                                change.getNewDestination());
+                    }
+
+                    // 更新出发日期和返回日期
+                    if (change.getNewStartDate() != null) {
+                        appUpdateWrapper.set(RsOverseasApplication::getStartDate, change.getNewStartDate());
+                        log.info("✅ [更新申请单] 出发日期: {}", change.getNewStartDate());
+                    }
+                    if (change.getNewEndDate() != null) {
+                        appUpdateWrapper.set(RsOverseasApplication::getEndDate, change.getNewEndDate());
+                        log.info("✅ [更新申请单] 返回日期: {}", change.getNewEndDate());
+
+                        // 重新计算出国天数
+                        if (change.getNewStartDate() != null && change.getNewEndDate() != null) {
+                            long diffInMillies = change.getNewEndDate().getTime() - change.getNewStartDate().getTime();
+                            int days = (int) (diffInMillies / (1000 * 60 * 60 * 24)) + 1;
+                            appUpdateWrapper.set(RsOverseasApplication::getDuration, days);
+                            log.info("✅ [更新申请单] 出国天数: {} 天", days);
+                        }
+                    }
+
+                    // 更新行程安排
+                    if (change.getNewItinerary() != null && !change.getNewItinerary().trim().isEmpty()) {
+                        appUpdateWrapper.set(RsOverseasApplication::getItinerary, change.getNewItinerary());
+                        log.info("✅ [更新申请单] 行程安排已更新");
+                    }
+
+                    // 追加出境事由到备注字段
+                    if (change.getNewExitReason() != null && !change.getNewExitReason().trim().isEmpty()) {
+                        String currentRemarks = application.getRemarks() != null ? application.getRemarks() : "";
+                        String newRemarks = currentRemarks.isEmpty()
+                                ? "行程变更-出境事由: " + change.getNewExitReason()
+                                : currentRemarks + "\n行程变更-出境事由: " + change.getNewExitReason();
+                        appUpdateWrapper.set(RsOverseasApplication::getRemarks, newRemarks);
+                        log.info("✅ [更新申请单] 备注已追加出境事由: {}", change.getNewExitReason());
+                    }
+
+                    boolean appUpdateResult = applicationMapper.update(null, appUpdateWrapper) > 0;
+                    if (!appUpdateResult) {
+                        log.warn("⚠️ [更新申请单] 更新失败，申请ID: {}", change.getApplicationId());
+                    } else {
+                        log.info("✅ [更新申请单] 更新成功，申请ID: {}", change.getApplicationId());
+                    }
+                } else {
+                    log.warn("⚠️ [更新申请单] 申请单不存在，申请ID: {}", change.getApplicationId());
+                }
+
+                // 2. 更新 rs_overseas_record 表
+                RsOverseasRecordVo recordVo = recordMapper
+                        .selectOverseasRecordByApplicationId(change.getApplicationId());
+                if (recordVo != null) {
+                    RsOverseasRecord record = recordMapper.selectById(recordVo.getRecordId());
+                    if (record != null) {
+                        LambdaUpdateWrapper<RsOverseasRecord> recordUpdateWrapper = new LambdaUpdateWrapper<>();
+                        recordUpdateWrapper.eq(RsOverseasRecord::getRecordId, record.getRecordId());
+
+                        // 更新前往国家
+                        if (change.getNewDestination() != null && !change.getNewDestination().trim().isEmpty()) {
+                            recordUpdateWrapper.set(RsOverseasRecord::getDestination, change.getNewDestination());
+                            log.info("✅ [更新记录] 前往国家: {}", change.getNewDestination());
+                        }
+
+                        // 更新实际开始日期和结束日期
+                        if (change.getNewStartDate() != null) {
+                            recordUpdateWrapper.set(RsOverseasRecord::getActualStartDate, change.getNewStartDate());
+                            log.info("✅ [更新记录] 实际开始日期: {}", change.getNewStartDate());
+                        }
+                        if (change.getNewEndDate() != null) {
+                            recordUpdateWrapper.set(RsOverseasRecord::getActualEndDate, change.getNewEndDate());
+                            log.info("✅ [更新记录] 实际结束日期: {}", change.getNewEndDate());
+
+                            // 重新计算实际出国天数
+                            if (change.getNewStartDate() != null && change.getNewEndDate() != null) {
+                                long diffInMillies = change.getNewEndDate().getTime()
+                                        - change.getNewStartDate().getTime();
+                                int days = (int) (diffInMillies / (1000 * 60 * 60 * 24)) + 1;
+                                recordUpdateWrapper.set(RsOverseasRecord::getActualDuration, days);
+                                log.info("✅ [更新记录] 实际出国天数: {} 天", days);
+                            }
+                        }
+
+                        // 更新行程安排
+                        if (change.getNewItinerary() != null && !change.getNewItinerary().trim().isEmpty()) {
+                            recordUpdateWrapper.set(RsOverseasRecord::getItinerary, change.getNewItinerary());
+                            log.info("✅ [更新记录] 行程安排已更新");
+                        }
+
+                        boolean recordUpdateResult = recordMapper.update(null, recordUpdateWrapper) > 0;
+                        if (!recordUpdateResult) {
+                            log.warn("⚠️ [更新记录] 更新失败，记录ID: {}", record.getRecordId());
+                        } else {
+                            log.info("✅ [更新记录] 更新成功，记录ID: {}", record.getRecordId());
+                        }
+                    } else {
+                        log.warn("⚠️ [更新记录] 记录不存在，记录ID: {}", recordVo.getRecordId());
+                    }
+                } else {
+                    log.warn("⚠️ [更新记录] 未找到关联记录，申请ID: {}", change.getApplicationId());
+                }
+
+                log.info("✅ [审批通过] 数据更新完成，变更ID: {}", changeId);
+            } catch (Exception e) {
+                log.error("❌ [审批通过] 更新原申请单和记录数据失败，变更ID: {}, 错误: {}", changeId, e.getMessage(), e);
+                throw new ServiceException("审批通过后更新原申请单和记录数据失败: " + e.getMessage());
+            }
+        }
+
+        return true;
     }
 
     /**
@@ -262,4 +435,3 @@ public class RsOverseasItineraryChangeServiceImpl implements IRsOverseasItinerar
         return changeMapper.selectChangeListByRecordId(recordId);
     }
 }
-
diff --git a/backend/ruoyi-modules/ruoyi-rs/src/main/resources/mapper/rs/RsOverseasApplicationMapper.xml b/backend/ruoyi-modules/ruoyi-rs/src/main/resources/mapper/rs/RsOverseasApplicationMapper.xml
index 9563709c..f017d21a 100644
--- a/backend/ruoyi-modules/ruoyi-rs/src/main/resources/mapper/rs/RsOverseasApplicationMapper.xml
+++ b/backend/ruoyi-modules/ruoyi-rs/src/main/resources/mapper/rs/RsOverseasApplicationMapper.xml
@@ -617,5 +617,42 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
         </if>
         ORDER BY a.apply_time DESC, a.create_time DESC
     </select>
+
+    <!-- 🔴 新增：根据角色查询待审批申请列表（支持分页和搜索） -->
+    <select id="selectPendingApplicationsByRole" resultMap="RsOverseasApplicationVoResult">
+        <include refid="selectOverseasApplicationVo"/>
+        <where>
+            oa.deleted = '0'
+            AND oa.status = '0'
+            <!-- 审批级别过滤 -->
+            <if test="approvalLevels != null and approvalLevels.size() > 0">
+                AND oa.approval_level IN
+                <foreach collection="approvalLevels" item="level" open="(" separator="," close=")">
+                    #{level}
+                </foreach>
+            </if>
+            <!-- 部门过滤（仅对部门负责人生效） -->
+            <if test="deptId != null">
+                AND EXISTS (
+                    SELECT 1 FROM sys_user u 
+                    WHERE u.user_id = oa.applicant_id
+                    AND u.dept_id = #{deptId}
+                )
+            </if>
+            <!-- 搜索条件：前往国家 -->
+            <if test="query != null and query.destination != null and query.destination != ''">
+                AND oa.destination LIKE CONCAT('%', #{query.destination}, '%')
+            </if>
+            <!-- 搜索条件：出境事由 -->
+            <if test="query != null and query.exitReason != null and query.exitReason != ''">
+                AND oa.exit_reason = #{query.exitReason}
+            </if>
+            <!-- 租户过滤 -->
+            <if test="query != null and query.tenantId != null and query.tenantId != ''">
+                AND oa.tenant_id = #{query.tenantId}
+            </if>
+        </where>
+        ORDER BY oa.create_time DESC
+    </select>
     
 </mapper> 
\ No newline at end of file
diff --git a/backend/ruoyi-modules/ruoyi-rs/src/main/resources/mapper/rs/RsOverseasRecordMapper.xml b/backend/ruoyi-modules/ruoyi-rs/src/main/resources/mapper/rs/RsOverseasRecordMapper.xml
index 27d09569..7c57722c 100644
--- a/backend/ruoyi-modules/ruoyi-rs/src/main/resources/mapper/rs/RsOverseasRecordMapper.xml
+++ b/backend/ruoyi-modules/ruoyi-rs/src/main/resources/mapper/rs/RsOverseasRecordMapper.xml
@@ -74,8 +74,8 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
     <sql id="selectOverseasRecordDetailVo">
         select 
             ors.record_id, ors.application_id, ors.applicant_id, ors.applicant_name, ors.department, 
-            ors.position, 
-            COALESCE(sp.post_name, ors.position) as position_text,
+            oa.position, 
+            oa.position as position_text,
             ors.contact_phone, ors.contact_email, ors.purpose, ors.purpose_detail, ors.destination, ors.destination_city,
             ors.actual_start_date, ors.actual_end_date, ors.actual_duration, ors.actual_budget,
             ors.invitation, ors.itinerary, ors.accommodation_plan, ors.transportation_plan,
@@ -134,7 +134,6 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
             'record' as data_source
         from rs_overseas_record ors
         left join rs_overseas_application oa on ors.application_id = oa.application_id and oa.deleted = '0'
-        left join sys_post sp on (ors.position = CAST(sp.post_id AS CHAR) or ors.position = sp.post_code) and sp.status = '0'
     </sql>
 
     <!-- 联合查询：出国记录 + 已完成审批的申请 -->
@@ -142,8 +141,8 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
         -- 查询已创建的出国记录（关联申请表获取扩展字段）
         select 
             ors.record_id, ors.application_id, ors.applicant_id, ors.applicant_name, ors.department, 
-            ors.position, 
-            COALESCE(sp1.post_name, ors.position) as position_text,
+            oa.position, 
+            oa.position as position_text,
             ors.contact_phone, ors.contact_email, ors.purpose, ors.purpose_detail, ors.destination, ors.destination_city,
             ors.actual_start_date as actual_start_date, ors.actual_end_date as actual_end_date, ors.actual_duration as actual_duration, 
             ors.actual_budget as actual_budget,
@@ -212,7 +211,6 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
             'record' as data_source
         from rs_overseas_record ors
         left join rs_overseas_application oa on ors.application_id = oa.application_id and oa.deleted = '0'
-        left join sys_post sp1 on (ors.position = CAST(sp1.post_id AS CHAR) or ors.position = sp1.post_code) and sp1.status = '0'
         where ors.deleted = '0'
         
         UNION ALL
@@ -222,7 +220,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
             NULL as record_id,
             oa.application_id, oa.applicant_id, oa.applicant_name, oa.department, 
             oa.position, 
-            COALESCE(sp2.post_name, oa.position) as position_text,
+            oa.position as position_text,
             oa.contact_phone, oa.contact_email, oa.purpose, oa.purpose_detail, oa.destination, oa.destination_city,
             oa.start_date as actual_start_date, oa.end_date as actual_end_date, oa.duration as actual_duration, 
             NULL as actual_budget,
@@ -284,7 +282,6 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
             '进行中' as completion_status_text,
             'approved_application' as data_source
         from rs_overseas_application oa
-        left join sys_post sp2 on (oa.position = CAST(sp2.post_id AS CHAR) or oa.position = sp2.post_code) and sp2.status = '0'
         where oa.deleted = '0'
         and oa.status = '1'
         and not exists (
diff --git a/backend/ruoyi-modules/ruoyi-rs/src/main/resources/mapper/rs/recruitment.sql b/backend/ruoyi-modules/ruoyi-rs/src/main/resources/mapper/rs/recruitment.sql
deleted file mode 100644
index 48cd1b6a..00000000
--- a/backend/ruoyi-modules/ruoyi-rs/src/main/resources/mapper/rs/recruitment.sql
+++ /dev/null
@@ -1,142 +0,0 @@
--- 招聘模块表结构
--- 创建于 2025-07-02
-
--- 职位表
-DROP TABLE IF EXISTS `rs_job`;
-CREATE TABLE `rs_job` (
-  `job_id` bigint(20) NOT NULL COMMENT '职位ID',
-  `title` varchar(100) NOT NULL COMMENT '职位名称',
-  `department` varchar(50) NOT NULL COMMENT '部门',
-  `salary_range` varchar(50) DEFAULT NULL COMMENT '薪资范围',
-  `location` varchar(100) DEFAULT NULL COMMENT '工作地点',
-  `description` text COMMENT '职位描述',
-  `requirements` text COMMENT '任职要求',
-  `is_active` char(1) DEFAULT '0' COMMENT '是否在招（0是 1否）',
-  `publish_time` datetime DEFAULT NULL COMMENT '发布时间',
-  `view_count` int(11) DEFAULT '0' COMMENT '浏览次数',
-  `tenant_id` varchar(20) DEFAULT '000000' COMMENT '租户编号',
-  `create_dept` bigint(20) DEFAULT NULL COMMENT '创建部门',
-  `create_by` bigint(20) DEFAULT NULL COMMENT '创建者',
-  `create_time` datetime DEFAULT NULL COMMENT '创建时间',
-  `update_by` bigint(20) DEFAULT NULL COMMENT '更新者',
-  `update_time` datetime DEFAULT NULL COMMENT '更新时间',
-  `remark` varchar(500) DEFAULT NULL COMMENT '备注',
-  `deleted` char(1) DEFAULT '0' COMMENT '删除标志（0代表存在 1代表删除）',
-  PRIMARY KEY (`job_id`),
-  KEY `idx_department` (`department`),
-  KEY `idx_is_active` (`is_active`)
-) ENGINE=InnoDB COMMENT='招聘职位表';
-
--- 应聘者表
-DROP TABLE IF EXISTS `rs_applicant`;
-CREATE TABLE `rs_applicant` (
-  `applicant_id` bigint(20) NOT NULL COMMENT '应聘者ID',
-  `user_id` bigint(20) DEFAULT NULL COMMENT '关联用户ID',
-  `name` varchar(50) NOT NULL COMMENT '姓名',
-  `phone` varchar(20) NOT NULL COMMENT '手机号码',
-  `email` varchar(100) NOT NULL COMMENT '电子邮箱',
-  `resume_file_path` varchar(255) DEFAULT NULL COMMENT '简历文件路径',
-  `self_intro` text COMMENT '自我介绍',
-  `current_status` varchar(20) DEFAULT 'active' COMMENT '当前状态（active-可申请 hired-已录用 rejected-已拒绝）',
-  `tenant_id` varchar(20) DEFAULT '000000' COMMENT '租户编号',
-  `create_by` bigint(20) DEFAULT NULL COMMENT '创建者',
-  `create_time` datetime DEFAULT NULL COMMENT '创建时间',
-  `update_by` bigint(20) DEFAULT NULL COMMENT '更新者',
-  `update_time` datetime DEFAULT NULL COMMENT '更新时间',
-  `remark` varchar(500) DEFAULT NULL COMMENT '备注',
-  `deleted` char(1) DEFAULT '0' COMMENT '删除标志（0代表存在 1代表删除）',
-  PRIMARY KEY (`applicant_id`),
-  KEY `idx_user_id` (`user_id`),
-  KEY `idx_phone` (`phone`)
-) ENGINE=InnoDB COMMENT='应聘者信息表';
-
--- 教育经历表
-DROP TABLE IF EXISTS `rs_education`;
-CREATE TABLE `rs_education` (
-  `edu_id` bigint(20) NOT NULL COMMENT '教育经历ID',
-  `applicant_id` bigint(20) NOT NULL COMMENT '应聘者ID',
-  `school_name` varchar(100) NOT NULL COMMENT '学校名称',
-  `major` varchar(100) DEFAULT NULL COMMENT '专业',
-  `degree` varchar(50) DEFAULT NULL COMMENT '学位',
-  `start_date` date DEFAULT NULL COMMENT '开始日期',
-  `end_date` date DEFAULT NULL COMMENT '结束日期',
-  `gpa` varchar(20) DEFAULT NULL COMMENT '绩点',
-  `description` text COMMENT '描述',
-  `tenant_id` varchar(20) DEFAULT '000000' COMMENT '租户编号',
-  `create_by` bigint(20) DEFAULT NULL COMMENT '创建者',
-  `create_time` datetime DEFAULT NULL COMMENT '创建时间',
-  `update_by` bigint(20) DEFAULT NULL COMMENT '更新者',
-  `update_time` datetime DEFAULT NULL COMMENT '更新时间',
-  `deleted` char(1) DEFAULT '0' COMMENT '删除标志（0代表存在 1代表删除）',
-  PRIMARY KEY (`edu_id`),
-  KEY `idx_applicant_id` (`applicant_id`)
-) ENGINE=InnoDB COMMENT='教育经历表';
-
--- 工作经历表
-DROP TABLE IF EXISTS `rs_work_experience`;
-CREATE TABLE `rs_work_experience` (
-  `exp_id` bigint(20) NOT NULL COMMENT '工作经历ID',
-  `applicant_id` bigint(20) NOT NULL COMMENT '应聘者ID',
-  `company_name` varchar(100) NOT NULL COMMENT '公司名称',
-  `position` varchar(100) NOT NULL COMMENT '职位',
-  `start_date` date DEFAULT NULL COMMENT '开始日期',
-  `end_date` date DEFAULT NULL COMMENT '结束日期',
-  `is_current` char(1) DEFAULT '0' COMMENT '是否当前工作（0是 1否）',
-  `description` text COMMENT '工作描述',
-  `tenant_id` varchar(20) DEFAULT '000000' COMMENT '租户编号',
-  `create_by` bigint(20) DEFAULT NULL COMMENT '创建者',
-  `create_time` datetime DEFAULT NULL COMMENT '创建时间',
-  `update_by` bigint(20) DEFAULT NULL COMMENT '更新者',
-  `update_time` datetime DEFAULT NULL COMMENT '更新时间',
-  `deleted` char(1) DEFAULT '0' COMMENT '删除标志（0代表存在 1代表删除）',
-  PRIMARY KEY (`exp_id`),
-  KEY `idx_applicant_id` (`applicant_id`)
-) ENGINE=InnoDB COMMENT='工作经历表';
-
--- 申请记录表
-DROP TABLE IF EXISTS `rs_application`;
-CREATE TABLE `rs_application` (
-  `application_id` bigint(20) NOT NULL COMMENT '申请ID',
-  `job_id` bigint(20) NOT NULL COMMENT '职位ID',
-  `applicant_id` bigint(20) NOT NULL COMMENT '应聘者ID',
-  `apply_time` datetime NOT NULL COMMENT '申请时间',
-  `status` varchar(20) DEFAULT 'pending' COMMENT '状态（pending-待处理 interviewed-已面试 offered-已录用 rejected-已拒绝）',
-  `hr_notes` text COMMENT 'HR备注',
-  `tenant_id` varchar(20) DEFAULT '000000' COMMENT '租户编号',
-  `create_by` bigint(20) DEFAULT NULL COMMENT '创建者',
-  `create_time` datetime DEFAULT NULL COMMENT '创建时间',
-  `update_by` bigint(20) DEFAULT NULL COMMENT '更新者',
-  `update_time` datetime DEFAULT NULL COMMENT '更新时间',
-  `remark` varchar(500) DEFAULT NULL COMMENT '备注',
-  `deleted` char(1) DEFAULT '0' COMMENT '删除标志（0代表存在 1代表删除）',
-  PRIMARY KEY (`application_id`),
-  KEY `idx_job_id` (`job_id`),
-  KEY `idx_applicant_id` (`applicant_id`),
-  KEY `idx_status` (`status`)
-) ENGINE=InnoDB COMMENT='申请记录表';
-
--- 附件表
-DROP TABLE IF EXISTS `rs_attachment`;
-CREATE TABLE `rs_attachment` (
-  `attachment_id` bigint(20) NOT NULL COMMENT '附件ID',
-  `application_id` bigint(20) NOT NULL COMMENT '申请ID',
-  `file_name` varchar(100) NOT NULL COMMENT '文件名',
-  `file_path` varchar(255) NOT NULL COMMENT '文件路径',
-  `file_type` varchar(50) DEFAULT NULL COMMENT '文件类型',
-  `file_size` bigint(20) DEFAULT NULL COMMENT '文件大小(字节)',
-  `tenant_id` varchar(20) DEFAULT '000000' COMMENT '租户编号',
-  `create_by` bigint(20) DEFAULT NULL COMMENT '创建者',
-  `create_time` datetime DEFAULT NULL COMMENT '创建时间',
-  `update_by` bigint(20) DEFAULT NULL COMMENT '更新者',
-  `update_time` datetime DEFAULT NULL COMMENT '更新时间',
-  `deleted` char(1) DEFAULT '0' COMMENT '删除标志（0代表存在 1代表删除）',
-  PRIMARY KEY (`attachment_id`),
-  KEY `idx_application_id` (`application_id`)
-) ENGINE=InnoDB COMMENT='申请附件表';
-
--- 插入初始测试数据
-INSERT INTO `rs_job` (`job_id`, `title`, `department`, `salary_range`, `location`, `description`, `requirements`, `is_active`, `create_time`, `create_by`, `update_time`, `update_by`, `remark`, `deleted`, `tenant_id`)
-VALUES
-(1, '高级Java开发工程师', '教学', '15k-25k', '杭州', '负责校园教学管理系统的开发和维护，参与核心模块设计与实现，优化系统性能，解决技术难题。\n作为团队核心成员，参与技术方案评审，指导初级开发人员，确保项目按时高质量交付。', '计算机相关专业本科及以上学历，3年以上Java开发经验\n精通Java核心技术，熟悉Spring Boot、MyBatis等主流框架\n熟练掌握MySQL数据库设计与优化\n有教育行业相关系统开发经验者优先\n良好的沟通能力和团队协作精神', '0', NOW(), 1, NOW(), 1, '示例职位', '0', '000000'),
-(2, '前端工程师', '教学', '12k-18k', '杭州', '负责校园教学管理系统前端开发，使用Vue3+TypeScript技术栈，参与UI设计与实现', '计算机相关专业本科及以上学历，2年以上前端开发经验\n精通HTML5/CSS3/JavaScript，熟悉Vue3/React等主流框架\n熟练使用TypeScript进行开发\n有教育行业相关系统开发经验者优先', '0', NOW(), 1, NOW(), 1, '示例职位', '0', '000000'),
-(3, '行政助理', '行政', '5k-8k', '杭州', '协助部门主管处理日常行政事务，包括文件整理、会议安排、接待来访等工作', '大专及以上学历，行政管理相关专业优先\n熟悉办公软件，有较强的文字处理能力\n工作认真负责，有较强的组织协调能力\n有相关工作经验者优先', '0', NOW(), 1, NOW(), 1, '示例职位', '0', '000000'); 
\ No newline at end of file
diff --git a/backend/ruoyi-modules/ruoyi-rs/src/main/resources/mapper/rs/remove-submit-count-field.sql b/backend/ruoyi-modules/ruoyi-rs/src/main/resources/mapper/rs/remove-submit-count-field.sql
deleted file mode 100644
index c52e4f53..00000000
--- a/backend/ruoyi-modules/ruoyi-rs/src/main/resources/mapper/rs/remove-submit-count-field.sql
+++ /dev/null
@@ -1,11 +0,0 @@
--- -----------------------------
--- 删除培训申请表中的提交次数字段
--- -----------------------------
-
--- 删除 rs_training_application 表中的 submit_count 字段
--- 注意：MySQL 5.7及以下版本不支持 DROP COLUMN IF EXISTS 语法
--- 需要先检查字段是否存在，然后删除
-ALTER TABLE rs_training_application DROP COLUMN submit_count;
-
--- 验证字段已删除
-DESCRIBE rs_training_application; 
\ No newline at end of file
diff --git a/backend/ruoyi-modules/ruoyi-rs/src/main/resources/mapper/rs/training-data-consistency-check.sql b/backend/ruoyi-modules/ruoyi-rs/src/main/resources/mapper/rs/training-data-consistency-check.sql
deleted file mode 100644
index cc29e1c1..00000000
--- a/backend/ruoyi-modules/ruoyi-rs/src/main/resources/mapper/rs/training-data-consistency-check.sql
+++ /dev/null
@@ -1,62 +0,0 @@
--- -----------------------------
--- 培训审批数据一致性检查和修复
--- -----------------------------
-
--- 检查审批记录表是否为空
-SELECT COUNT(*) AS approval_count FROM rs_training_approval WHERE deleted = '0';
-
--- 检查审批记录与申请记录是否一致
-SELECT 
-  COUNT(*) AS inconsistent_count 
-FROM 
-  rs_training_approval a 
-LEFT JOIN 
-  rs_training_application app ON a.application_id = app.application_id
-WHERE 
-  a.deleted = '0' 
-  AND (app.application_id IS NULL OR app.deleted = '1');
-
--- 插入测试数据（如果没有审批记录）
-INSERT INTO rs_training_approval (
-  approval_id, application_id, approver_id, approver_name, 
-  approval_level, status, opinion, approval_time, tenant_id, 
-  create_by, create_time, deleted
-)
-SELECT 
-  FLOOR(RAND() * 1000000) + 100000, -- 随机审批ID
-  app.application_id, -- 使用真实申请ID
-  app.create_by, -- 使用申请的创建者ID作为审批人ID
-  (SELECT user_name FROM sys_user WHERE user_id = app.create_by LIMIT 1), -- 获取用户名
-  1, -- 审批级别
-  app.status, -- 使用申请状态
-  '系统自动生成的测试审批记录', -- 审批意见
-  app.update_time, -- 使用申请更新时间作为审批时间
-  app.tenant_id, -- 租户ID
-  app.create_by, -- 创建者
-  NOW(), -- 创建时间
-  '0' -- 未删除
-FROM 
-  rs_training_application app
-WHERE 
-  app.deleted = '0' 
-  AND app.status IN ('1', '2') -- 已通过或已拒绝
-  AND NOT EXISTS (
-    SELECT 1 
-    FROM rs_training_approval a 
-    WHERE a.application_id = app.application_id AND a.deleted = '0'
-  )
-LIMIT 5; -- 限制生成5条测试数据
-
--- 查询生成的测试数据
-SELECT 
-  a.approval_id, a.application_id, a.approver_name, a.status, a.opinion, a.approval_time,
-  app.user_name AS applicant_name, app.reason
-FROM 
-  rs_training_approval a
-JOIN 
-  rs_training_application app ON a.application_id = app.application_id
-WHERE 
-  a.deleted = '0'
-  AND a.create_time > DATE_SUB(NOW(), INTERVAL 1 HOUR) -- 最近一小时创建的记录
-ORDER BY 
-  a.create_time DESC; 
\ No newline at end of file
diff --git a/backend/ruoyi-modules/ruoyi-rs/src/main/resources/mapper/rs/training-demo-data.sql b/backend/ruoyi-modules/ruoyi-rs/src/main/resources/mapper/rs/training-demo-data.sql
deleted file mode 100644
index 47200bdb..00000000
--- a/backend/ruoyi-modules/ruoyi-rs/src/main/resources/mapper/rs/training-demo-data.sql
+++ /dev/null
@@ -1,38 +0,0 @@
--- ----------------------------
--- 培训管理模块测试数据
--- ----------------------------
-
--- ----------------------------
--- 培训课程表测试数据
--- ----------------------------
-INSERT INTO `rs_training_course` (`course_id`, `title`, `description`, `instructor`, `duration`, `location`, `capacity`, `status`, `start_time`, `end_time`, `tenant_id`, `create_by`, `create_time`, `update_by`, `update_time`, `remark`, `deleted`)
-VALUES
-(10001, '新入职教师培训', '针对新入职教师的岗前培训，包括教学理念、师德师风、教学方法等内容', '张教授', 16, '学术会议厅', 50, '1', '2025-08-01 09:00:00', '2025-08-03 17:00:00', '000000', 1, NOW(), 1, NOW(), '重要培训', '0'),
-(10002, '教育技术与信息化', '介绍现代教育技术在教学中的应用，包括多媒体教学、在线教育平台等', '李博士', 12, '多媒体教室', 30, '1', '2025-08-10 09:00:00', '2025-08-12 17:00:00', '000000', 1, NOW(), 1, NOW(), '技术培训', '0'),
-(10003, '教学方法与技能培训', '提升教师教学技能，包括课堂管理、学生互动、教学评估等', '王老师', 8, '实训楼', 40, '1', '2025-08-05 14:00:00', '2025-08-05 18:00:00', '000000', 1, NOW(), 1, NOW(), '实用培训', '0'),
-(10004, '学生管理与心理健康', '帮助教师了解学生心理，掌握学生管理技巧和心理疏导方法', '陈心理师', 6, '学术报告厅', 60, '1', '2025-08-15 14:00:00', '2025-08-15 18:00:00', '000000', 1, NOW(), 1, NOW(), '心理培训', '0'),
-(10005, '科研方法与学术写作', '指导教师进行科学研究，提升学术写作和论文发表能力', '赵教授', 20, '图书馆报告厅', 25, '1', '2025-08-25 09:00:00', '2025-08-30 17:00:00', '000000', 1, NOW(), 1, NOW(), '科研培训', '0');
-
--- ----------------------------
--- 培训申请表测试数据
--- ----------------------------
-INSERT INTO `rs_training_application` (`application_id`, `course_id`, `user_id`, `user_name`, `department`, `position`, `reason`, `status`, `apply_time`, `current_approver`, `process_instance_id`, `tenant_id`, `create_by`, `create_time`, `update_by`, `update_time`, `remark`, `deleted`)
-VALUES
-(20001, 10001, 2, '张老师', '教务处', '教师', '新入职需要培训', '1', '2025-07-25 12:03:49', 'admin', NULL, '000000', 1, NOW(), 1, NOW(), NULL, '0'),
-(20002, 10002, 3, '王老师', '信息技术中心', '工程师', '学习新技术', '1', '2025-08-01 12:37:17', 'admin', NULL, '000000', 1, NOW(), 1, NOW(), '未完成', '0'),
-(20003, 10003, 4, '刘老师', '计算机学院', '讲师', '提升教学技能', '1', '2025-07-25 12:04:06', 'admin', NULL, '000000', 1, NOW(), 1, NOW(), '培训尚未结束', '0'),
-(20004, 10004, 5, '李老师', '学生处', '辅导员', '提升学生管理能力', '1', '2025-08-06 14:24:37', 'admin', NULL, '000000', 1, NOW(), 1, NOW(), '未完成', '0'),
-(20005, 10005, 6, '陈老师', '科研处', '副教授', '提升科研能力', '1', '2025-08-22 15:25:51', 'admin', NULL, '000000', 1, NOW(), 1, NOW(), '未完成', '0');
-
--- ----------------------------
--- 培训审批表测试数据
--- ----------------------------
-INSERT INTO `rs_training_approval` (`approval_id`, `application_id`, `approver_id`, `approver_name`, `approval_level`, `status`, `opinion`, `approval_time`, `tenant_id`, `create_by`, `create_time`, `update_by`, `update_time`, `remark`, `deleted`)
-VALUES
-(30001, 20001, 101, '王主任', 1, '1', '同意参加，安排好工作交接', '2025-07-21 09:30:00', '000000', 101, NOW(), 101, NOW(), NULL, '0'),
-(30002, 20003, 102, '孙院长', 1, '1', '批准参加，对提升教学质量有帮助', '2025-07-23 10:15:00', '000000', 102, NOW(), 102, NOW(), NULL, '0'),
-(30003, 20004, 103, '周主任', 1, '2', '近期有重要工作交接，建议下次再参加', '2025-07-24 14:20:00', '000000', 103, NOW(), 103, NOW(), NULL, '0');
-
--- ----------------------------
--- 培训记录表测试数据已删除，请通过申请界面新增
--- ---------------------------- 
\ No newline at end of file
diff --git a/backend/ruoyi-modules/ruoyi-rs/src/main/resources/mapper/rs/training-fix-approval-column.sql b/backend/ruoyi-modules/ruoyi-rs/src/main/resources/mapper/rs/training-fix-approval-column.sql
deleted file mode 100644
index e60a5c97..00000000
--- a/backend/ruoyi-modules/ruoyi-rs/src/main/resources/mapper/rs/training-fix-approval-column.sql
+++ /dev/null
@@ -1,43 +0,0 @@
--- -----------------------------
--- 培训审批数据修复脚本
--- -----------------------------
-
--- 检查comment列是否存在，如果存在则迁移数据到opinion列
-SET @columnExists = 0;
-SELECT COUNT(*) INTO @columnExists 
-FROM INFORMATION_SCHEMA.COLUMNS 
-WHERE TABLE_SCHEMA = DATABASE() 
-  AND TABLE_NAME = 'rs_training_approval' 
-  AND COLUMN_NAME = 'comment';
-
--- 如果comment列存在，将数据从comment迁移到opinion
-SET @sqlStmt = IF(@columnExists > 0, 
-  'UPDATE rs_training_approval SET opinion = comment WHERE opinion IS NULL AND comment IS NOT NULL', 
-  'SELECT "comment列不存在，无需迁移" AS message');
-
-PREPARE stmt FROM @sqlStmt;
-EXECUTE stmt;
-DEALLOCATE PREPARE stmt;
-
--- 添加测试数据（如果表为空）
-INSERT INTO rs_training_approval (
-  approval_id, application_id, approver_id, approver_name, 
-  approval_level, status, opinion, approval_time, tenant_id, 
-  create_by, create_time, deleted
-)
-SELECT 
-  FLOOR(RAND() * 1000000) + 100000, -- 随机ID
-  app.application_id, -- 关联到真实的申请ID
-  1, -- 管理员ID
-  '系统管理员', -- 管理员名称
-  1, -- 第一级审批
-  '1', -- 已通过状态
-  '系统自动生成的测试审批记录', -- 审批意见
-  NOW(), -- 当前时间
-  app.tenant_id, -- 使用申请的租户ID
-  app.create_by, -- 使用申请的创建者
-  NOW(), -- 当前时间
-  '0' -- 未删除
-FROM rs_training_application app
-WHERE NOT EXISTS (SELECT 1 FROM rs_training_approval)
-LIMIT 1; 
\ No newline at end of file
diff --git a/backend/ruoyi-modules/ruoyi-rs/src/main/resources/mapper/rs/training-update-approval-history-complete.sql b/backend/ruoyi-modules/ruoyi-rs/src/main/resources/mapper/rs/training-update-approval-history-complete.sql
deleted file mode 100644
index 4e10367f..00000000
--- a/backend/ruoyi-modules/ruoyi-rs/src/main/resources/mapper/rs/training-update-approval-history-complete.sql
+++ /dev/null
@@ -1,58 +0,0 @@
--- -----------------------------
--- 培训审批历史记录完整性更新脚本
--- -----------------------------
-
--- 1. 在培训申请表中添加提交次数字段
-ALTER TABLE rs_training_application ADD COLUMN IF NOT EXISTS submit_count int DEFAULT 1 COMMENT '提交次数';
-
--- 2. 检查并移除审批表可能存在的唯一约束（允许一个申请有多条审批记录）
-ALTER TABLE rs_training_approval DROP INDEX IF EXISTS uk_application_approver;
-ALTER TABLE rs_training_approval DROP INDEX IF EXISTS uk_application_level;
-
--- 3. 确保审批表中有足够的索引来高效查询
-CREATE INDEX IF NOT EXISTS idx_training_approval_application ON rs_training_approval(application_id);
-CREATE INDEX IF NOT EXISTS idx_training_approval_status ON rs_training_approval(status);
-CREATE INDEX IF NOT EXISTS idx_training_approval_time ON rs_training_approval(approval_time);
-
--- 4. 添加审批记录表注释说明
-ALTER TABLE rs_training_approval COMMENT = '培训审批表（记录所有审批动作，包括通过和拒绝记录）';
-
--- 5. 更新已有数据的提交次数为1（如果有）
-UPDATE rs_training_application SET submit_count = 1 WHERE submit_count IS NULL;
-
--- 6. 检查并修复可能的数据不一致问题
--- 查找有申请状态为已拒绝但没有对应拒绝记录的数据
-SELECT 
-    app.application_id, 
-    app.course_id,
-    app.user_name,
-    app.status,
-    COUNT(appr.approval_id) as approval_count
-FROM 
-    rs_training_application app
-LEFT JOIN 
-    rs_training_approval appr ON app.application_id = appr.application_id
-WHERE 
-    app.status = '2' AND app.deleted = '0'
-GROUP BY 
-    app.application_id
-HAVING 
-    approval_count = 0;
-
--- 查找有申请状态为已通过但没有对应通过记录的数据
-SELECT 
-    app.application_id, 
-    app.course_id,
-    app.user_name,
-    app.status,
-    COUNT(appr.approval_id) as approval_count
-FROM 
-    rs_training_application app
-LEFT JOIN 
-    rs_training_approval appr ON app.application_id = appr.application_id
-WHERE 
-    app.status = '1' AND app.deleted = '0'
-GROUP BY 
-    app.application_id
-HAVING 
-    approval_count = 0; 
\ No newline at end of file
diff --git a/backend/ruoyi-modules/ruoyi-rs/src/main/resources/mapper/rs/training-update-approval-history.sql b/backend/ruoyi-modules/ruoyi-rs/src/main/resources/mapper/rs/training-update-approval-history.sql
deleted file mode 100644
index 8de2b2fc..00000000
--- a/backend/ruoyi-modules/ruoyi-rs/src/main/resources/mapper/rs/training-update-approval-history.sql
+++ /dev/null
@@ -1,19 +0,0 @@
--- -----------------------------
--- 培训审批历史记录更新
--- -----------------------------
-
--- 确保审批表中没有唯一约束，允许一个申请有多条审批记录
-ALTER TABLE rs_training_approval DROP INDEX IF EXISTS uk_application_approver;
-
--- 添加审批意见列（如果不存在）
-ALTER TABLE rs_training_approval ADD COLUMN IF NOT EXISTS opinion varchar(500) COMMENT '审批意见' AFTER status;
-
--- 添加comment列的别名以保持向后兼容（如果存在）
-ALTER TABLE rs_training_approval CHANGE COLUMN comment opinion varchar(500) COMMENT '审批意见';
-
--- 更新审批记录表注释
-ALTER TABLE rs_training_approval COMMENT = '培训审批表（记录所有审批动作，包括拒绝记录）';
-
--- 添加相关索引以提高查询效率
-CREATE INDEX IF NOT EXISTS idx_training_approval_application ON rs_training_approval(application_id);
-CREATE INDEX IF NOT EXISTS idx_training_approval_status ON rs_training_approval(status); 
\ No newline at end of file
diff --git a/backend/ruoyi-modules/ruoyi-rs/src/main/resources/mapper/rs/training-update.sql b/backend/ruoyi-modules/ruoyi-rs/src/main/resources/mapper/rs/training-update.sql
deleted file mode 100644
index 3dc82b1d..00000000
--- a/backend/ruoyi-modules/ruoyi-rs/src/main/resources/mapper/rs/training-update.sql
+++ /dev/null
@@ -1,17 +0,0 @@
--- 更新培训课程表，添加create_dept字段
-ALTER TABLE rs_training_course ADD COLUMN create_dept bigint(20) COMMENT '创建部门' AFTER tenant_id;
-
--- 更新培训申请表，添加create_dept字段
-ALTER TABLE rs_training_application ADD COLUMN create_dept bigint(20) COMMENT '创建部门' AFTER tenant_id;
-
--- 更新培训申请表，添加location、duration、startTime和endTime字段
-ALTER TABLE rs_training_application ADD COLUMN location varchar(200) COMMENT '培训地点' AFTER current_approver;
-ALTER TABLE rs_training_application ADD COLUMN duration int(11) COMMENT '学时' AFTER location;
-ALTER TABLE rs_training_application ADD COLUMN start_time datetime COMMENT '开始时间' AFTER duration;
-ALTER TABLE rs_training_application ADD COLUMN end_time datetime COMMENT '结束时间' AFTER start_time;
-
--- 更新培训审批表，添加create_dept字段
-ALTER TABLE rs_training_approval ADD COLUMN create_dept bigint(20) COMMENT '创建部门' AFTER tenant_id;
-
--- 更新培训记录表，添加create_dept字段
-ALTER TABLE rs_training_record ADD COLUMN create_dept bigint(20) COMMENT '创建部门' AFTER tenant_id; 
\ No newline at end of file
diff --git a/backend/ruoyi-modules/ruoyi-rs/src/main/resources/mapper/rs/training.sql b/backend/ruoyi-modules/ruoyi-rs/src/main/resources/mapper/rs/training.sql
deleted file mode 100644
index 05843e86..00000000
--- a/backend/ruoyi-modules/ruoyi-rs/src/main/resources/mapper/rs/training.sql
+++ /dev/null
@@ -1,122 +0,0 @@
--- ----------------------------
--- 培训管理模块数据库表
--- ----------------------------
-
--- ----------------------------
--- 培训课程表
--- ----------------------------
-drop table if exists rs_training_course;
-create table rs_training_course (
-  course_id           bigint(20)      not null                   comment '课程ID',
-  title               varchar(100)    not null                   comment '课程名称',
-  category            varchar(50)     not null                   comment '课程类别',
-  description         text                                        comment '课程描述',
-  start_time          datetime        not null                   comment '开始时间',
-  end_time            datetime        not null                   comment '结束时间',
-  duration            int(11)         not null                   comment '学时数',
-  location            varchar(200)                               comment '培训地点',
-  max_participants    int(11)         default 0                  comment '最大参与人数',
-  current_participants int(11)        default 0                  comment '当前报名人数',
-  status              char(1)         default '0'                comment '状态（0正常 1停用）',
-  tenant_id           varchar(20)     default '000000'           comment '租户编号',
-  create_by           bigint(20)                                 comment '创建者',
-  create_time         datetime                                   comment '创建时间',
-  update_by           bigint(20)                                 comment '更新者',
-  update_time         datetime                                   comment '更新时间',
-  remark              varchar(500)                               comment '备注',
-  deleted             char(1)         default '0'                comment '删除标志',
-  primary key (course_id)
-) engine=innodb comment = '培训课程表';
-
--- ----------------------------
--- 培训申请表
--- ----------------------------
-drop table if exists rs_training_application;
-create table rs_training_application (
-  application_id      bigint(20)      not null                   comment '申请ID',
-  course_name         varchar(100)    not null                   comment '培训名称',
-  user_id             bigint(20)      not null                   comment '申请人ID',
-  user_name           varchar(50)     not null                   comment '申请人姓名',
-  department          varchar(50)     not null                   comment '所属部门',
-  position            varchar(50)                                comment '职位',
-  reason              text                                       comment '申请理由',
-  status              char(1)         default '0'                comment '状态（0待审核 1已通过 2已拒绝 3进行中 4已完成）',
-  apply_time          datetime                                   comment '申请时间',
-  current_approver    varchar(50)                                comment '当前审批人',
-  location            varchar(200)                               comment '培训地点',
-  duration            int(11)                                    comment '学时',
-  start_time          datetime                                   comment '开始时间',
-  end_time            datetime                                   comment '结束时间',
-  tenant_id           varchar(20)     default '000000'           comment '租户编号',
-  create_dept         bigint(20)                                 comment '创建部门',
-  reject_time         datetime                                   comment '拒绝时间',
-  create_by           bigint(20)                                 comment '创建者',
-  create_time         datetime                                   comment '创建时间',
-  update_by           bigint(20)                                 comment '更新者',
-  update_time         datetime                                   comment '更新时间',
-  remark              varchar(500)                               comment '备注',
-  deleted             char(1)         default '0'                comment '删除标志',
-  primary key (application_id)
-) engine=innodb comment = '培训申请表';
-
--- ----------------------------
--- 培训审批表
--- ----------------------------
-drop table if exists rs_training_approval;
-create table rs_training_approval (
-  approval_id         bigint(20)      not null                   comment '审批ID',
-  application_id      bigint(20)      not null                   comment '申请ID',
-  approver_id         bigint(20)      not null                   comment '审批人ID',
-  approver_name       varchar(50)     not null                   comment '审批人姓名',
-  approval_level      int(11)         not null                   comment '审批级别（1部门主管 2分管领导 3校领导）',
-  status              char(1)         default '0'                comment '状态（0待审核 1已通过 2已拒绝）',
-  opinion             varchar(500)                               comment '审批意见',
-  approval_time       datetime                                   comment '审批时间',
-  tenant_id           varchar(20)     default '000000'           comment '租户编号',
-  create_by           bigint(20)                                 comment '创建者',
-  create_time         datetime                                   comment '创建时间',
-  update_by           bigint(20)                                 comment '更新者',
-  update_time         datetime                                   comment '更新时间',
-  remark              varchar(500)                               comment '备注',
-  deleted             char(1)         default '0'                comment '删除标志',
-  primary key (approval_id)
-) engine=innodb comment = '培训审批表';
-
--- ----------------------------
--- 培训记录表
--- ----------------------------
-drop table if exists rs_training_record;
-create table rs_training_record (
-  record_id           bigint(20)      not null                   comment '记录ID',
-  application_id      bigint(20)      not null                   comment '申请ID',
-  course_id           bigint(20)      not null                   comment '课程ID',
-  user_id             bigint(20)      not null                   comment '用户ID',
-  user_name           varchar(50)     not null                   comment '用户姓名',
-  completion_status   char(1)         default '0'                comment '完成状态（0进行中 1已完成 2未完成）',
-  completion_time     datetime                                   comment '完成时间',
-  score               decimal(5,2)                               comment '成绩',
-  certificate_path    varchar(255)                               comment '证书路径',
-  certificate_number  varchar(50)                                comment '证书编号',
-  attachment_ids      varchar(255)                               comment '证书附件ID（多个用逗号分隔）',
-  feedback            text                                       comment '培训反馈',
-  location            varchar(255)                               comment '培训地点',
-  duration            int(11)                                    comment '学时',
-  apply_time          datetime                                   comment '申请时间',
-  status              varchar(10)                                comment '申请状态',
-  course_name         varchar(255)                               comment '课程名称',
-  department          varchar(255)                               comment '所属部门',
-  position            varchar(255)                               comment '职位',
-  reason              varchar(255)                               comment '申请理由',
-  current_approver    varchar(255)                               comment '当前审批人',
-  start_time          datetime                                   comment '开始时间',
-  end_time            datetime                                   comment '结束时间',
-  tenant_id           varchar(20)     default '000000'           comment '租户编号',
-  create_dept         bigint(20)                                 comment '创建部门',
-  create_by           bigint(20)                                 comment '创建者',
-  create_time         datetime                                   comment '创建时间',
-  update_by           bigint(20)                                 comment '更新者',
-  update_time         datetime                                   comment '更新时间',
-  remark              varchar(500)                               comment '备注',
-  deleted             char(1)         default '0'                comment '删除标志',
-  primary key (record_id)
-) engine=innodb comment = '培训记录表'; 
\ No newline at end of file
diff --git a/backend/ruoyi-modules/ruoyi-rs/src/main/resources/mapper/rs/update-custom-course-name.sql b/backend/ruoyi-modules/ruoyi-rs/src/main/resources/mapper/rs/update-custom-course-name.sql
deleted file mode 100644
index af90c53a..00000000
--- a/backend/ruoyi-modules/ruoyi-rs/src/main/resources/mapper/rs/update-custom-course-name.sql
+++ /dev/null
@@ -1,5 +0,0 @@
--- 添加自定义课程名称字段
--- 创建于 2025-07-24
-
--- 在rs_training_application表中添加course_name列，用于存储自定义培训名称
-ALTER TABLE `rs_training_application` ADD COLUMN `course_name` varchar(100) DEFAULT NULL COMMENT '自定义课程名称' AFTER `course_id`; 
\ No newline at end of file
diff --git a/backend/ruoyi-modules/ruoyi-rs/src/main/resources/mapper/rs/update-rs-application-table.sql b/backend/ruoyi-modules/ruoyi-rs/src/main/resources/mapper/rs/update-rs-application-table.sql
deleted file mode 100644
index 4407c026..00000000
--- a/backend/ruoyi-modules/ruoyi-rs/src/main/resources/mapper/rs/update-rs-application-table.sql
+++ /dev/null
@@ -1,7 +0,0 @@
--- 为rs_application表添加附件相关字段
-ALTER TABLE `rs_application` 
-ADD COLUMN `attachment_path` varchar(255) DEFAULT NULL COMMENT '附件路径' AFTER `self_description`,
-ADD COLUMN `attachment_name` varchar(255) DEFAULT NULL COMMENT '附件名称' AFTER `attachment_path`;
-
--- 更新表注释
-ALTER TABLE `rs_application` COMMENT '应聘申请记录表'; 
\ No newline at end of file
diff --git a/backend/ruoyi-modules/ruoyi-rs/src/main/resources/sql/update_party_retention_file_oss_id.sql b/backend/ruoyi-modules/ruoyi-rs/src/main/resources/sql/update_party_retention_file_oss_id.sql
new file mode 100644
index 00000000..f6bb1ab1
--- /dev/null
+++ b/backend/ruoyi-modules/ruoyi-rs/src/main/resources/sql/update_party_retention_file_oss_id.sql
@@ -0,0 +1,15 @@
+-- =============================================
+-- 修改 rs_overseas_application 表结构
+-- 将 party_retention_file_oss_id 字段从 bigint 改为 varchar(500)
+-- 以支持存储多个附件OSS ID（逗号分隔）
+-- 创建时间: 2025-11-27
+-- =============================================
+
+-- 修改字段类型（MySQL/MariaDB）
+ALTER TABLE rs_overseas_application 
+MODIFY COLUMN party_retention_file_oss_id VARCHAR(500) COMMENT '党籍保留附件OSS ID（多个ID用逗号分隔）';
+
+-- 注意：
+-- 1. 此脚本会保留现有数据，bigint值会自动转换为字符串
+-- 2. 建议在执行前备份数据库
+-- 3. 如果字段当前有NOT NULL约束，会被保留
diff --git a/docs/开发文档/API/出国申请管理API.md b/docs/开发文档/API/出国申请管理API.md
index 7cc420f4..e8044246 100644
--- a/docs/开发文档/API/出国申请管理API.md
+++ b/docs/开发文档/API/出国申请管理API.md
@@ -316,7 +316,7 @@ interface OverseasApprovalVO {
   approvalId: number | string;           // 审批ID
   applicationId: number;                 // 关联申请ID
   approverId: number;                    // 审批人ID
-  approverName: string;                  // 审批人姓名
+  approverName: string;                  // 审批人姓名（优先返回昵称，缺省时回退账号）
   approvalLevel: string;                 // 审批级别编码
   approvalStatus: string;                // 审批状态编码
   approvalOpinion: string;               // 审批意见
@@ -329,6 +329,8 @@ interface OverseasApprovalVO {
 }
 ```
 
+> 🆕 **2025-11-28 更新**：`approverName` 字段统一返回审批人的昵称，若用户未设置昵称则自动回退到账号，确保审批记录界面展示真实姓名。
+
 ---
 
 ## 🔧 核心接口详细说明
@@ -1048,6 +1050,7 @@ PDF模板包含以下空白填写区域（完全手工填写）：
   - 申请表单：党员且出国天数>30天时自动显示
   - 申请详情：符合条件时在弹窗底部显示绿色按钮
 - **前端实现**：必须使用 `request` 工具而不是 `fetch` API，以确保包含所有必要的认证请求头
+- **附件格式**：自 2025-11-27 起，党籍保留附件支持任意文件类型上传，仅保留 10MB 单文件大小限制
 
 #### 错误处理
 
@@ -1242,4 +1245,20 @@ import { getCurrentApproversForTask } from '@/api/workflow/common';
 
 **更新时间**：2025-10-28  
 **维护人员**：开发团队  
-**变更记录**：新增工作流动态审批人方案说明 
\ No newline at end of file
+**变更记录**：新增工作流动态审批人方案说明 
+
+---
+
+### 2025-11-28 更新：出国记录回执下载
+
+- **前端**：`web/src/views/rs/overseas/index.vue` 中的 “下载因私出国（境）情况回执” 按钮改为直接基于 Word 模板生成文件，摆脱后端 PDF 下载接口依赖。
+- **模板**：`web/public/chuguoqingkuanghuizhi.docx`，占位符 `{{applicantName}}`、`{{startYear}}`、`{{startMonth}}`、`{{startDay}}`、`{{endYear}}`、`{{endMonth}}`、`{{endDay}}`、`{{destinationText}}`、`{{exitReasonText}}`、`{{durationDays}}`、`{{expenseType}}`。
+- **数据映射**：优先使用记录中的实际出行信息（`actualStartDate`、`actualEndDate`、`destinationCountry`、`exitReason` 等），缺省时回落到申请单数据，行程天数自动根据起止日期计算，默认费用说明为“费用自理”。
+- **交互提示**：增加起止日期缺失时的前端校验，模板生成失败会提示用户检查模板或稍后再试。
+
+### 2025-11-28 更新：审批监控页面审批表导出
+
+- **前端**：`web/src/views/rs/overseas/monitor/index.vue` 的 “下载审批表” 按钮从 PDF 调整为 Word 导出，保持统一的 docxtemplater + image module 生成逻辑。
+- **模板**：`web/public/chuguojingshenpibiao.docx`，覆盖个人信息、行程信息、申请人签名及五级审批节点（部门负责人、人事处、纪委、学院分管领导、学院党委书记）的签名、意见、日期占位符，支持 `{{%signature}}` 形式的图片变量。
+- **数据来源**：优先取 `currentDetail` 详情接口返回值；审批节点数据由 `approvalHistory` 根据 `approvalLevel` 映射，若无签名/日期则留空。详情接口新增 `signature` 字段（申请人手写签名 base64），供模板直接使用。
+- **交互提示**：仅在审批完成（状态为 `1`）时显示导出按钮，生成失败时给出友好提示并引导检查模板。
\ No newline at end of file
diff --git a/docs/开发文档/API/出国行程变更管理API.md b/docs/开发文档/API/出国行程变更管理API.md
index 43d7cb6b..0f9599fb 100644
--- a/docs/开发文档/API/出国行程变更管理API.md
+++ b/docs/开发文档/API/出国行程变更管理API.md
@@ -144,6 +144,10 @@
 }
 ```
 
+#### 字段补充说明（2025-11-28）
+
+- `approverName`：后台统一返回审批人的 **昵称**，若用户未设置昵称则自动回退到账号；前端无需再做用户名到昵称的手动映射。
+
 ---
 
 ### 3. 查询待审批列表
diff --git a/web/package.json b/web/package.json
index 5e29e2d3..b636f0ca 100644
--- a/web/package.json
+++ b/web/package.json
@@ -34,9 +34,12 @@
     "await-to-js": "3.0.0",
     "axios": "1.8.4",
     "crypto-js": "4.2.0",
+    "docx": "^9.5.1",
+    "docxtemplater": "^3.67.5",
+    "docxtemplater-image-module-free": "^1.1.1",
     "echarts": "^5.6.0",
     "element-plus": "2.9.8",
-    "file-saver": "2.0.5",
+    "file-saver": "^2.0.5",
     "highlight.js": "11.9.0",
     "html2canvas": "^1.4.1",
     "image-conversion": "2.1.1",
@@ -46,6 +49,7 @@
     "jspdf-font": "^1.0.7",
     "nprogress": "0.2.0",
     "pinia": "3.0.2",
+    "pizzip": "^3.2.0",
     "qrcode": "^1.5.4",
     "screenfull": "6.0.2",
     "vue": "3.5.13",
diff --git a/web/public/baoliudangji.docx b/web/public/baoliudangji.docx
new file mode 100644
index 00000000..d54fc870
Binary files /dev/null and b/web/public/baoliudangji.docx differ
diff --git a/web/public/chuguodengji.docx b/web/public/chuguodengji.docx
new file mode 100644
index 00000000..1aaccf43
Binary files /dev/null and b/web/public/chuguodengji.docx differ
diff --git a/web/public/chuguojingshenpibiao.docx b/web/public/chuguojingshenpibiao.docx
new file mode 100644
index 00000000..04e9e130
Binary files /dev/null and b/web/public/chuguojingshenpibiao.docx differ
diff --git a/web/public/chuguoqingkuanghuizhi.docx b/web/public/chuguoqingkuanghuizhi.docx
new file mode 100644
index 00000000..7c1e4e19
Binary files /dev/null and b/web/public/chuguoqingkuanghuizhi.docx differ
diff --git a/web/public/zunshoudangjichengnuoshu.docx b/web/public/zunshoudangjichengnuoshu.docx
new file mode 100644
index 00000000..ed40ebc9
Binary files /dev/null and b/web/public/zunshoudangjichengnuoshu.docx differ
diff --git a/web/src/api/rs/overseas-registration.ts b/web/src/api/rs/overseas-registration.ts
index b97c832c..fdc069ae 100644
--- a/web/src/api/rs/overseas-registration.ts
+++ b/web/src/api/rs/overseas-registration.ts
@@ -70,6 +70,7 @@ export interface OverseasRegistrationForm {
   officePhone?: string; // 办公电话
   mobilePhone?: string; // 移动电话
   remarks?: string; // 备注
+  status?: string; // 登记状态：0-草稿，1-待审核，2-已通过，3-已拒绝
 }
 
 // 登记历史查询参数类型
@@ -142,6 +143,17 @@ export function getOverseasRegistrationList(query: OverseasRegistrationQuery) {
   });
 }
 
+/**
+ * 查询我的出国登记列表（只查询当前登录人创建的记录）
+ */
+export function getMyOverseasRegistrationList(query: OverseasRegistrationQuery) {
+  return request({
+    url: '/rs/overseas/registration/my/list',
+    method: 'get',
+    params: query
+  });
+}
+
 /**
  * 查询出国登记详细
  */
@@ -433,4 +445,4 @@ export function batchRejectOverseasRegistration(registrationIds: Array<number |
       ...data
     }
   });
-} 
\ No newline at end of file
+}
diff --git a/web/src/api/rs/overseas.ts b/web/src/api/rs/overseas.ts
index d89aff46..3a7c0d60 100644
--- a/web/src/api/rs/overseas.ts
+++ b/web/src/api/rs/overseas.ts
@@ -60,7 +60,7 @@ export interface OverseasApplicationVO {
   partyRetentionFileName?: string; // 党籍保留附件文件名
   partyRetentionUploadTime?: string; // 党籍保留附件上传时间
   partyRetentionUploadStatus?: string; // 党籍保留附件上传状态
-  partyRetentionFileOssId?: number; // 党籍保留附件OSS ID
+  partyRetentionFileOssId?: string; // 党籍保留附件OSS ID（支持多个ID用逗号分隔）
   purpose: string;
   purposeDetail: string;
   destination: string;
@@ -137,6 +137,7 @@ export interface OverseasApplicationForm {
   partyRetentionFileName?: string; // 党籍保留附件文件名
   partyRetentionUploadTime?: string; // 党籍保留附件上传时间
   partyRetentionUploadStatus?: string; // 党籍保留附件上传状态：0-未上传，1-已上传
+  partyRetentionFileOssId?: string; // 党籍保留附件OSS ID（支持多个ID用逗号分隔）
   purpose: string;
   purposeDetail: string;
   destination: string;
@@ -341,6 +342,15 @@ export function listPendingOverseasApplication() {
   });
 }
 
+// 查询当前用户的待审批申请分页列表（根据角色过滤，支持分页和搜索）
+export function listPendingOverseasApplicationPage(query: OverseasApplicationQuery) {
+  return request({
+    url: '/rs/overseas/application/pending/page',
+    method: 'get',
+    params: query
+  });
+}
+
 // ========================================
 // 🚨 标准化改造：删除自定义待审批查询API
 // 
@@ -805,6 +815,7 @@ export interface ItineraryChangeQuery {
   applicantName?: string;
   destination?: string;
   status?: string;
+  applicantId?: number;
   params?: Record<string, any>;
 }
 
@@ -842,8 +853,8 @@ export interface ItineraryChangeVO {
   status: string;
   statusText: string;
   approvalOpinion?: string;
-  approvalBy?: number;
-  approvalByName?: string;
+  approverId?: number;
+  approverName?: string;
   approvalTime?: string;
   createTime: string;
   updateTime?: string;
diff --git a/web/src/permission.ts b/web/src/permission.ts
index 30dea85a..48d071f7 100644
--- a/web/src/permission.ts
+++ b/web/src/permission.ts
@@ -34,7 +34,7 @@ router.beforeEach(async (to, from, next) => {
         const [err] = await tos(useUserStore().getInfo());
         if (err) {
           await useUserStore().logout();
-          ElMessage.error(err);
+          // ElMessage.error(err.message || '获取用户信息失败');
           next({ path: '/' });
         } else {
           isRelogin.show = false;
diff --git a/web/src/utils/request.ts b/web/src/utils/request.ts
index 9559c259..7ae6f71b 100644
--- a/web/src/utils/request.ts
+++ b/web/src/utils/request.ts
@@ -204,8 +204,14 @@ service.interceptors.response.use(
       err.response = res;
       return Promise.reject(err);
     } else if (code !== HttpStatus.SUCCESS) {
-      ElNotification.error({ title: msg });
-      const err = new Error(msg) as any;
+      // 确保错误消息不为空，避免只显示图标没有文字
+      const errorMsg = msg || errorCode['default'] || '操作失败，请稍后重试';
+      ElNotification.error({
+        title: '错误提示',
+        message: errorMsg,
+        duration: 5000
+      });
+      const err = new Error(errorMsg) as any;
       err.response = res;
       return Promise.reject(err);
     } else {
diff --git a/web/src/views/login.vue b/web/src/views/login.vue
index c80e5f5e..73e68f6f 100644
--- a/web/src/views/login.vue
+++ b/web/src/views/login.vue
@@ -192,13 +192,29 @@ const getLoginData = () => {
  * 获取租户列表
  */
 const initTenantList = async () => {
-  const { data } = await getTenantList(false);
-  tenantEnabled.value = data.tenantEnabled === undefined ? true : data.tenantEnabled;
-  if (tenantEnabled.value) {
-    tenantList.value = data.voList;
-    if (tenantList.value != null && tenantList.value.length !== 0) {
-      loginForm.value.tenantId = tenantList.value[0].tenantId;
+  try {
+    const [err, res] = await to(getTenantList(false));
+    if (err) {
+      // 静默处理租户列表获取失败，不影响登录功能
+      console.warn('获取租户列表失败:', err);
+      // 设置默认值，确保登录功能正常
+      tenantEnabled.value = true;
+      return;
     }
+    if (res && res.data) {
+      const { data } = res;
+      tenantEnabled.value = data.tenantEnabled === undefined ? true : data.tenantEnabled;
+      if (tenantEnabled.value) {
+        tenantList.value = data.voList;
+        if (tenantList.value != null && tenantList.value.length !== 0) {
+          loginForm.value.tenantId = tenantList.value[0].tenantId;
+        }
+      }
+    }
+  } catch (error) {
+    // 捕获其他可能的错误，静默处理
+    console.warn('初始化租户列表时发生错误:', error);
+    tenantEnabled.value = true;
   }
 };
 
diff --git a/web/src/views/rs/overseas-registration/index-all.vue b/web/src/views/rs/overseas-registration/index-all.vue
new file mode 100644
index 00000000..1c775028
--- /dev/null
+++ b/web/src/views/rs/overseas-registration/index-all.vue
@@ -0,0 +1,1138 @@
+<template>
+  <div class="p-2 page-container">
+    <!-- 搜索区域 -->
+    <transition :enter-active-class="proxy?.animate.searchAnimate.enter" :leave-active-class="proxy?.animate.searchAnimate.leave">
+      <div v-show="showSearch" class="mb-[10px]">
+        <el-card shadow="hover">
+          <el-form ref="queryFormRef" :model="queryParams" label-width="100px">
+            <el-row :gutter="20">
+              <el-col :span="6">
+                <el-form-item label="姓名" prop="name">
+                  <el-input v-model="queryParams.name" placeholder="请输入姓名" clearable @keyup.enter="handleQuery" />
+                </el-form-item>
+              </el-col>
+              <el-col :span="6">
+                <el-form-item label="身份证号" prop="idNumber">
+                  <el-input v-model="queryParams.idNumber" placeholder="请输入身份证号" clearable @keyup.enter="handleQuery" />
+                </el-form-item>
+              </el-col>
+              <el-col :span="6">
+                <el-form-item label="工作部门" prop="department">
+                  <el-input v-model="queryParams.department" placeholder="请输入工作部门" clearable @keyup.enter="handleQuery" />
+                </el-form-item>
+              </el-col>
+              <!-- <el-col :span="6">
+                <el-form-item label="登记状态" prop="status">
+                  <el-select v-model="queryParams.status" placeholder="请选择登记状态" clearable style="width: 100%">
+                    <el-option v-for="dict in statusOptions" :key="dict.value" :label="dict.label" :value="dict.value" />
+                  </el-select>
+                </el-form-item>
+              </el-col> -->
+            </el-row>
+
+            <el-row>
+              <el-col :span="24" class="search-btn-container">
+                <el-form-item>
+                  <el-button type="primary" icon="Search" @click="handleQuery">搜索</el-button>
+                  <el-button icon="Refresh" @click="resetQuery">重置</el-button>
+                </el-form-item>
+              </el-col>
+            </el-row>
+          </el-form>
+        </el-card>
+      </div>
+    </transition>
+
+    <!-- 操作按钮区域 -->
+    <el-card shadow="never">
+      <template #header>
+        <el-row :gutter="10" class="mb8">
+          <el-col :span="1.5">
+            <el-button type="primary" plain icon="Plus" @click="handleAdd">新增登记</el-button>
+          </el-col>
+          <right-toolbar v-model:showSearch="showSearch" @queryTable="getList"></right-toolbar>
+        </el-row>
+      </template>
+
+      <!-- 出国登记表格 -->
+      <el-table v-loading="loading" border :data="registrationList" @row-dblclick="handleView">
+        <el-table-column type="selection" width="55" align="center" />
+
+        <el-table-column label="姓名" align="center" width="100" :show-overflow-tooltip="true">
+          <template #default="scope">
+            {{ scope.row.name ? scope.row.name.replace(/,/g, '') : '' }}
+          </template>
+        </el-table-column>
+        <el-table-column label="性别" align="center" width="80">
+          <template #default="scope">{{ scope.row.gender === '0' ? '男' : '女' }}</template>
+        </el-table-column>
+        <el-table-column label="身份证号" align="center" prop="idNumber" width="180" :show-overflow-tooltip="true" />
+        <el-table-column label="工作部门" align="center" prop="department" min-width="150" :show-overflow-tooltip="true" />
+        <el-table-column label="职务职称" align="center" prop="position" width="120" :show-overflow-tooltip="true" />
+        <el-table-column label="政治面貌" align="center" prop="politicalStatus" width="120" :show-overflow-tooltip="true" />
+        <el-table-column label="登记状态" align="center" prop="statusText" width="120">
+          <template #default="scope">
+            <el-tag :type="getStatusTagType(scope.row.status)">{{ scope.row.statusText }}</el-tag>
+          </template>
+        </el-table-column>
+        <el-table-column label="创建时间" align="center" prop="createTime" width="160" :show-overflow-tooltip="true" />
+        <el-table-column label="操作" align="center" class-name="small-padding fixed-width" width="280">
+          <template #default="scope">
+            <el-tooltip content="查看详情" placement="top">
+              <el-button link type="primary" icon="View" @click="handleView(scope.row)"></el-button>
+            </el-tooltip>
+            <!-- 草稿状态和已通过状态：显示编辑按钮 -->
+            <el-tooltip content="编辑登记" placement="top" v-if="scope.row.status === '0' || scope.row.status === '2'">
+              <el-button link type="warning" icon="Edit" @click="handleEdit(scope.row)"></el-button>
+            </el-tooltip>
+            <!-- 草稿状态：显示提交按钮 -->
+            <el-tooltip content="提交登记" placement="top" v-if="scope.row.status === '0'">
+              <el-button link type="success" icon="Check" @click="handleSubmit(scope.row)"></el-button>
+            </el-tooltip>
+            <!-- 已提交状态：显示撤回按钮 -->
+            <el-tooltip content="撤回登记" placement="top" v-if="scope.row.status === '1'">
+              <el-button link type="warning" icon="RefreshLeft" @click="handleCancel(scope.row)"></el-button>
+            </el-tooltip>
+            <!-- 生成证明按钮：已确认的登记可以生成证明 -->
+            <el-tooltip content="生成证明" placement="top" v-if="scope.row.status === '2'">
+              <el-button link type="success" icon="Document" @click="handleGenerateCertificate(scope.row)"></el-button>
+            </el-tooltip>
+            <!-- 删除按钮：仅在草稿状态下显示 -->
+            <el-tooltip content="删除" placement="top" v-if="scope.row.status === '0'">
+              <el-button link type="danger" icon="Delete" @click="handleDelete(scope.row)"></el-button>
+            </el-tooltip>
+          </template>
+        </el-table-column>
+      </el-table>
+
+      <pagination v-show="total > 0" :total="total" v-model:page="queryParams.pageNum" v-model:limit="queryParams.pageSize" @pagination="getList" />
+    </el-card>
+
+    <!-- 出国登记新增/编辑弹窗 -->
+    <el-dialog
+      :title="dialog.title"
+      v-model="dialog.visible"
+      width="900px"
+      :close-on-click-modal="false"
+      :close-on-press-escape="false"
+      destroy-on-close
+      append-to-body
+    >
+      <el-form ref="registrationFormRef" :model="form" :rules="registrationRules" label-width="120px" v-loading="dialog.loading">
+        <!-- 基本信息 -->
+        <div class="form-section">
+          <h4 class="section-title">基本信息</h4>
+          <el-row :gutter="20">
+            <el-col :span="12">
+              <el-form-item label="姓名">
+                <el-row :gutter="10">
+                  <el-col :span="12">
+                    <el-form-item prop="firstName" label-width="0">
+                      <el-input v-model="form.firstName" placeholder="姓" />
+                    </el-form-item>
+                  </el-col>
+                  <el-col :span="12">
+                    <el-form-item prop="lastName" label-width="0">
+                      <el-input v-model="form.lastName" placeholder="名" />
+                    </el-form-item>
+                  </el-col>
+                </el-row>
+              </el-form-item>
+            </el-col>
+            <el-col :span="12">
+              <el-form-item label="性别" prop="gender">
+                <el-select v-model="form.gender" placeholder="请选择性别" style="width: 100%">
+                  <el-option label="男" value="0" />
+                  <el-option label="女" value="1" />
+                </el-select>
+              </el-form-item>
+            </el-col>
+          </el-row>
+
+          <el-row :gutter="20">
+            <el-col :span="12">
+              <el-form-item label="出生日期" prop="birthDate">
+                <el-date-picker v-model="form.birthDate" type="date" placeholder="请选择出生日期" style="width: 100%" value-format="YYYY-MM-DD" />
+              </el-form-item>
+            </el-col>
+            <el-col :span="12">
+              <el-form-item label="公民身份号码" prop="idNumber">
+                <el-input v-model="form.idNumber" placeholder="请输入18位身份证号码" maxlength="18" />
+              </el-form-item>
+            </el-col>
+          </el-row>
+
+          <el-row :gutter="20">
+            <el-col :span="12">
+              <el-form-item label="政治面貌" prop="politicalStatus">
+                <el-select v-model="form.politicalStatus" placeholder="请选择政治面貌" style="width: 100%">
+                  <el-option label="中共党员" value="中共党员" />
+                  <el-option label="中共预备党员" value="中共预备党员" />
+                  <el-option label="共青团员" value="共青团员" />
+                  <el-option label="民革党员" value="民革党员" />
+                  <el-option label="民盟盟员" value="民盟盟员" />
+                  <el-option label="民建会员" value="民建会员" />
+                  <el-option label="民进会员" value="民进会员" />
+                  <el-option label="农工党党员" value="农工党党员" />
+                  <el-option label="致公党党员" value="致公党党员" />
+                  <el-option label="九三学社社员" value="九三学社社员" />
+                  <el-option label="台盟盟员" value="台盟盟员" />
+                  <el-option label="无党派人士" value="无党派人士" />
+                  <el-option label="群众" value="群众" />
+                </el-select>
+              </el-form-item>
+            </el-col>
+            <el-col :span="12">
+              <el-form-item label="户籍所在地" prop="registeredAddress">
+                <el-input v-model="form.registeredAddress" placeholder="请填写至县（市、区）" />
+              </el-form-item>
+            </el-col>
+          </el-row>
+        </div>
+
+        <!-- 工作信息 -->
+        <div class="form-section">
+          <h4 class="section-title">工作信息</h4>
+          <el-row :gutter="20">
+            <el-col :span="12">
+              <el-form-item label="工作部门" prop="department">
+                <el-input v-model="form.department" placeholder="请输入工作部门全称" />
+              </el-form-item>
+            </el-col>
+            <el-col :span="12">
+              <el-form-item label="职务职称" prop="position">
+                <el-input v-model="form.position" placeholder="请输入职务职称" />
+              </el-form-item>
+            </el-col>
+          </el-row>
+
+          <el-row :gutter="20">
+            <el-col :span="12">
+              <el-form-item label="行政职级" prop="administrativeLevel">
+                <el-input v-model="form.administrativeLevel" placeholder="请输入行政职级" />
+              </el-form-item>
+            </el-col>
+            <el-col :span="12">
+              <el-form-item label="人员类别代码" prop="personnelCategory">
+                <el-input v-model="form.personnelCategory" placeholder="请输入人员类别代码" />
+              </el-form-item>
+            </el-col>
+          </el-row>
+        </div>
+      </el-form>
+
+      <!-- 填表说明 -->
+      <div class="form-note">
+        <p class="note-text"><strong>填表说明：</strong>人员类别代码根据报备人员属于报备人员范围中的情形项，填写所属项的序号即可。</p>
+      </div>
+
+      <template #footer>
+        <div class="dialog-footer">
+          <el-button @click="cancel">取 消</el-button>
+          <el-button type="primary" @click="submitForm" :loading="dialog.loading">
+            {{ dialog.isEdit ? '更 新' : '保 存' }}
+          </el-button>
+          <!-- <el-button type="success" @click="submitAndConfirm" :loading="dialog.loading" v-if="!dialog.isEdit">
+            保存并提交
+          </el-button> -->
+        </div>
+      </template>
+    </el-dialog>
+
+    <!-- 查看详情弹窗 -->
+    <el-dialog title="出国登记详情" v-model="viewDialog.visible" width="800px" :close-on-click-modal="false" destroy-on-close>
+      <div class="detail-content" v-loading="viewDialog.loading">
+        <div class="detail-section">
+          <h4 class="section-title">基本信息</h4>
+          <el-descriptions :column="2" border>
+            <el-descriptions-item label="姓名">{{ viewData.name ? viewData.name.replace(/,/g, '') : '' }}</el-descriptions-item>
+            <el-descriptions-item label="性别">{{ viewData.gender === '0' ? '男' : '女' }}</el-descriptions-item>
+            <el-descriptions-item label="出生日期">{{ formatDate(viewData.birthDate) }}</el-descriptions-item>
+            <el-descriptions-item label="身份证号">{{ viewData.idNumber }}</el-descriptions-item>
+            <el-descriptions-item label="政治面貌">{{ viewData.politicalStatus }}</el-descriptions-item>
+            <el-descriptions-item label="户籍所在地" :span="2">{{ viewData.registeredAddress }}</el-descriptions-item>
+          </el-descriptions>
+        </div>
+
+        <div class="detail-section">
+          <h4 class="section-title">工作信息</h4>
+          <el-descriptions :column="2" border>
+            <el-descriptions-item label="工作部门">{{ viewData.department }}</el-descriptions-item>
+            <el-descriptions-item label="职务职称">{{ viewData.position }}</el-descriptions-item>
+            <el-descriptions-item label="行政职级">{{ viewData.administrativeLevel || '无' }}</el-descriptions-item>
+            <el-descriptions-item label="人员类别代码">{{ viewData.personnelCategory || '无' }}</el-descriptions-item>
+          </el-descriptions>
+        </div>
+
+        <div class="detail-section">
+          <h4 class="section-title">状态信息</h4>
+          <el-descriptions :column="2" border>
+            <el-descriptions-item label="登记状态">
+              <el-tag :type="getStatusTagType(viewData.status)">{{ viewData.statusText }}</el-tag>
+            </el-descriptions-item>
+            <el-descriptions-item label="创建时间">{{ viewData.createTime }}</el-descriptions-item>
+            <el-descriptions-item label="更新时间">{{ viewData.updateTime }}</el-descriptions-item>
+          </el-descriptions>
+        </div>
+      </div>
+
+      <template #footer>
+        <div class="dialog-footer">
+          <!-- <el-button v-if="viewData.status === '2'" type="primary" icon="Download" @click="handleDownloadPDF">下载PDF</el-button> -->
+          <el-button @click="viewDialog.visible = false">关 闭</el-button>
+        </div>
+      </template>
+    </el-dialog>
+
+    <!-- PDF生成隐藏容器 -->
+    <div
+      v-if="isPdfGenerating"
+      ref="pdfContainer"
+      class="pdf-container"
+      style="position: fixed; left: -9999px; top: 0; width: 794px; background: white; padding: 20px"
+    >
+      <div class="pdf-page">
+        <!-- 标题 -->
+        <div class="pdf-title">登记报备人员因私事出国（境）登记表</div>
+
+        <!-- 编号 -->
+        <div class="pdf-number">编号：<span class="underline-text">_______________</span></div>
+
+        <!-- 表格 -->
+        <table class="pdf-table" border="1" cellspacing="0" cellpadding="5">
+          <!-- 第一行：表头行 -->
+          <tr>
+            <td width="50" class="center-text bold-text">姓</td>
+            <td width="80" class="center-text data-cell">
+              {{ viewData.name ? (viewData.name.includes(',') ? viewData.name.split(',')[0] : viewData.name.charAt(0)) : '' }}
+            </td>
+            <td width="50" class="center-text bold-text">名</td>
+            <td width="80" class="center-text data-cell">
+              {{ viewData.name ? (viewData.name.includes(',') ? viewData.name.split(',')[1] : viewData.name.substring(1)) : '' }}
+            </td>
+            <td width="60" class="center-text bold-text">性<br />别</td>
+            <td width="60" class="center-text data-cell">{{ viewData.gender === '0' ? '男' : viewData.gender === '1' ? '女' : '' }}</td>
+            <td width="80" class="center-text bold-text">出生<br />日期</td>
+            <td width="120" class="center-text data-cell">{{ formatPdfDate(viewData.birthDate) }}</td>
+            <td width="121" rowspan="5" class="center-text photo-cell">
+              <div class="photo-text">照 片</div>
+              <div class="photo-desc">(2寸免冠白色或淡蓝色底彩照32MM×26MM)</div>
+            </td>
+          </tr>
+
+          <!-- 第二行：公民身份号码和政治面貌行 -->
+          <tr>
+            <td colspan="2" class="center-text bold-text">公民身份号码</td>
+            <td colspan="4" class="data-cell">{{ viewData.idNumber || '' }}</td>
+            <td class="center-text bold-text">政治<br />面貌</td>
+            <td class="data-cell">{{ viewData.politicalStatus || '' }}</td>
+          </tr>
+
+          <!-- 第三行：户籍所在地 -->
+          <tr>
+            <td colspan="2" class="center-text bold-text">户籍所在地</td>
+            <td colspan="6" class="data-cell">{{ viewData.registeredAddress || '' }}</td>
+          </tr>
+
+          <!-- 第四行：工作部门 -->
+          <tr>
+            <td colspan="2" class="center-text bold-text">工作部门<br />（教学系部）</td>
+            <td colspan="6" class="data-cell">{{ viewData.department || '' }}</td>
+          </tr>
+
+          <!-- 第五行：职务职称、行政职级、人员类别代码 -->
+          <tr>
+            <td colspan="2" class="center-text bold-text">职务职称</td>
+            <td colspan="2" class="data-cell">{{ viewData.position || '' }}</td>
+            <td class="center-text bold-text">行政<br />职级</td>
+            <td class="data-cell">{{ viewData.administrativeLevel || '' }}</td>
+            <td class="center-text bold-text">人员类<br />别代码</td>
+            <td class="center-text data-cell"></td>
+          </tr>
+
+          <!-- 第六、七行：登记备案责任单位 -->
+          <tr style="height: 120px">
+            <td colspan="2" rowspan="2" class="center-text bold-text">登记备案<br />责任单位</td>
+            <td colspan="6" rowspan="2" class="center-text seal-cell">
+              <div style="padding: 40px 0">盖 章</div>
+            </td>
+            <td rowspan="2" class="center-text">
+              <div class="signature-area">登记备案责任单位负责人签名：</div>
+            </td>
+          </tr>
+          <tr style="height: 120px"></tr>
+
+          <!-- 第八、九行：登记备案责任单位联系人 -->
+          <tr style="height: 60px">
+            <td colspan="2" rowspan="2" class="center-text bold-text">登记备案责任<br />单位联系人</td>
+            <td colspan="2" rowspan="2" class="data-cell">{{ viewData.contactPerson || '' }}</td>
+            <td colspan="2" rowspan="2" class="center-text bold-text">联系电话</td>
+            <td colspan="3" class="data-cell">办公电话：{{ viewData.officePhone || '' }}</td>
+          </tr>
+          <tr style="height: 60px">
+            <td colspan="3" class="data-cell">移动电话：{{ viewData.mobilePhone || '' }}</td>
+          </tr>
+        </table>
+
+        <!-- 填表说明 -->
+        <div class="pdf-note">
+          <div class="note-title">填表说明：</div>
+          <div class="note-content">人员类别代码根据报备人员属于报备人员范围中的情形项，填写所属项的序号即可。</div>
+        </div>
+      </div>
+    </div>
+  </div>
+</template>
+
+<script setup name="OverseasRegistration" lang="ts">
+import { ref, reactive, toRefs, getCurrentInstance, onMounted, nextTick, ComponentInternalInstance } from 'vue';
+import { ElMessage, ElMessageBox } from 'element-plus';
+import type { FormInstance } from 'element-plus';
+import html2canvas from 'html2canvas';
+import jsPDF from 'jspdf';
+import { saveAs } from 'file-saver';
+import Docxtemplater from 'docxtemplater';
+import PizZip from 'pizzip';
+import {
+  getOverseasRegistrationList,
+  getOverseasRegistration,
+  addOverseasRegistration,
+  updateOverseasRegistration,
+  delOverseasRegistration,
+  submitOverseasRegistration,
+  cancelOverseasRegistration,
+  addAndSubmitOverseasRegistration,
+  generateOverseasCertificate,
+  type OverseasRegistrationQuery,
+  type OverseasRegistrationVO,
+  type OverseasRegistrationForm
+} from '@/api/rs/overseas-registration';
+
+const { proxy } = getCurrentInstance() as ComponentInternalInstance;
+
+// 字典数据
+// const dictStore = useDictStore();
+const statusOptions = ref([
+  { label: '草稿', value: '0' }, // 初始创建状态，未提交审核
+  { label: '待审核', value: '1' }, // 已提交，等待审批
+  { label: '已通过', value: '2' }, // 审批通过，登记信息确认
+  { label: '已拒绝', value: '3' } // 审批拒绝
+]);
+
+// 性别选项
+const genderOptions = ref([
+  { label: '男', value: '0' },
+  { label: '女', value: '1' }
+]);
+
+const completionStatusOptions = ref([
+  { label: '已完成', value: '1' },
+  { label: '进行中', value: '0' },
+  { label: '已取消', value: '2' }
+]);
+
+// 列表相关
+const showSearch = ref(true);
+const loading = ref(true);
+const registrationList = ref<OverseasRegistrationVO[]>([]);
+const total = ref(0);
+const queryFormRef = ref();
+
+// 表单相关
+const registrationFormRef = ref<FormInstance>();
+const dialog = reactive({
+  visible: false,
+  title: '',
+  loading: false,
+  isEdit: false
+});
+
+const initFormData: OverseasRegistrationForm = {
+  registrationId: undefined,
+  name: undefined,
+  gender: undefined,
+  birthDate: undefined,
+  photo: undefined,
+  idNumber: undefined,
+  politicalStatus: undefined,
+  registeredAddress: undefined,
+  department: undefined,
+  position: undefined,
+  administrativeLevel: undefined,
+  personnelCategory: undefined,
+  applicationId: undefined,
+  remarks: undefined,
+  status: '2' // 默认状态为已通过
+};
+
+// 扩展form对象，添加firstName和lastName字段用于表单验证
+interface ExtendedForm extends OverseasRegistrationForm {
+  firstName?: string;
+  lastName?: string;
+}
+
+const data = reactive({
+  form: {
+    ...initFormData,
+    firstName: '',
+    lastName: ''
+  } as ExtendedForm,
+  queryParams: {
+    pageNum: 1,
+    pageSize: 10,
+    name: undefined,
+    gender: undefined,
+    idNumber: undefined,
+    politicalStatus: undefined,
+    department: undefined,
+    position: undefined,
+    administrativeLevel: undefined,
+    personnelCategory: undefined,
+    status: undefined,
+    registrationTimeStart: undefined,
+    registrationTimeEnd: undefined,
+    createTimeStart: undefined,
+    createTimeEnd: undefined,
+    params: {}
+  } as OverseasRegistrationQuery
+});
+
+const { queryParams, form } = toRefs(data);
+
+const registrationRules = {
+  firstName: [{ required: true, message: '请输入姓', trigger: 'blur' }],
+  lastName: [{ required: true, message: '请输入名', trigger: 'blur' }],
+  gender: [{ required: true, message: '请选择性别', trigger: 'change' }],
+  birthDate: [{ required: true, message: '请选择出生日期', trigger: 'change' }],
+  idNumber: [
+    { required: true, message: '请输入身份证号', trigger: 'blur' },
+    {
+      pattern: /^[1-9]\d{5}(18|19|20)\d{2}((0[1-9])|(1[0-2]))(([0-2][1-9])|10|20|30|31)\d{3}[0-9Xx]$/,
+      message: '请输入正确的18位身份证号码',
+      trigger: 'blur'
+    }
+  ],
+  politicalStatus: [{ required: true, message: '请选择政治面貌', trigger: 'change' }],
+  registeredAddress: [{ required: true, message: '请输入户籍所在地', trigger: 'blur' }],
+  department: [{ required: true, message: '请输入工作部门', trigger: 'blur' }],
+  position: [{ required: true, message: '请输入职务职称', trigger: 'blur' }]
+};
+
+// 查看详情
+const viewDialog = reactive({
+  visible: false,
+  loading: false
+});
+
+const viewData = ref<any>({});
+
+// PDF生成相关
+const isPdfGenerating = ref(false);
+const pdfContainer = ref<HTMLElement>();
+
+// 工具方法
+const formatDate = (date: string) => {
+  if (!date) return '';
+  return new Date(date).toLocaleDateString('zh-CN');
+};
+
+// PDF日期格式化（格式：年 月 日）
+const formatPdfDate = (date: string) => {
+  if (!date) return '';
+  const d = new Date(date);
+  const year = d.getFullYear();
+  const month = String(d.getMonth() + 1).padStart(2, '0');
+  const day = String(d.getDate()).padStart(2, '0');
+  return `${year} 年 ${month} 月 ${day} 日`;
+};
+
+const formatMoney = (amount: number) => {
+  if (!amount) return '0.00';
+  return amount.toFixed(2);
+};
+
+const getStatusTagType = (status: string): 'success' | 'warning' | 'info' | 'primary' | 'danger' => {
+  const tagTypes: Record<string, 'success' | 'warning' | 'info' | 'primary' | 'danger'> = {
+    '0': 'info', // 草稿
+    '1': 'warning', // 待审核
+    '2': 'success', // 已通过
+    '3': 'danger' // 已拒绝
+  };
+  return tagTypes[status] || 'info';
+};
+
+const getCompletionStatusTagType = (status: string): 'success' | 'warning' | 'info' | 'primary' | 'danger' => {
+  const tagTypes: Record<string, 'success' | 'warning' | 'info' | 'primary' | 'danger'> = {
+    '0': 'warning', // 进行中
+    '1': 'success', // 已完成
+    '2': 'danger' // 已取消
+  };
+  return tagTypes[status] || 'info';
+};
+
+// 查询列表
+const getList = async () => {
+  loading.value = true;
+  try {
+    const res = await getOverseasRegistrationList(queryParams.value);
+    registrationList.value = res.rows;
+    total.value = res.total;
+  } catch (error) {
+    console.error('获取登记列表失败：', error);
+    ElMessage.error('获取登记列表失败');
+  } finally {
+    loading.value = false;
+  }
+};
+
+/** 搜索按钮操作 */
+const handleQuery = () => {
+  queryParams.value.pageNum = 1;
+  getList();
+};
+
+/** 重置按钮操作 */
+const resetQuery = () => {
+  queryFormRef.value?.resetFields();
+  handleQuery();
+};
+
+/** 新增按钮操作 */
+const handleAdd = () => {
+  reset();
+  dialog.visible = true;
+  dialog.title = '新增出国登记';
+  dialog.isEdit = false;
+};
+
+/** 修改按钮操作 */
+const handleEdit = async (row: OverseasRegistrationVO) => {
+  reset();
+  const res = await getOverseasRegistration(row.registrationId);
+  Object.assign(form.value, res.data);
+  // 如果后端返回的数据没有status，则默认设置为'2'（已通过）
+  if (!form.value.status) {
+    form.value.status = '2';
+  }
+  // 将姓名按逗号分割，分别赋值给姓和名
+  if (form.value.name) {
+    const nameParts = form.value.name.split(',');
+    form.value.firstName = nameParts[0] || '';
+    form.value.lastName = nameParts[1] || '';
+  } else {
+    form.value.firstName = '';
+    form.value.lastName = '';
+  }
+  dialog.visible = true;
+  dialog.title = '编辑出国登记';
+  dialog.isEdit = true;
+};
+
+/** 查看详情 */
+const handleView = (row: any) => {
+  viewData.value = { ...row };
+  viewDialog.visible = true;
+};
+
+/** 提交登记 */
+const handleSubmit = async (row: any) => {
+  try {
+    await ElMessageBox.confirm('确认提交该登记记录？', '提示', {
+      confirmButtonText: '确定',
+      cancelButtonText: '取消',
+      type: 'warning'
+    });
+
+    await submitOverseasRegistration({ registrationId: row.registrationId });
+    proxy?.$modal.msgSuccess('提交成功');
+    await getList();
+  } catch (error) {
+    if (error !== 'cancel') {
+      ElMessage.error('提交失败');
+    }
+  }
+};
+
+/** 撤回登记 */
+const handleCancel = async (row: any) => {
+  try {
+    await ElMessageBox.confirm('确认撤回该登记记录？', '提示', {
+      confirmButtonText: '确定',
+      cancelButtonText: '取消',
+      type: 'warning'
+    });
+
+    await cancelOverseasRegistration(row.registrationId);
+    proxy?.$modal.msgSuccess('撤回成功');
+    await getList();
+  } catch (error) {
+    if (error !== 'cancel') {
+      ElMessage.error('撤回失败');
+    }
+  }
+};
+
+/** 删除按钮操作 */
+const handleDelete = async (row: any) => {
+  try {
+    await proxy?.$modal.confirm('是否确认删除该登记记录？');
+    await delOverseasRegistration(row.registrationId);
+    proxy?.$modal.msgSuccess('删除成功');
+    await getList();
+  } catch (error) {
+    if (error !== 'cancel') {
+      ElMessage.error('删除失败');
+    }
+  }
+};
+
+const handleGenerateCertificate = async (row: any) => {
+  try {
+    ElMessage.info('正在生成证明文档，请稍候...');
+
+    // 获取完整的登记信息
+    const res = await getOverseasRegistration(row.registrationId);
+    const data = res.data;
+
+    // 处理姓名（去掉逗号）
+    const displayName = data.name ? data.name.replace(/,/g, '') : '';
+    const nameParts = data.name ? data.name.split(',') : ['', ''];
+    const firstName = nameParts[0] || '';
+    const lastName = nameParts[1] || '';
+
+    // 格式化日期
+    const formatDate = (dateStr: string) => {
+      if (!dateStr) return '';
+      const date = new Date(dateStr);
+      const year = date.getFullYear();
+      const month = String(date.getMonth() + 1).padStart(2, '0');
+      const day = String(date.getDate()).padStart(2, '0');
+      return `${year}年${month}月${day}日`;
+    };
+
+    // 准备模板数据
+    const templateData = {
+      firstName: firstName,
+      lastName: lastName,
+      gender: data.gender === '0' ? '男' : '女',
+      birthDate: formatDate(data.birthDate),
+      idNumber: data.idNumber || '',
+      politicalStatus: data.politicalStatus || '',
+      registeredAddress: data.registeredAddress || '',
+      department: data.department || '',
+      position: data.position || '',
+      administrativeLevel: data.administrativeLevel || '',
+      personnelCategory: data.personnelCategory || ''
+    };
+
+    // 加载模板文件
+    const response = await fetch('/chuguodengji.docx');
+    const arrayBuffer = await response.arrayBuffer();
+
+    // 使用 PizZip 解压 docx 文件
+    const zip = new PizZip(arrayBuffer);
+
+    // 创建 docxtemplater 实例
+    const doc = new Docxtemplater(zip, {
+      paragraphLoop: true,
+      linebreaks: true
+    });
+
+    // 设置模板数据
+    doc.setData(templateData);
+
+    // 渲染文档（替换占位符）
+    try {
+      doc.render();
+    } catch (error: any) {
+      console.error('模板渲染错误:', error);
+      // 如果模板中没有占位符，提示用户
+      if (error.properties && error.properties.errors) {
+        console.error('占位符错误:', error.properties.errors);
+        ElMessage.warning('模板文件中未找到占位符，请确保模板文件中使用了 {变量名} 格式的占位符');
+      }
+      throw error;
+    }
+
+    // 生成文档
+    const blob = doc.getZip().generate({
+      type: 'blob',
+      mimeType: 'application/vnd.openxmlformats-officedocument.wordprocessingml.document'
+    });
+
+    // 下载文件
+    const fileName = `出国登记表_${displayName}_${new Date().getTime()}.docx`;
+    saveAs(blob, fileName);
+
+    ElMessage.success('证明生成成功');
+  } catch (error) {
+    console.error('生成证明失败:', error);
+    ElMessage.error('证明生成失败，请检查模板文件格式');
+  }
+};
+
+// PDF下载方法
+const handleDownloadPDF = async () => {
+  // 验证数据是否存在
+  if (!viewData.value || !viewData.value.registrationId) {
+    ElMessage.error('请先查看详情数据');
+    return;
+  }
+
+  try {
+    ElMessage.info('正在生成PDF，请稍候...');
+
+    // 显示PDF容器以便渲染
+    isPdfGenerating.value = true;
+
+    // 等待DOM更新和渲染
+    await nextTick();
+    await new Promise((resolve) => setTimeout(resolve, 100));
+
+    if (!pdfContainer.value) {
+      throw new Error('PDF容器未找到');
+    }
+
+    console.log('PDF容器尺寸:', {
+      width: pdfContainer.value.offsetWidth,
+      height: pdfContainer.value.offsetHeight
+    });
+
+    // 使用html2canvas将DOM转换为canvas
+    const canvas = await html2canvas(pdfContainer.value, {
+      scale: 2, // 提高清晰度
+      useCORS: true,
+      backgroundColor: '#ffffff',
+      logging: false,
+      allowTaint: true, // 允许跨域图片
+      foreignObjectRendering: false,
+      width: pdfContainer.value.offsetWidth,
+      height: pdfContainer.value.offsetHeight
+    });
+
+    console.log('Canvas尺寸:', {
+      width: canvas.width,
+      height: canvas.height
+    });
+
+    // 验证canvas是否有效
+    if (!canvas || canvas.width === 0 || canvas.height === 0) {
+      throw new Error('Canvas生成失败，容器可能没有内容或尺寸为0');
+    }
+
+    // 转换为图片数据，使用JPEG格式更稳定
+    const imgData = canvas.toDataURL('image/jpeg', 1.0);
+
+    // 验证图片数据
+    if (!imgData || imgData === 'data:,') {
+      throw new Error('图片数据生成失败');
+    }
+
+    // 计算PDF页面尺寸
+    const imgWidth = 210; // A4纸宽度（mm）
+    const pageHeight = 297; // A4纸高度（mm）
+    const imgHeight = (canvas.height * imgWidth) / canvas.width;
+
+    // 创建PDF文档
+    const pdf = new jsPDF({
+      orientation: 'portrait',
+      unit: 'mm',
+      format: 'a4'
+    });
+
+    let heightLeft = imgHeight;
+    let position = 0;
+
+    // 添加第一页，使用JPEG格式
+    pdf.addImage(imgData, 'JPEG', 0, position, imgWidth, imgHeight);
+    heightLeft -= pageHeight;
+
+    // 如果内容超过一页，添加新页面
+    while (heightLeft > 0) {
+      position = heightLeft - imgHeight;
+      pdf.addPage();
+      pdf.addImage(imgData, 'JPEG', 0, position, imgWidth, imgHeight);
+      heightLeft -= pageHeight;
+    }
+
+    // 生成文件名
+    const displayName = viewData.value.name ? viewData.value.name.replace(/,/g, '') : '未命名';
+    const fileName = `出国登记表_${displayName}_${new Date().getTime()}.pdf`;
+
+    // 下载PDF
+    pdf.save(fileName);
+
+    ElMessage.success('PDF下载成功');
+  } catch (error: any) {
+    console.error('生成PDF失败:', error);
+    ElMessage.error(`PDF生成失败：${error?.message || '请重试'}`);
+  } finally {
+    // 隐藏PDF容器
+    isPdfGenerating.value = false;
+  }
+};
+
+/** 表单重置 */
+const reset = () => {
+  form.value = {
+    ...initFormData,
+    firstName: '',
+    lastName: ''
+  } as ExtendedForm;
+  nextTick(() => {
+    registrationFormRef.value?.resetFields();
+  });
+};
+
+/** 取消按钮 */
+const cancel = () => {
+  reset();
+  dialog.visible = false;
+};
+
+/** 提交按钮 */
+const submitForm = () => {
+  registrationFormRef.value?.validate(async (valid) => {
+    if (valid) {
+      // 将姓和名用逗号拼接后赋值给form.name
+      form.value.name = `${form.value.firstName || ''},${form.value.lastName || ''}`;
+      dialog.loading = true;
+      try {
+        if (dialog.isEdit) {
+          await updateOverseasRegistration(form.value);
+          proxy?.$modal.msgSuccess('更新成功');
+        } else {
+          await addOverseasRegistration(form.value);
+          proxy?.$modal.msgSuccess('保存成功');
+        }
+        dialog.visible = false;
+        reset();
+        await getList();
+      } catch (error) {
+        ElMessage.error(dialog.isEdit ? '更新失败' : '保存失败');
+      } finally {
+        dialog.loading = false;
+      }
+    }
+  });
+};
+
+/** 保存并提交 */
+const submitAndConfirm = () => {
+  registrationFormRef.value?.validate(async (valid) => {
+    if (valid) {
+      // 将姓和名用逗号拼接后赋值给form.name
+      form.value.name = `${form.value.firstName || ''},${form.value.lastName || ''}`;
+      dialog.loading = true;
+      try {
+        await addAndSubmitOverseasRegistration(form.value);
+        proxy?.$modal.msgSuccess('保存并提交成功');
+        dialog.visible = false;
+        reset();
+        await getList();
+      } catch (error) {
+        ElMessage.error('保存并提交失败');
+      } finally {
+        dialog.loading = false;
+      }
+    }
+  });
+};
+
+// 生命周期
+onMounted(() => {
+  getList();
+});
+</script>
+
+<style scoped>
+/* 页面容器样式 */
+.page-container {
+  padding: 8px;
+}
+
+/* 搜索按钮容器样式 */
+.search-btn-container {
+  display: flex;
+  justify-content: flex-end;
+  margin-top: 10px;
+}
+
+.search-btn-container .el-form-item {
+  margin-bottom: 0 !important;
+}
+
+.form-section {
+  margin-bottom: 20px;
+}
+
+.section-title {
+  margin: 0 0 15px 0;
+  padding-bottom: 8px;
+  border-bottom: 1px solid #e4e7ed;
+  color: #303133;
+  font-size: 14px;
+  font-weight: 500;
+}
+
+.detail-content {
+  max-height: 600px;
+  overflow-y: auto;
+}
+
+.detail-section {
+  margin-bottom: 20px;
+}
+
+.detail-section:last-child {
+  margin-bottom: 0;
+}
+
+.dialog-footer {
+  display: flex;
+  justify-content: flex-end;
+  gap: 10px;
+}
+
+:deep(.el-descriptions__label) {
+  font-weight: 500;
+}
+
+:deep(.el-table .cell) {
+  padding: 8px 0;
+}
+
+/* 填表说明样式 */
+.form-note {
+  margin: 20px 0 10px 0;
+  padding: 12px 16px;
+  background-color: #f8f9fa;
+  border-left: 4px solid #409eff;
+  border-radius: 4px;
+}
+
+.note-text {
+  margin: 0;
+  font-size: 14px;
+  line-height: 1.5;
+  color: #606266;
+}
+
+.note-text strong {
+  color: #303133;
+  font-weight: 600;
+}
+
+/* PDF生成容器样式 */
+.pdf-container {
+  width: 794px; /* A4纸宽度 */
+  padding: 40px 50px;
+  background: #ffffff;
+  font-family: 'SimSun', '宋体', serif;
+}
+
+.pdf-page {
+  width: 100%;
+}
+
+.pdf-title {
+  text-align: center;
+  font-size: 20px;
+  font-weight: bold;
+  color: #000000;
+  margin-bottom: 20px;
+  line-height: 1.5;
+}
+
+.pdf-number {
+  text-align: right;
+  font-size: 14px;
+  color: #000000;
+  margin-bottom: 15px;
+  line-height: 1.5;
+}
+
+.pdf-table {
+  width: 100%;
+  border-collapse: collapse;
+  border: 1px solid #000000;
+  font-size: 12px;
+  color: #000000;
+  margin-bottom: 15px;
+}
+
+.pdf-table td {
+  border: 1px solid #000000;
+  padding: 6px 8px;
+  line-height: 1.6;
+  vertical-align: middle;
+}
+
+.pdf-table .center-text {
+  text-align: center;
+  vertical-align: middle;
+}
+
+.pdf-table .bold-text {
+  font-weight: bold;
+}
+
+.pdf-table .data-cell {
+  padding: 8px;
+  line-height: 1.8;
+}
+
+.pdf-table .photo-cell {
+  padding: 10px;
+  width: 121px; /* 照片宽度: 32mm ≈ 121px */
+  height: 98px; /* 照片高度: 26mm ≈ 98px */
+  min-height: 98px;
+}
+
+.pdf-table .photo-text {
+  font-size: 14px;
+  font-weight: bold;
+  margin-bottom: 5px;
+}
+
+.pdf-table .photo-desc {
+  font-size: 9px;
+  line-height: 1.3;
+}
+
+.pdf-table .seal-cell {
+  font-size: 16px;
+  color: #666;
+}
+
+.pdf-table .signature-area {
+  font-size: 11px;
+  padding: 5px;
+  line-height: 1.5;
+  writing-mode: horizontal-tb;
+}
+
+.pdf-note {
+  font-size: 12px;
+  color: #000000;
+  margin-top: 15px;
+  line-height: 1.8;
+}
+
+.pdf-note .note-title {
+  font-weight: bold;
+  margin-bottom: 5px;
+}
+
+.pdf-note .note-content {
+  text-indent: 2em;
+}
+
+/* 下划线文本样式 */
+.underline-text {
+  display: inline-block;
+  min-width: 80px;
+  padding: 0 4px;
+  text-align: center;
+}
+</style>
diff --git a/web/src/views/rs/overseas-registration/index.vue b/web/src/views/rs/overseas-registration/index.vue
index 1b898610..28ba279c 100644
--- a/web/src/views/rs/overseas-registration/index.vue
+++ b/web/src/views/rs/overseas-registration/index.vue
@@ -1,316 +1,171 @@
 <template>
-  <div class="app-container">
-    <el-card class="box-card">
-      <!-- 出国登记管理选项卡 -->
-      <el-tabs v-model="state.activeTab" type="border-card" @tab-click="handleTabClick">
-        <!-- 出国登记标签页 -->
-        <el-tab-pane label="出国登记" name="registration">
-          <div class="tab-content">
-            <!-- 搜索区域 -->
-            <transition :enter-active-class="animate.searchAnimate.enter" :leave-active-class="animate.searchAnimate.leave">
-              <div v-show="showRegistrationSearch" class="mb-[10px]">
-                <el-card shadow="hover">
-                  <el-form ref="registrationQueryForm" :model="registrationQueryParams" label-width="100px">
-                    <el-row :gutter="20">
-                      <el-col :span="6">
-                        <el-form-item label="姓名" prop="name">
-                          <el-input v-model="registrationQueryParams.name" placeholder="请输入姓名" clearable />
-                        </el-form-item>
-                      </el-col>
-                      <el-col :span="6">
-                        <el-form-item label="身份证号" prop="idNumber">
-                          <el-input v-model="registrationQueryParams.idNumber" placeholder="请输入身份证号" clearable />
-                        </el-form-item>
-                      </el-col>
-                      <el-col :span="6">
-                        <el-form-item label="工作部门" prop="department">
-                          <el-input v-model="registrationQueryParams.department" placeholder="请输入工作部门" clearable />
-                        </el-form-item>
-                      </el-col>
-                      <el-col :span="6">
-                        <el-form-item label="登记状态" prop="status">
-                          <el-select v-model="registrationQueryParams.status" placeholder="请选择登记状态" clearable style="width: 100%">
-                            <el-option v-for="dict in statusOptions" :key="dict.value" :label="dict.label" :value="dict.value" />
-                          </el-select>
-                        </el-form-item>
-                      </el-col>
-                    </el-row>
+  <div class="p-2 page-container">
+    <!-- 搜索区域 -->
+    <transition :enter-active-class="proxy?.animate.searchAnimate.enter" :leave-active-class="proxy?.animate.searchAnimate.leave">
+      <div v-show="showSearch" class="mb-[10px]">
+        <el-card shadow="hover">
+          <el-form ref="queryFormRef" :model="queryParams" label-width="100px">
+            <el-row :gutter="20">
+              <el-col :span="6">
+                <el-form-item label="姓名" prop="name">
+                  <el-input v-model="queryParams.name" placeholder="请输入姓名" clearable @keyup.enter="handleQuery" />
+                </el-form-item>
+              </el-col>
+              <el-col :span="6">
+                <el-form-item label="身份证号" prop="idNumber">
+                  <el-input v-model="queryParams.idNumber" placeholder="请输入身份证号" clearable @keyup.enter="handleQuery" />
+                </el-form-item>
+              </el-col>
+              <el-col :span="6">
+                <el-form-item label="工作部门" prop="department">
+                  <el-input v-model="queryParams.department" placeholder="请输入工作部门" clearable @keyup.enter="handleQuery" />
+                </el-form-item>
+              </el-col>
+              <!-- <el-col :span="6">
+                <el-form-item label="登记状态" prop="status">
+                  <el-select v-model="queryParams.status" placeholder="请选择登记状态" clearable style="width: 100%">
+                    <el-option v-for="dict in statusOptions" :key="dict.value" :label="dict.label" :value="dict.value" />
+                  </el-select>
+                </el-form-item>
+              </el-col> -->
+            </el-row>
 
-                    <el-row>
-                      <el-col :span="24" class="search-btn-container">
-                        <el-form-item>
-                          <el-button type="primary" icon="Search" @click="handleRegistrationQuery">搜索</el-button>
-                          <el-button icon="Refresh" @click="resetRegistrationQuery">重置</el-button>
-                        </el-form-item>
-                      </el-col>
-                    </el-row>
-                  </el-form>
-                </el-card>
-              </div>
-            </transition>
+            <el-row>
+              <el-col :span="24" class="search-btn-container">
+                <el-form-item>
+                  <el-button type="primary" icon="Search" @click="handleQuery">搜索</el-button>
+                  <el-button icon="Refresh" @click="resetQuery">重置</el-button>
+                </el-form-item>
+              </el-col>
+            </el-row>
+          </el-form>
+        </el-card>
+      </div>
+    </transition>
 
-            <!-- 操作按钮区域 -->
-            <el-card shadow="never" class="button-card table-card">
-              <template #header>
-                <el-row :gutter="10" class="mb8">
-                  <el-col :span="1.5">
-                    <el-button type="primary" plain icon="Plus" @click="handleAddRegistration" v-hasPermi="['rs:registration:add']">新增登记</el-button>
-                  </el-col>
-                  <el-col :span="1.5">
-                    <el-button icon="Download" @click="handleExportRegistration" v-hasPermi="['rs:registration:export']" style="display: none"
-                      >导出</el-button
-                    >
-                  </el-col>
-                  <right-toolbar v-model:showSearch="showRegistrationSearch" @queryTable="getRegistrationList"></right-toolbar>
-                </el-row>
-              </template>
+    <!-- 操作按钮区域 -->
+    <el-card shadow="never">
+      <template #header>
+        <el-row :gutter="10" class="mb8">
+          <el-col :span="1.5">
+            <el-button type="primary" plain icon="Plus" @click="handleAdd">新增登记</el-button>
+          </el-col>
+          <right-toolbar v-model:showSearch="showSearch" @queryTable="getList"></right-toolbar>
+        </el-row>
+      </template>
 
-              <!-- 出国登记表格 -->
-              <el-table v-loading="registrationLoading" border :data="registrationList" @row-dblclick="handleViewRegistration">
-                <el-table-column type="selection" width="55" align="center" />
+      <!-- 出国登记表格 -->
+      <el-table v-loading="loading" border :data="registrationList" @row-dblclick="handleView">
+        <el-table-column type="selection" width="55" align="center" />
 
-                <el-table-column label="姓名" align="center" prop="name" width="100" :show-overflow-tooltip="true" />
-                <el-table-column label="性别" align="center" width="80">
-                  <template #default="scope">{{ scope.row.gender === '0' ? '男' : '女' }}</template>
-                </el-table-column>
-                <el-table-column label="身份证号" align="center" prop="idNumber" width="180" :show-overflow-tooltip="true" />
-                <el-table-column label="工作部门" align="center" prop="department" min-width="150" :show-overflow-tooltip="true" />
-                <el-table-column label="职务职称" align="center" prop="position" width="120" :show-overflow-tooltip="true" />
-                <el-table-column label="政治面貌" align="center" prop="politicalStatus" width="120" :show-overflow-tooltip="true" />
-                <el-table-column label="登记状态" align="center" prop="statusText" width="120">
-                  <template #default="scope">
-                    <el-tag :type="getStatusTagType(scope.row.status)">{{ scope.row.statusText }}</el-tag>
-                  </template>
-                </el-table-column>
-                <el-table-column label="创建时间" align="center" prop="createTime" width="160" :show-overflow-tooltip="true" />
-                <el-table-column label="操作" align="center" width="280">
-                  <template #default="scope">
-                    <el-tooltip content="查看详情" placement="top">
-                      <el-button
-                        link
-                        type="primary"
-                        icon="View"
-                        @click="handleViewRegistration(scope.row)"
-                        v-hasPermi="['rs:registration:query']"
-                      ></el-button>
-                    </el-tooltip>
-                    <!-- 草稿状态：显示编辑按钮 -->
-                    <el-tooltip content="编辑登记" placement="top" v-if="scope.row.status === '0'">
-                      <el-button
-                        link
-                        type="warning"
-                        icon="Edit"
-                        @click="handleEditRegistration(scope.row)"
-                        v-hasPermi="['rs:registration:edit']"
-                      ></el-button>
-                    </el-tooltip>
-                    <!-- 草稿状态：显示提交按钮 -->
-                    <el-tooltip content="提交登记" placement="top" v-if="scope.row.status === '0'">
-                      <el-button
-                        link
-                        type="success"
-                        icon="Check"
-                        @click="handleSubmitRegistration(scope.row)"
-                        v-hasPermi="['rs:registration:submit']"
-                      ></el-button>
-                    </el-tooltip>
-                    <!-- 已提交状态：显示撤回按钮 -->
-                    <el-tooltip content="撤回登记" placement="top" v-if="scope.row.status === '1'">
-                      <el-button
-                        link
-                        type="warning"
-                        icon="RefreshLeft"
-                        @click="handleCancelRegistration(scope.row)"
-                        v-hasPermi="['rs:registration:cancel']"
-                      ></el-button>
-                    </el-tooltip>
-                    <!-- 生成证明按钮：已确认的登记可以生成证明 -->
-                    <el-tooltip content="生成证明" placement="top" v-if="scope.row.status === '2'">
-                      <el-button
-                        link
-                        type="success"
-                        icon="Document"
-                        @click="handleGenerateCertificate(scope.row)"
-                        v-hasPermi="['rs:registration:generate']"
-                      ></el-button>
-                    </el-tooltip>
-                    <!-- 删除按钮：仅在草稿状态下显示 -->
-                    <el-tooltip content="删除" placement="top" v-if="scope.row.status === '0'">
-                      <el-button
-                        link
-                        type="danger"
-                        icon="Delete"
-                        @click="handleDeleteRegistration(scope.row)"
-                        v-hasPermi="['rs:registration:remove']"
-                      ></el-button>
-                    </el-tooltip>
-                  </template>
-                </el-table-column>
-              </el-table>
+        <el-table-column label="姓名" align="center" width="100" :show-overflow-tooltip="true">
+          <template #default="scope">
+            {{ scope.row.name ? scope.row.name.replace(/,/g, '') : '' }}
+          </template>
+        </el-table-column>
+        <el-table-column label="性别" align="center" width="80">
+          <template #default="scope">{{ scope.row.gender === '0' ? '男' : '女' }}</template>
+        </el-table-column>
+        <el-table-column label="身份证号" align="center" prop="idNumber" width="180" :show-overflow-tooltip="true" />
+        <el-table-column label="工作部门" align="center" prop="department" min-width="150" :show-overflow-tooltip="true" />
+        <el-table-column label="职务职称" align="center" prop="position" width="120" :show-overflow-tooltip="true" />
+        <el-table-column label="政治面貌" align="center" prop="politicalStatus" width="120" :show-overflow-tooltip="true" />
+        <el-table-column label="登记状态" align="center" prop="statusText" width="120">
+          <template #default="scope">
+            <el-tag :type="getStatusTagType(scope.row.status)">{{ scope.row.statusText }}</el-tag>
+          </template>
+        </el-table-column>
+        <el-table-column label="创建时间" align="center" prop="createTime" width="160" :show-overflow-tooltip="true" />
+        <el-table-column label="操作" align="center" class-name="small-padding fixed-width" width="280">
+          <template #default="scope">
+            <el-tooltip content="查看详情" placement="top">
+              <el-button link type="primary" icon="View" @click="handleView(scope.row)"></el-button>
+            </el-tooltip>
+            <!-- 草稿状态和已通过状态：显示编辑按钮 -->
+            <el-tooltip content="编辑登记" placement="top" v-if="scope.row.status === '0' || scope.row.status === '2'">
+              <el-button link type="warning" icon="Edit" @click="handleEdit(scope.row)"></el-button>
+            </el-tooltip>
+            <!-- 草稿状态：显示提交按钮 -->
+            <el-tooltip content="提交登记" placement="top" v-if="scope.row.status === '0'">
+              <el-button link type="success" icon="Check" @click="handleSubmit(scope.row)"></el-button>
+            </el-tooltip>
+            <!-- 已提交状态：显示撤回按钮 -->
+            <el-tooltip content="撤回登记" placement="top" v-if="scope.row.status === '1'">
+              <el-button link type="warning" icon="RefreshLeft" @click="handleCancel(scope.row)"></el-button>
+            </el-tooltip>
+            <!-- 生成证明按钮：已确认的登记可以生成证明 -->
+            <el-tooltip content="生成证明" placement="top" v-if="scope.row.status === '2'">
+              <el-button link type="success" icon="Document" @click="handleGenerateCertificate(scope.row)"></el-button>
+            </el-tooltip>
+            <!-- 删除按钮：仅在草稿状态下显示 -->
+            <el-tooltip content="删除" placement="top" v-if="scope.row.status === '0'">
+              <el-button link type="danger" icon="Delete" @click="handleDelete(scope.row)"></el-button>
+            </el-tooltip>
+          </template>
+        </el-table-column>
+      </el-table>
 
-              <pagination
-                v-show="registrationTotal > 0"
-                :total="registrationTotal"
-                v-model:page="registrationQueryParams.pageNum"
-                v-model:limit="registrationQueryParams.pageSize"
-                @pagination="getRegistrationList"
-              />
-            </el-card>
-          </div>
-        </el-tab-pane>
-
-        <!-- 登记历史标签页 -->
-        <el-tab-pane label="登记历史" name="history">
-          <div class="tab-content">
-            <!-- 搜索区域 -->
-            <transition :enter-active-class="animate.searchAnimate.enter" :leave-active-class="animate.searchAnimate.leave">
-              <div v-show="showHistorySearch" class="mb-[10px]">
-                <el-card shadow="hover">
-                  <el-form ref="historyQueryForm" :model="historyQueryParams" label-width="100px">
-                    <el-row :gutter="20">
-                      <el-col :span="6">
-                        <el-form-item label="姓名" prop="name">
-                          <el-input v-model="historyQueryParams.name" placeholder="请输入姓名" clearable />
-                        </el-form-item>
-                      </el-col>
-                      <el-col :span="6">
-                        <el-form-item label="身份证号" prop="idNumber">
-                          <el-input v-model="historyQueryParams.idNumber" placeholder="请输入身份证号" clearable />
-                        </el-form-item>
-                      </el-col>
-                      <el-col :span="6">
-                        <el-form-item label="工作部门" prop="department">
-                          <el-input v-model="historyQueryParams.department" placeholder="请输入工作部门" clearable />
-                        </el-form-item>
-                      </el-col>
-                      <el-col :span="6">
-                        <el-form-item label="登记状态" prop="status">
-                          <el-select v-model="historyQueryParams.status" placeholder="请选择登记状态" clearable style="width: 100%">
-                            <el-option v-for="dict in statusOptions" :key="dict.value" :label="dict.label" :value="dict.value" />
-                          </el-select>
-                        </el-form-item>
-                      </el-col>
-                    </el-row>
-
-                    <el-row>
-                      <el-col :span="24" class="search-btn-container">
-                        <el-form-item>
-                          <el-button type="primary" icon="Search" @click="handleHistoryQuery">搜索</el-button>
-                          <el-button icon="Refresh" @click="resetHistoryQuery">重置</el-button>
-                        </el-form-item>
-                      </el-col>
-                    </el-row>
-                  </el-form>
-                </el-card>
-              </div>
-            </transition>
-
-            <!-- 操作按钮区域 -->
-            <el-card shadow="never" class="button-card table-card">
-              <template #header>
-                <el-row :gutter="10" class="mb8">
-                  <right-toolbar v-model:showSearch="showHistorySearch" @queryTable="getHistoryList"></right-toolbar>
-                </el-row>
-              </template>
-
-              <!-- 登记历史表格 -->
-              <el-table v-loading="historyLoading" border :data="historyList" @row-dblclick="handleViewHistory">
-                <el-table-column type="selection" width="55" align="center" />
-                
-                <el-table-column label="姓名" align="center" prop="name" width="100" :show-overflow-tooltip="true" />
-                <el-table-column label="性别" align="center" width="80">
-                  <template #default="scope">{{ scope.row.gender === '0' ? '男' : '女' }}</template>
-                </el-table-column>
-                <el-table-column label="身份证号" align="center" prop="idNumber" width="180" :show-overflow-tooltip="true" />
-                <el-table-column label="工作部门" align="center" prop="department" min-width="150" :show-overflow-tooltip="true" />
-                <el-table-column label="职务职称" align="center" prop="position" width="120" :show-overflow-tooltip="true" />
-                <el-table-column label="政治面貌" align="center" prop="politicalStatus" width="120" :show-overflow-tooltip="true" />
-                <el-table-column label="登记状态" align="center" prop="statusText" width="120">
-                  <template #default="scope">
-                    <el-tag :type="getStatusTagType(scope.row.status)">{{ scope.row.statusText }}</el-tag>
-                  </template>
-                </el-table-column>
-                <el-table-column label="创建时间" align="center" prop="createTime" width="160" :show-overflow-tooltip="true" />
-                <el-table-column label="操作" align="center" width="200">
-                  <template #default="scope">
-                    <el-tooltip content="查看详情" placement="top">
-                      <el-button link type="primary" icon="View" @click="handleViewHistory(scope.row)" v-hasPermi="['rs:registration:query']"></el-button>
-                    </el-tooltip>
-                  </template>
-                </el-table-column>
-              </el-table>
-
-              <pagination
-                v-show="historyTotal > 0"
-                :total="historyTotal"
-                v-model:page="historyQueryParams.pageNum"
-                v-model:limit="historyQueryParams.pageSize"
-                @pagination="getHistoryList"
-              />
-            </el-card>
-          </div>
-        </el-tab-pane>
-      </el-tabs>
+      <pagination v-show="total > 0" :total="total" v-model:page="queryParams.pageNum" v-model:limit="queryParams.pageSize" @pagination="getList" />
     </el-card>
 
     <!-- 出国登记新增/编辑弹窗 -->
     <el-dialog
-      :title="registrationDialog.title"
-      v-model="registrationDialog.visible"
+      :title="dialog.title"
+      v-model="dialog.visible"
       width="900px"
       :close-on-click-modal="false"
       :close-on-press-escape="false"
       destroy-on-close
+      append-to-body
     >
-      <el-form
-        ref="registrationFormRef"
-        :model="registrationForm"
-        :rules="registrationRules"
-        label-width="120px"
-        v-loading="registrationDialog.loading"
-      >
+      <el-form ref="registrationFormRef" :model="form" :rules="registrationRules" label-width="120px" v-loading="dialog.loading">
         <!-- 基本信息 -->
         <div class="form-section">
           <h4 class="section-title">基本信息</h4>
-          <div class="basic-info-container">
-            <!-- 表单字段区域 -->
-            <div class="form-fields">
-                        <el-row :gutter="20">
-                <el-col :span="8">
-                  <el-form-item label="姓名" prop="name">
-                    <el-input v-model="registrationForm.name" placeholder="请输入姓名" style="width: 150px" />
-                  </el-form-item>
-                </el-col>
-                <el-col :span="8" style="transform: translateX(-20%);">
-                  <el-form-item label="性别" prop="gender">
-                    <el-select v-model="registrationForm.gender" placeholder="请选择性别" style="width: 120px">
-                      <el-option label="男" value="0" />
-                      <el-option label="女" value="1" />
-                    </el-select>
-                  </el-form-item>
-                </el-col>
-                <el-col :span="8" style="transform: translateX(-30%);">
-                  <el-form-item label="出生日期" prop="birthDate">
-                    <el-date-picker
-                      v-model="registrationForm.birthDate"
-                      type="date"
-                      placeholder="请选择出生日期"
-                      style="width: 180px"
-                      value-format="YYYY-MM-DD"
-                    />
-                  </el-form-item>
-                </el-col>
-              </el-row>
-
           <el-row :gutter="20">
             <el-col :span="12">
-              <el-form-item label="公民身份号码" prop="idNumber">
-                <el-input v-model="registrationForm.idNumber" placeholder="请输入18位身份证号码" maxlength="18" />
+              <el-form-item label="姓名">
+                <el-row :gutter="10">
+                  <el-col :span="12">
+                    <el-form-item prop="firstName" label-width="0">
+                      <el-input v-model="form.firstName" placeholder="姓" />
+                    </el-form-item>
+                  </el-col>
+                  <el-col :span="12">
+                    <el-form-item prop="lastName" label-width="0">
+                      <el-input v-model="form.lastName" placeholder="名" />
+                    </el-form-item>
+                  </el-col>
+                </el-row>
               </el-form-item>
             </el-col>
+            <el-col :span="12">
+              <el-form-item label="性别" prop="gender">
+                <el-select v-model="form.gender" placeholder="请选择性别" style="width: 100%">
+                  <el-option label="男" value="0" />
+                  <el-option label="女" value="1" />
+                </el-select>
+              </el-form-item>
+            </el-col>
+          </el-row>
+
+          <el-row :gutter="20">
+            <el-col :span="12">
+              <el-form-item label="出生日期" prop="birthDate">
+                <el-date-picker v-model="form.birthDate" type="date" placeholder="请选择出生日期" style="width: 100%" value-format="YYYY-MM-DD" />
+              </el-form-item>
+            </el-col>
+            <el-col :span="12">
+              <el-form-item label="公民身份号码" prop="idNumber">
+                <el-input v-model="form.idNumber" placeholder="请输入18位身份证号码" maxlength="18" />
+              </el-form-item>
+            </el-col>
+          </el-row>
+
+          <el-row :gutter="20">
             <el-col :span="12">
               <el-form-item label="政治面貌" prop="politicalStatus">
-                <el-select v-model="registrationForm.politicalStatus" placeholder="请选择政治面貌" style="width: 100%">
+                <el-select v-model="form.politicalStatus" placeholder="请选择政治面貌" style="width: 100%">
                   <el-option label="中共党员" value="中共党员" />
                   <el-option label="中共预备党员" value="中共预备党员" />
                   <el-option label="共青团员" value="共青团员" />
@@ -327,17 +182,12 @@
                 </el-select>
               </el-form-item>
             </el-col>
-          </el-row>
-
-          <el-row :gutter="20">
-            <el-col :span="24">
+            <el-col :span="12">
               <el-form-item label="户籍所在地" prop="registeredAddress">
-                <el-input v-model="registrationForm.registeredAddress" placeholder="请填写至县（市、区）" />
+                <el-input v-model="form.registeredAddress" placeholder="请填写至县（市、区）" />
               </el-form-item>
             </el-col>
           </el-row>
-            </div>
-          </div>
         </div>
 
         <!-- 工作信息 -->
@@ -346,12 +196,12 @@
           <el-row :gutter="20">
             <el-col :span="12">
               <el-form-item label="工作部门" prop="department">
-                <el-input v-model="registrationForm.department" placeholder="请输入工作部门全称" />
+                <el-input v-model="form.department" placeholder="请输入工作部门全称" />
               </el-form-item>
             </el-col>
             <el-col :span="12">
               <el-form-item label="职务职称" prop="position">
-                <el-input v-model="registrationForm.position" placeholder="请输入职务职称" />
+                <el-input v-model="form.position" placeholder="请输入职务职称" />
               </el-form-item>
             </el-col>
           </el-row>
@@ -359,54 +209,43 @@
           <el-row :gutter="20">
             <el-col :span="12">
               <el-form-item label="行政职级" prop="administrativeLevel">
-                <el-input v-model="registrationForm.administrativeLevel" placeholder="请输入行政职级" />
+                <el-input v-model="form.administrativeLevel" placeholder="请输入行政职级" />
               </el-form-item>
             </el-col>
             <el-col :span="12">
               <el-form-item label="人员类别代码" prop="personnelCategory">
-                <el-input v-model="registrationForm.personnelCategory" placeholder="请输入人员类别代码" />
+                <el-input v-model="form.personnelCategory" placeholder="请输入人员类别代码" />
               </el-form-item>
             </el-col>
           </el-row>
         </div>
-
-
       </el-form>
 
       <!-- 填表说明 -->
       <div class="form-note">
-        <p class="note-text">
-          <strong>填表说明：</strong>人员类别代码根据报备人员属于报备人员范围中的情形项，填写所属项的序号即可。
-        </p>
+        <p class="note-text"><strong>填表说明：</strong>人员类别代码根据报备人员属于报备人员范围中的情形项，填写所属项的序号即可。</p>
       </div>
 
       <template #footer>
         <div class="dialog-footer">
-          <el-button @click="cancelRegistrationDialog">取 消</el-button>
-          <el-button type="primary" @click="submitRegistrationForm" :loading="registrationDialog.loading">
-            {{ registrationDialog.isEdit ? '更 新' : '保 存' }}
+          <el-button @click="cancel">取 消</el-button>
+          <el-button type="primary" @click="submitForm" :loading="dialog.loading">
+            {{ dialog.isEdit ? '更 新' : '保 存' }}
           </el-button>
-          <el-button type="success" @click="submitAndConfirmRegistration" :loading="registrationDialog.loading" v-if="!registrationDialog.isEdit">
+          <!-- <el-button type="success" @click="submitAndConfirm" :loading="dialog.loading" v-if="!dialog.isEdit">
             保存并提交
-          </el-button>
+          </el-button> -->
         </div>
       </template>
     </el-dialog>
 
     <!-- 查看详情弹窗 -->
-    <el-dialog
-      title="出国登记详情"
-      v-model="viewDialog.visible"
-      width="800px"
-      :close-on-click-modal="false"
-      destroy-on-close
-    >
+    <el-dialog title="出国登记详情" v-model="viewDialog.visible" width="800px" :close-on-click-modal="false" destroy-on-close>
       <div class="detail-content" v-loading="viewDialog.loading">
         <div class="detail-section">
           <h4 class="section-title">基本信息</h4>
           <el-descriptions :column="2" border>
-
-            <el-descriptions-item label="姓名">{{ viewData.name }}</el-descriptions-item>
+            <el-descriptions-item label="姓名">{{ viewData.name ? viewData.name.replace(/,/g, '') : '' }}</el-descriptions-item>
             <el-descriptions-item label="性别">{{ viewData.gender === '0' ? '男' : '女' }}</el-descriptions-item>
             <el-descriptions-item label="出生日期">{{ formatDate(viewData.birthDate) }}</el-descriptions-item>
             <el-descriptions-item label="身份证号">{{ viewData.idNumber }}</el-descriptions-item>
@@ -439,93 +278,98 @@
 
       <template #footer>
         <div class="dialog-footer">
-          <el-button v-if="viewDialog.isFromHistory" type="primary" icon="Download" @click="handleDownloadPDF">下载PDF</el-button>
+          <!-- <el-button v-if="viewData.status === '2'" type="primary" icon="Download" @click="handleDownloadPDF">下载PDF</el-button> -->
           <el-button @click="viewDialog.visible = false">关 闭</el-button>
         </div>
       </template>
     </el-dialog>
 
     <!-- PDF生成隐藏容器 -->
-    <div v-if="isPdfGenerating" ref="pdfContainer" class="pdf-container" style="position: fixed; left: -9999px; top: 0; width: 794px; background: white; padding: 20px;">
+    <div
+      v-if="isPdfGenerating"
+      ref="pdfContainer"
+      class="pdf-container"
+      style="position: fixed; left: -9999px; top: 0; width: 794px; background: white; padding: 20px"
+    >
       <div class="pdf-page">
         <!-- 标题 -->
-        <div class="pdf-title">
-          登记报备人员因私事出国（境）登记表
-        </div>
+        <div class="pdf-title">登记报备人员因私事出国（境）登记表</div>
 
         <!-- 编号 -->
-        <div class="pdf-number">
-          编号：<span class="underline-text">_______________</span>
-        </div>
+        <div class="pdf-number">编号：<span class="underline-text">_______________</span></div>
 
         <!-- 表格 -->
         <table class="pdf-table" border="1" cellspacing="0" cellpadding="5">
           <!-- 第一行：表头行 -->
           <tr>
             <td width="50" class="center-text bold-text">姓</td>
-            <td width="80" class="center-text data-cell">{{ viewData.name ? viewData.name.charAt(0) : '' }}</td>
+            <td width="80" class="center-text data-cell">
+              {{ viewData.name ? (viewData.name.includes(',') ? viewData.name.split(',')[0] : viewData.name.charAt(0)) : '' }}
+            </td>
             <td width="50" class="center-text bold-text">名</td>
-            <td width="80" class="center-text data-cell">{{ viewData.name ? viewData.name.substring(1) : '' }}</td>
-            <td width="60" class="center-text bold-text">性<br/>别</td>
+            <td width="80" class="center-text data-cell">
+              {{ viewData.name ? (viewData.name.includes(',') ? viewData.name.split(',')[1] : viewData.name.substring(1)) : '' }}
+            </td>
+            <td width="60" class="center-text bold-text">性<br />别</td>
             <td width="60" class="center-text data-cell">{{ viewData.gender === '0' ? '男' : viewData.gender === '1' ? '女' : '' }}</td>
-            <td width="80" class="center-text bold-text">出生<br/>日期</td>
+            <td width="80" class="center-text bold-text">出生<br />日期</td>
             <td width="120" class="center-text data-cell">{{ formatPdfDate(viewData.birthDate) }}</td>
             <td width="121" rowspan="5" class="center-text photo-cell">
               <div class="photo-text">照 片</div>
               <div class="photo-desc">(2寸免冠白色或淡蓝色底彩照32MM×26MM)</div>
             </td>
           </tr>
-          
+
           <!-- 第二行：公民身份号码和政治面貌行 -->
           <tr>
             <td colspan="2" class="center-text bold-text">公民身份号码</td>
             <td colspan="4" class="data-cell">{{ viewData.idNumber || '' }}</td>
-            <td class="center-text bold-text">政治<br/>面貌</td>
+            <td class="center-text bold-text">政治<br />面貌</td>
             <td class="data-cell">{{ viewData.politicalStatus || '' }}</td>
           </tr>
-          
+
           <!-- 第三行：户籍所在地 -->
           <tr>
             <td colspan="2" class="center-text bold-text">户籍所在地</td>
             <td colspan="6" class="data-cell">{{ viewData.registeredAddress || '' }}</td>
           </tr>
-          
+
           <!-- 第四行：工作部门 -->
           <tr>
-            <td colspan="2" class="center-text bold-text">工作部门<br/>（教学系部）</td>
+            <td colspan="2" class="center-text bold-text">工作部门<br />（教学系部）</td>
             <td colspan="6" class="data-cell">{{ viewData.department || '' }}</td>
           </tr>
-          
+
           <!-- 第五行：职务职称、行政职级、人员类别代码 -->
           <tr>
             <td colspan="2" class="center-text bold-text">职务职称</td>
             <td colspan="2" class="data-cell">{{ viewData.position || '' }}</td>
-            <td class="center-text bold-text">行政<br/>职级</td>
+            <td class="center-text bold-text">行政<br />职级</td>
             <td class="data-cell">{{ viewData.administrativeLevel || '' }}</td>
-            <td class="center-text bold-text">人员类<br/>别代码</td>
+            <td class="center-text bold-text">人员类<br />别代码</td>
             <td class="center-text data-cell"></td>
           </tr>
-          
+
           <!-- 第六、七行：登记备案责任单位 -->
-          <tr style="height: 120px;">
-            <td colspan="2" rowspan="2" class="center-text bold-text">登记备案<br/>责任单位</td>
+          <tr style="height: 120px">
+            <td colspan="2" rowspan="2" class="center-text bold-text">登记备案<br />责任单位</td>
             <td colspan="6" rowspan="2" class="center-text seal-cell">
-              <div style="padding: 40px 0;">盖 章</div>
+              <div style="padding: 40px 0">盖 章</div>
             </td>
             <td rowspan="2" class="center-text">
               <div class="signature-area">登记备案责任单位负责人签名：</div>
             </td>
           </tr>
-          <tr style="height: 120px;"></tr>
-          
+          <tr style="height: 120px"></tr>
+
           <!-- 第八、九行：登记备案责任单位联系人 -->
-          <tr style="height: 60px;">
-            <td colspan="2" rowspan="2" class="center-text bold-text">登记备案责任<br/>单位联系人</td>
+          <tr style="height: 60px">
+            <td colspan="2" rowspan="2" class="center-text bold-text">登记备案责任<br />单位联系人</td>
             <td colspan="2" rowspan="2" class="data-cell">{{ viewData.contactPerson || '' }}</td>
             <td colspan="2" rowspan="2" class="center-text bold-text">联系电话</td>
             <td colspan="3" class="data-cell">办公电话：{{ viewData.officePhone || '' }}</td>
           </tr>
-          <tr style="height: 60px;">
+          <tr style="height: 60px">
             <td colspan="3" class="data-cell">移动电话：{{ viewData.mobilePhone || '' }}</td>
           </tr>
         </table>
@@ -533,25 +377,24 @@
         <!-- 填表说明 -->
         <div class="pdf-note">
           <div class="note-title">填表说明：</div>
-          <div class="note-content">
-            人员类别代码根据报备人员属于报备人员范围中的情形项，填写所属项的序号即可。
-          </div>
+          <div class="note-content">人员类别代码根据报备人员属于报备人员范围中的情形项，填写所属项的序号即可。</div>
         </div>
       </div>
     </div>
   </div>
 </template>
 
-<script setup lang="ts">
-import { ref, reactive, onMounted, nextTick, watch } from 'vue';
+<script setup name="OverseasRegistration" lang="ts">
+import { ref, reactive, toRefs, getCurrentInstance, onMounted, nextTick, ComponentInternalInstance } from 'vue';
 import { ElMessage, ElMessageBox } from 'element-plus';
 import type { FormInstance } from 'element-plus';
 import html2canvas from 'html2canvas';
 import jsPDF from 'jspdf';
-// import { useDictStore } from '@/stores/modules/dict';
-// import { useTagsViewStore } from '@/stores/modules/tagsView';
+import { saveAs } from 'file-saver';
+import Docxtemplater from 'docxtemplater';
+import PizZip from 'pizzip';
 import {
-  getOverseasRegistrationList,
+  getMyOverseasRegistrationList,
   getOverseasRegistration,
   addOverseasRegistration,
   updateOverseasRegistration,
@@ -559,38 +402,21 @@ import {
   submitOverseasRegistration,
   cancelOverseasRegistration,
   addAndSubmitOverseasRegistration,
-  exportOverseasRegistration,
   generateOverseasCertificate,
-  getOverseasRegistrationHistoryList,
-  getOverseasRegistrationHistory,
-  updateOverseasRegistrationHistory,
   type OverseasRegistrationQuery,
   type OverseasRegistrationVO,
-  type OverseasRegistrationForm,
-  type OverseasRegistrationHistoryQuery,
-  type OverseasRegistrationHistoryVO
+  type OverseasRegistrationForm
 } from '@/api/rs/overseas-registration';
 
-// 动画配置
-const animate = {
-  searchAnimate: {
-    enter: 'animate__animated animate__fadeInDown',
-    leave: 'animate__animated animate__fadeOutUp'
-  }
-};
-
-// 状态管理
-const state = reactive({
-  activeTab: 'registration'
-});
+const { proxy } = getCurrentInstance() as ComponentInternalInstance;
 
 // 字典数据
 // const dictStore = useDictStore();
 const statusOptions = ref([
-  { label: '草稿', value: '0' },     // 初始创建状态，未提交审核
-  { label: '待审核', value: '1' },   // 已提交，等待审批
-  { label: '已通过', value: '2' },   // 审批通过，登记信息确认
-  { label: '已拒绝', value: '3' }    // 审批拒绝
+  { label: '草稿', value: '0' }, // 初始创建状态，未提交审核
+  { label: '待审核', value: '1' }, // 已提交，等待审批
+  { label: '已通过', value: '2' }, // 审批通过，登记信息确认
+  { label: '已拒绝', value: '3' } // 审批拒绝
 ]);
 
 // 性别选项
@@ -605,85 +431,86 @@ const completionStatusOptions = ref([
   { label: '已取消', value: '2' }
 ]);
 
-// 出国登记相关
-const showRegistrationSearch = ref(true);
-const registrationLoading = ref(false);
-const registrationList = ref([]);
-const registrationTotal = ref(0);
-const registrationQueryParams = ref({
-  pageNum: 1,
-  pageSize: 10,
-  name: '',
-  gender: '',
-  idNumber: '',
-  politicalStatus: '',
-  department: '',
-  position: '',
-  administrativeLevel: '',
-  personnelCategory: '',
-  status: '',
-  registrationTimeStart: '',
-  registrationTimeEnd: '',
-  createTimeStart: '',
-  createTimeEnd: ''
-});
-
-// 登记历史相关
-const showHistorySearch = ref(true);
-const historyLoading = ref(false);
-const historyList = ref([]);
-const historyTotal = ref(0);
-const historyQueryParams = ref({
-  pageNum: 1,
-  pageSize: 10,
-  name: '',
-  gender: '',
-  idNumber: '',
-  politicalStatus: '',
-  department: '',
-  position: '',
-  administrativeLevel: '',
-  personnelCategory: '',
-  status: '',
-  registrationTimeStart: '',
-  registrationTimeEnd: '',
-  createTimeStart: '',
-  createTimeEnd: ''
-});
+// 列表相关
+const showSearch = ref(true);
+const loading = ref(true);
+const registrationList = ref<OverseasRegistrationVO[]>([]);
+const total = ref(0);
+const queryFormRef = ref();
 
 // 表单相关
 const registrationFormRef = ref<FormInstance>();
-const registrationDialog = reactive({
+const dialog = reactive({
   visible: false,
   title: '',
   loading: false,
   isEdit: false
 });
 
-const registrationForm = ref({
-  registrationId: '',
-  name: '',
-  gender: '',
-  birthDate: '',
-  photo: '',
-  idNumber: '',
-  politicalStatus: '',
-  registeredAddress: '',
-  department: '',
-  position: '',
-  administrativeLevel: '',
-  personnelCategory: '',
-  applicationId: '', // 关联出国申请ID
-  remarks: ''
+const initFormData: OverseasRegistrationForm = {
+  registrationId: undefined,
+  name: undefined,
+  gender: undefined,
+  birthDate: undefined,
+  photo: undefined,
+  idNumber: undefined,
+  politicalStatus: undefined,
+  registeredAddress: undefined,
+  department: undefined,
+  position: undefined,
+  administrativeLevel: undefined,
+  personnelCategory: undefined,
+  applicationId: undefined,
+  remarks: undefined,
+  status: '2' // 默认状态为已通过
+};
+
+// 扩展form对象，添加firstName和lastName字段用于表单验证
+interface ExtendedForm extends OverseasRegistrationForm {
+  firstName?: string;
+  lastName?: string;
+}
+
+const data = reactive({
+  form: {
+    ...initFormData,
+    firstName: '',
+    lastName: ''
+  } as ExtendedForm,
+  queryParams: {
+    pageNum: 1,
+    pageSize: 10,
+    name: undefined,
+    gender: undefined,
+    idNumber: undefined,
+    politicalStatus: undefined,
+    department: undefined,
+    position: undefined,
+    administrativeLevel: undefined,
+    personnelCategory: undefined,
+    status: undefined,
+    registrationTimeStart: undefined,
+    registrationTimeEnd: undefined,
+    createTimeStart: undefined,
+    createTimeEnd: undefined,
+    params: {}
+  } as OverseasRegistrationQuery
 });
 
+const { queryParams, form } = toRefs(data);
+
 const registrationRules = {
-  name: [{ required: true, message: '请输入姓名', trigger: 'blur' }],
+  firstName: [{ required: true, message: '请输入姓', trigger: 'blur' }],
+  lastName: [{ required: true, message: '请输入名', trigger: 'blur' }],
   gender: [{ required: true, message: '请选择性别', trigger: 'change' }],
   birthDate: [{ required: true, message: '请选择出生日期', trigger: 'change' }],
   idNumber: [
     { required: true, message: '请输入身份证号', trigger: 'blur' },
-    { pattern: /^[1-9]\d{5}(18|19|20)\d{2}((0[1-9])|(1[0-2]))(([0-2][1-9])|10|20|30|31)\d{3}[0-9Xx]$/, message: '请输入正确的18位身份证号码', trigger: 'blur' }
+    {
+      pattern: /^[1-9]\d{5}(18|19|20)\d{2}((0[1-9])|(1[0-2]))(([0-2][1-9])|10|20|30|31)\d{3}[0-9Xx]$/,
+      message: '请输入正确的18位身份证号码',
+      trigger: 'blur'
+    }
   ],
   politicalStatus: [{ required: true, message: '请选择政治面貌', trigger: 'change' }],
   registeredAddress: [{ required: true, message: '请输入户籍所在地', trigger: 'blur' }],
@@ -694,8 +521,7 @@ const registrationRules = {
 // 查看详情
 const viewDialog = reactive({
   visible: false,
-  loading: false,
-  isFromHistory: false // 标记是否从登记历史打开
+  loading: false
 });
 
 const viewData = ref<any>({});
@@ -727,126 +553,99 @@ const formatMoney = (amount: number) => {
 
 const getStatusTagType = (status: string): 'success' | 'warning' | 'info' | 'primary' | 'danger' => {
   const tagTypes: Record<string, 'success' | 'warning' | 'info' | 'primary' | 'danger'> = {
-    '0': 'info',     // 草稿
-    '1': 'warning',  // 待审核
-    '2': 'success',  // 已通过
-    '3': 'danger'    // 已拒绝
+    '0': 'info', // 草稿
+    '1': 'warning', // 待审核
+    '2': 'success', // 已通过
+    '3': 'danger' // 已拒绝
   };
   return tagTypes[status] || 'info';
 };
 
 const getCompletionStatusTagType = (status: string): 'success' | 'warning' | 'info' | 'primary' | 'danger' => {
   const tagTypes: Record<string, 'success' | 'warning' | 'info' | 'primary' | 'danger'> = {
-    '0': 'warning',  // 进行中
-    '1': 'success',  // 已完成
-    '2': 'danger'    // 已取消
+    '0': 'warning', // 进行中
+    '1': 'success', // 已完成
+    '2': 'danger' // 已取消
   };
   return tagTypes[status] || 'info';
 };
 
-// 选项卡切换
-const handleTabClick = (tab: any) => {
-  console.log('切换选项卡：', tab.name);
-  state.activeTab = tab.name;
-  if (tab.name === 'registration') {
-    console.log('加载出国登记列表');
-    getRegistrationList();
-  } else if (tab.name === 'history') {
-    console.log('加载登记历史列表');
-    getHistoryList();
-  }
-};
-
-// 出国登记相关方法
-const getRegistrationList = async () => {
-  registrationLoading.value = true;
+// 查询列表
+const getList = async () => {
+  loading.value = true;
   try {
-    // 只查询待审核状态的数据（status=1，待审核）
-    const queryParams = {
-      ...registrationQueryParams.value
-    };
-    // 如果status为空，则默认查询待审核状态
-    if (!queryParams.status || queryParams.status === '') {
-      queryParams.status = '1';  // 1=待审核
-    }
-    
-    console.log('出国登记查询参数：', queryParams);
-    
-    const response = await getOverseasRegistrationList(queryParams);
-    registrationList.value = response.rows;
-    registrationTotal.value = response.total;
-    
-    console.log('出国登记查询结果：', {
-      total: response.total,
-      rows: response.rows?.length,
-      data: response.rows
-    });
+    const res = await getMyOverseasRegistrationList(queryParams.value);
+    registrationList.value = res.rows;
+    total.value = res.total;
   } catch (error) {
     console.error('获取登记列表失败：', error);
     ElMessage.error('获取登记列表失败');
   } finally {
-    registrationLoading.value = false;
+    loading.value = false;
   }
 };
 
-const handleRegistrationQuery = () => {
-  registrationQueryParams.value.pageNum = 1;
-  getRegistrationList();
+/** 搜索按钮操作 */
+const handleQuery = () => {
+  queryParams.value.pageNum = 1;
+  getList();
 };
 
-const resetRegistrationQuery = () => {
-  registrationQueryParams.value = {
-    pageNum: 1,
-    pageSize: 10,
-    name: '',
-    gender: '',
-    idNumber: '',
-    politicalStatus: '',
-    department: '',
-    position: '',
-    administrativeLevel: '',
-    personnelCategory: '',
-    status: '',
-    registrationTimeStart: '',
-    registrationTimeEnd: '',
-    createTimeStart: '',
-    createTimeEnd: ''
-  };
-  getRegistrationList();
+/** 重置按钮操作 */
+const resetQuery = () => {
+  queryFormRef.value?.resetFields();
+  handleQuery();
 };
 
-const handleAddRegistration = () => {
-  resetRegistrationForm();
-  registrationDialog.title = '新增出国登记';
-  registrationDialog.isEdit = false;
-  registrationDialog.visible = true;
+/** 新增按钮操作 */
+const handleAdd = () => {
+  reset();
+  dialog.visible = true;
+  dialog.title = '新增出国登记';
+  dialog.isEdit = false;
 };
 
-const handleEditRegistration = (row: any) => {
-  resetRegistrationForm();
-  registrationForm.value = { ...row };
-  registrationDialog.title = '编辑出国登记';
-  registrationDialog.isEdit = true;
-  registrationDialog.visible = true;
+/** 修改按钮操作 */
+const handleEdit = async (row: OverseasRegistrationVO) => {
+  reset();
+  const res = await getOverseasRegistration(row.registrationId);
+  Object.assign(form.value, res.data);
+  // 如果后端返回的数据没有status，则默认设置为'2'（已通过）
+  if (!form.value.status) {
+    form.value.status = '2';
+  }
+  // 将姓名按逗号分割，分别赋值给姓和名
+  if (form.value.name) {
+    const nameParts = form.value.name.split(',');
+    form.value.firstName = nameParts[0] || '';
+    form.value.lastName = nameParts[1] || '';
+  } else {
+    form.value.firstName = '';
+    form.value.lastName = '';
+  }
+  dialog.visible = true;
+  dialog.title = '编辑出国登记';
+  dialog.isEdit = true;
 };
 
-const handleViewRegistration = (row: any) => {
+/** 查看详情 */
+const handleView = (row: any) => {
   viewData.value = { ...row };
-  viewDialog.isFromHistory = false; // 从出国登记打开，不显示下载PDF按钮
   viewDialog.visible = true;
 };
 
-const handleSubmitRegistration = async (row: any) => {
+/** 提交登记 */
+const handleSubmit = async (row: any) => {
   try {
     await ElMessageBox.confirm('确认提交该登记记录？', '提示', {
       confirmButtonText: '确定',
       cancelButtonText: '取消',
       type: 'warning'
     });
-    
+
     await submitOverseasRegistration({ registrationId: row.registrationId });
-    ElMessage.success('提交成功');
-    getRegistrationList();
+    proxy?.$modal.msgSuccess('提交成功');
+    await getList();
   } catch (error) {
     if (error !== 'cancel') {
       ElMessage.error('提交失败');
@@ -854,17 +653,18 @@ const handleSubmitRegistration = async (row: any) => {
   }
 };
 
-const handleCancelRegistration = async (row: any) => {
+/** 撤回登记 */
+const handleCancel = async (row: any) => {
   try {
     await ElMessageBox.confirm('确认撤回该登记记录？', '提示', {
       confirmButtonText: '确定',
       cancelButtonText: '取消',
       type: 'warning'
     });
-    
+
     await cancelOverseasRegistration(row.registrationId);
-    ElMessage.success('撤回成功');
-    getRegistrationList();
+    proxy?.$modal.msgSuccess('撤回成功');
+    await getList();
   } catch (error) {
     if (error !== 'cancel') {
       ElMessage.error('撤回失败');
@@ -872,17 +672,13 @@ const handleCancelRegistration = async (row: any) => {
   }
 };
 
-const handleDeleteRegistration = async (row: any) => {
+/** 删除按钮操作 */
+const handleDelete = async (row: any) => {
   try {
-    await ElMessageBox.confirm('确认删除该登记记录？', '提示', {
-      confirmButtonText: '确定',
-      cancelButtonText: '取消',
-      type: 'warning'
-    });
-    
+    await proxy?.$modal.confirm('是否确认删除该登记记录？');
     await delOverseasRegistration(row.registrationId);
-    ElMessage.success('删除成功');
-    getRegistrationList();
+    proxy?.$modal.msgSuccess('删除成功');
+    await getList();
   } catch (error) {
     if (error !== 'cancel') {
       ElMessage.error('删除失败');
@@ -892,107 +688,89 @@ const handleDeleteRegistration = async (row: any) => {
 
 const handleGenerateCertificate = async (row: any) => {
   try {
-    const response = await generateOverseasCertificate(row.registrationId);
+    ElMessage.info('正在生成证明文档，请稍候...');
+
+    // 获取完整的登记信息
+    const res = await getOverseasRegistration(row.registrationId);
+    const data = res.data;
+
+    // 处理姓名（去掉逗号）
+    const displayName = data.name ? data.name.replace(/,/g, '') : '';
+    const nameParts = data.name ? data.name.split(',') : ['', ''];
+    const firstName = nameParts[0] || '';
+    const lastName = nameParts[1] || '';
+
+    // 格式化日期
+    const formatDate = (dateStr: string) => {
+      if (!dateStr) return '';
+      const date = new Date(dateStr);
+      const year = date.getFullYear();
+      const month = String(date.getMonth() + 1).padStart(2, '0');
+      const day = String(date.getDate()).padStart(2, '0');
+      return `${year}年${month}月${day}日`;
+    };
+
+    // 准备模板数据
+    const templateData = {
+      firstName: firstName,
+      lastName: lastName,
+      gender: data.gender === '0' ? '男' : '女',
+      birthDate: formatDate(data.birthDate),
+      idNumber: data.idNumber || '',
+      politicalStatus: data.politicalStatus || '',
+      registeredAddress: data.registeredAddress || '',
+      department: data.department || '',
+      position: data.position || '',
+      administrativeLevel: data.administrativeLevel || '',
+      personnelCategory: data.personnelCategory || ''
+    };
+
+    // 加载模板文件
+    const response = await fetch('/chuguodengji.docx');
+    const arrayBuffer = await response.arrayBuffer();
+
+    // 使用 PizZip 解压 docx 文件
+    const zip = new PizZip(arrayBuffer);
+
+    // 创建 docxtemplater 实例
+    const doc = new Docxtemplater(zip, {
+      paragraphLoop: true,
+      linebreaks: true
+    });
+
+    // 设置模板数据
+    doc.setData(templateData);
+
+    // 渲染文档（替换占位符）
+    try {
+      doc.render();
+    } catch (error: any) {
+      console.error('模板渲染错误:', error);
+      // 如果模板中没有占位符，提示用户
+      if (error.properties && error.properties.errors) {
+        console.error('占位符错误:', error.properties.errors);
+        ElMessage.warning('模板文件中未找到占位符，请确保模板文件中使用了 {变量名} 格式的占位符');
+      }
+      throw error;
+    }
+
+    // 生成文档
+    const blob = doc.getZip().generate({
+      type: 'blob',
+      mimeType: 'application/vnd.openxmlformats-officedocument.wordprocessingml.document'
+    });
+
     // 下载文件
-    const url = window.URL.createObjectURL(response.data as Blob);
-    const a = document.createElement('a');
-    a.href = url;
-    a.download = `出国证明_${row.name}.pdf`;
-    a.click();
-    window.URL.revokeObjectURL(url);
+    const fileName = `出国登记表_${displayName}_${new Date().getTime()}.docx`;
+    saveAs(blob, fileName);
+
     ElMessage.success('证明生成成功');
   } catch (error) {
-    ElMessage.error('证明生成失败');
+    console.error('生成证明失败:', error);
+    ElMessage.error('证明生成失败，请检查模板文件格式');
   }
 };
 
-const handleExportRegistration = async () => {
-  try {
-    const response = await exportOverseasRegistration(registrationQueryParams.value);
-    // 下载文件
-    const url = window.URL.createObjectURL(response.data as Blob);
-    const a = document.createElement('a');
-    a.href = url;
-    a.download = `出国登记数据_${new Date().toLocaleDateString()}.xlsx`;
-    a.click();
-    window.URL.revokeObjectURL(url);
-    ElMessage.success('导出成功');
-  } catch (error) {
-    ElMessage.error('导出失败');
-  }
-};
-
-// 登记历史相关方法
-const getHistoryList = async () => {
-  historyLoading.value = true;
-  try {
-    // 只查询已通过状态的数据（status=2，已通过）
-    const queryParams = {
-      ...historyQueryParams.value
-    };
-    // 🔴 强制设置为已通过状态（无论用户是否设置了筛选条件）
-    // 如果用户在筛选条件中选择了其他状态，会覆盖这个默认值
-    if (!queryParams.status || queryParams.status === '') {
-      queryParams.status = '2';  // 2=已通过
-    }
-    
-    console.log('登记历史查询参数：', queryParams);
-    
-    // 使用同一个API，通过status参数区分
-    const response = await getOverseasRegistrationList(queryParams);
-    historyList.value = response.rows;
-    historyTotal.value = response.total;
-    
-    console.log('登记历史查询结果：', {
-      total: response.total,
-      rows: response.rows?.length,
-      data: response.rows
-    });
-  } catch (error) {
-    console.error('获取历史记录失败：', error);
-    ElMessage.error('获取历史记录失败');
-  } finally {
-    historyLoading.value = false;
-  }
-};
-
-const handleHistoryQuery = () => {
-  historyQueryParams.value.pageNum = 1;
-  getHistoryList();
-};
-
-const resetHistoryQuery = () => {
-  historyQueryParams.value = {
-    pageNum: 1,
-    pageSize: 10,
-    name: '',
-    gender: '',
-    idNumber: '',
-    politicalStatus: '',
-    department: '',
-    position: '',
-    administrativeLevel: '',
-    personnelCategory: '',
-    status: '',
-    registrationTimeStart: '',
-    registrationTimeEnd: '',
-    createTimeStart: '',
-    createTimeEnd: ''
-  };
-  getHistoryList();
-};
-
-const handleViewHistory = (row: any) => {
-  viewData.value = { ...row };
-  viewDialog.isFromHistory = true; // 从登记历史打开，显示下载PDF按钮
-  viewDialog.visible = true;
-};
-
-const handleEditHistory = (row: any) => {
-  // 历史记录通常不允许编辑，这里提示不可编辑
-  ElMessage.info('历史记录不可编辑');
-};
-
 // PDF下载方法
 const handleDownloadPDF = async () => {
   // 验证数据是否存在
@@ -1003,14 +781,14 @@ const handleDownloadPDF = async () => {
 
   try {
     ElMessage.info('正在生成PDF，请稍候...');
-    
+
     // 显示PDF容器以便渲染
     isPdfGenerating.value = true;
-    
+
     // 等待DOM更新和渲染
     await nextTick();
-    await new Promise(resolve => setTimeout(resolve, 100));
-    
+    await new Promise((resolve) => setTimeout(resolve, 100));
+
     if (!pdfContainer.value) {
       throw new Error('PDF容器未找到');
     }
@@ -1019,7 +797,7 @@ const handleDownloadPDF = async () => {
       width: pdfContainer.value.offsetWidth,
       height: pdfContainer.value.offsetHeight
     });
-    
+
     // 使用html2canvas将DOM转换为canvas
     const canvas = await html2canvas(pdfContainer.value, {
       scale: 2, // 提高清晰度
@@ -1044,7 +822,7 @@ const handleDownloadPDF = async () => {
 
     // 转换为图片数据，使用JPEG格式更稳定
     const imgData = canvas.toDataURL('image/jpeg', 1.0);
-    
+
     // 验证图片数据
     if (!imgData || imgData === 'data:,') {
       throw new Error('图片数据生成失败');
@@ -1054,7 +832,7 @@ const handleDownloadPDF = async () => {
     const imgWidth = 210; // A4纸宽度（mm）
     const pageHeight = 297; // A4纸高度（mm）
     const imgHeight = (canvas.height * imgWidth) / canvas.width;
-    
+
     // 创建PDF文档
     const pdf = new jsPDF({
       orientation: 'portrait',
@@ -1078,11 +856,12 @@ const handleDownloadPDF = async () => {
     }
 
     // 生成文件名
-    const fileName = `出国登记表_${viewData.value.name || '未命名'}_${new Date().getTime()}.pdf`;
-    
+    const displayName = viewData.value.name ? viewData.value.name.replace(/,/g, '') : '未命名';
+    const fileName = `出国登记表_${displayName}_${new Date().getTime()}.pdf`;
+
     // 下载PDF
     pdf.save(fileName);
-    
+
     ElMessage.success('PDF下载成功');
   } catch (error: any) {
     console.error('生成PDF失败:', error);
@@ -1093,122 +872,94 @@ const handleDownloadPDF = async () => {
   }
 };
 
-// 表单相关方法
-const resetRegistrationForm = () => {
-  registrationForm.value = {
-    registrationId: '',
-    name: '',
-    gender: '',
-    birthDate: '',
-    photo: '',
-    idNumber: '',
-    politicalStatus: '',
-    registeredAddress: '',
-    department: '',
-    position: '',
-    administrativeLevel: '',
-    personnelCategory: '',
-    applicationId: '', // 关联出国申请ID
-    remarks: ''
-  };
+/** 表单重置 */
+const reset = () => {
+  form.value = {
+    ...initFormData,
+    firstName: '',
+    lastName: ''
+  } as ExtendedForm;
   nextTick(() => {
     registrationFormRef.value?.resetFields();
   });
 };
 
-const cancelRegistrationDialog = () => {
-  registrationDialog.visible = false;
-  resetRegistrationForm();
+/** 取消按钮 */
+const cancel = () => {
+  reset();
+  dialog.visible = false;
 };
 
-const submitRegistrationForm = () => {
+/** 提交按钮 */
+const submitForm = () => {
   registrationFormRef.value?.validate(async (valid) => {
     if (valid) {
-      registrationDialog.loading = true;
+      // 将姓和名用逗号拼接后赋值给form.name
+      form.value.name = `${form.value.firstName || ''},${form.value.lastName || ''}`;
+      dialog.loading = true;
       try {
-        if (registrationDialog.isEdit) {
-          await updateOverseasRegistration(registrationForm.value);
-          ElMessage.success('更新成功');
+        if (dialog.isEdit) {
+          await updateOverseasRegistration(form.value);
+          proxy?.$modal.msgSuccess('更新成功');
         } else {
-          await addOverseasRegistration(registrationForm.value);
-          ElMessage.success('保存成功');
+          await addOverseasRegistration(form.value);
+          proxy?.$modal.msgSuccess('保存成功');
         }
-        
-        registrationDialog.visible = false;
-        resetRegistrationForm();
-        getRegistrationList();
+        dialog.visible = false;
+        reset();
+        await getList();
       } catch (error) {
-        ElMessage.error(registrationDialog.isEdit ? '更新失败' : '保存失败');
+        ElMessage.error(dialog.isEdit ? '更新失败' : '保存失败');
       } finally {
-        registrationDialog.loading = false;
+        dialog.loading = false;
       }
     }
   });
 };
 
-const submitAndConfirmRegistration = () => {
+/** 保存并提交 */
+const submitAndConfirm = () => {
   registrationFormRef.value?.validate(async (valid) => {
     if (valid) {
-      registrationDialog.loading = true;
+      // 将姓和名用逗号拼接后赋值给form.name
+      form.value.name = `${form.value.firstName || ''},${form.value.lastName || ''}`;
+      dialog.loading = true;
       try {
-        await addAndSubmitOverseasRegistration(registrationForm.value);
-        ElMessage.success('保存并提交成功');
-        
-        registrationDialog.visible = false;
-        resetRegistrationForm();
-        getRegistrationList();
+        await addAndSubmitOverseasRegistration(form.value);
+        proxy?.$modal.msgSuccess('保存并提交成功');
+        dialog.visible = false;
+        reset();
+        await getList();
       } catch (error) {
         ElMessage.error('保存并提交失败');
       } finally {
-        registrationDialog.loading = false;
+        dialog.loading = false;
       }
     }
   });
 };
 
-// 监听选项卡切换
-watch(() => state.activeTab, (newTab, oldTab) => {
-  console.log('选项卡变化：', { from: oldTab, to: newTab });
-  
-  if (newTab === 'registration') {
-    console.log('切换到出国登记，加载数据');
-    getRegistrationList();
-  } else if (newTab === 'history') {
-    console.log('切换到登记历史，加载数据');
-    getHistoryList();
-  }
-}, { immediate: false }); // immediate: false 避免初始化时重复加载
-
 // 生命周期
 onMounted(() => {
-  console.log('页面加载完成，初始化出国登记数据');
-  getRegistrationList();
+  getList();
 });
 </script>
 
 <style scoped>
-.app-container {
-  padding: 20px;
-}
-
-.box-card {
-  min-height: calc(100vh - 120px);
-}
-
-.tab-content {
-  padding: 0;
+/* 页面容器样式 */
+.page-container {
+  padding: 8px;
 }
 
+/* 搜索按钮容器样式 */
 .search-btn-container {
-  text-align: right;
-}
-
-.button-card {
+  display: flex;
+  justify-content: flex-end;
   margin-top: 10px;
 }
 
-.table-card .el-card__header {
-  padding: 10px 20px;
+.search-btn-container .el-form-item {
+  margin-bottom: 0 !important;
 }
 
 .form-section {
@@ -1251,17 +1002,6 @@ onMounted(() => {
   padding: 8px 0;
 }
 
-/* 基本信息容器样式 */
-.basic-info-container {
-  display: flex;
-  align-items: flex-start;
-  gap: 30px;
-}
-
-.form-fields {
-  flex: 1;
-}
-
 /* 填表说明样式 */
 .form-note {
   margin: 20px 0 10px 0;
@@ -1344,8 +1084,8 @@ onMounted(() => {
 
 .pdf-table .photo-cell {
   padding: 10px;
-  width: 121px;   /* 照片宽度: 32mm ≈ 121px */
-  height: 98px;   /* 照片高度: 26mm ≈ 98px */
+  width: 121px; /* 照片宽度: 32mm ≈ 121px */
+  height: 98px; /* 照片高度: 26mm ≈ 98px */
   min-height: 98px;
 }
 
@@ -1395,5 +1135,4 @@ onMounted(() => {
   padding: 0 4px;
   text-align: center;
 }
-
-</style> 
\ No newline at end of file
+</style>
diff --git a/web/src/views/rs/overseas/approval.vue b/web/src/views/rs/overseas/approval.vue
index b8171c2c..6a5a326a 100644
--- a/web/src/views/rs/overseas/approval.vue
+++ b/web/src/views/rs/overseas/approval.vue
@@ -9,12 +9,7 @@
               <el-row :gutter="20">
                 <el-col :span="6">
                   <el-form-item label="前往国家" prop="destination">
-                    <el-input
-                      v-model="queryParams.destination"
-                      placeholder="请输入前往国家"
-                      clearable
-                      @keyup.enter="handleQuery"
-                    />
+                    <el-input v-model="queryParams.destination" placeholder="请输入前往国家" clearable @keyup.enter="handleQuery" />
                   </el-form-item>
                 </el-col>
                 <el-col :span="6">
@@ -49,254 +44,317 @@
 
         <!-- 数据表格 -->
         <div class="table-container">
-          <el-table 
-            v-loading="loading" 
-            :data="applicationList" 
-            @row-dblclick="handleView"
-            stripe
-            border
-            style="width: 100%"
-            height="auto"
-          >
-          <el-table-column label="申请人" align="center" prop="applicantName" min-width="100" show-overflow-tooltip />
-          <el-table-column label="部门" align="center" prop="department" min-width="140" show-overflow-tooltip />
-          <el-table-column label="政治面貌" align="center" prop="politicalStatusText" min-width="100" show-overflow-tooltip />
-          <el-table-column label="前往国家" align="center" prop="destination" min-width="120" show-overflow-tooltip />
-          <el-table-column label="出境事由" align="center" prop="exitReason" min-width="140" show-overflow-tooltip />
-          <el-table-column label="出国天数" align="center" prop="duration" min-width="100">
-            <template #default="scope">
-              <span>{{ scope.row.duration || 0 }}天</span>
-            </template>
-          </el-table-column>
-          <el-table-column label="申请时间" align="center" prop="applyTime" min-width="170">
-            <template #default="scope">
-              <span>{{ scope.row.applyTime ? new Date(scope.row.applyTime).toLocaleString() : '-' }}</span>
-            </template>
-          </el-table-column>
-          <el-table-column label="申请状态" align="center" min-width="100">
-            <template #default="scope">
-              <el-tag :type="getStatusTagType(scope.row.status)">{{ getStatusText(scope.row.status) }}</el-tag>
-            </template>
-          </el-table-column>
-          <el-table-column label="操作" align="center" fixed="right" width="150">
-            <template #default="scope">
-              <div class="action-buttons">
-                <el-tooltip content="查看详情" placement="top">
-                  <el-button 
-                    link 
-                    type="primary" 
-                    icon="View" 
-                    size="small"
-                    @click="handleView(scope.row)" 
-                    v-hasPermi="['rs:overseas:query']"
-                  />
-                </el-tooltip>
-                <el-tooltip content="审批" placement="top" v-if="scope.row.status === '0'">
-                  <el-button 
-                    link 
-                    type="success" 
-                    icon="Check" 
-                    size="small"
-                    @click="handleApproval(scope.row)" 
-                    v-hasPermi="[
-                      'rs:overseas:approve',
-                      'rs:overseas:approve1',
-                      'rs:overseas:approve2',
-                      'rs:overseas:approve3',
-                      'rs:overseas:approve4',
-                      'rs:overseas:approve5'
-                    ]"
-                  />
-                </el-tooltip>
-              </div>
-            </template>
-          </el-table-column>
-        </el-table>
+          <el-table v-loading="loading" :data="applicationList" @row-dblclick="handleView" stripe border style="width: 100%" height="auto">
+            <el-table-column label="申请人" align="center" prop="applicantName" min-width="100" show-overflow-tooltip />
+            <el-table-column label="部门" align="center" prop="registeredAddress" min-width="140" show-overflow-tooltip />
+            <el-table-column label="政治面貌" align="center" prop="politicalStatusText" min-width="100" show-overflow-tooltip />
+            <el-table-column label="前往国家" align="center" prop="destination" min-width="120" show-overflow-tooltip />
+            <el-table-column label="出境事由" align="center" prop="exitReason" min-width="140" show-overflow-tooltip />
+            <el-table-column label="出国天数" align="center" prop="duration" min-width="100">
+              <template #default="scope">
+                <span>{{ scope.row.duration || 0 }}天</span>
+              </template>
+            </el-table-column>
+            <el-table-column label="审批级别" align="center" prop="approvalLevelText" min-width="120" show-overflow-tooltip>
+              <template #default="scope">
+                <span>{{ getApprovalLevelText(scope.row) }}</span>
+              </template>
+            </el-table-column>
+            <el-table-column label="申请时间" align="center" prop="applyTime" min-width="170">
+              <template #default="scope">
+                <span>{{ scope.row.applyTime ? new Date(scope.row.applyTime).toLocaleString() : '-' }}</span>
+              </template>
+            </el-table-column>
+            <el-table-column label="申请状态" align="center" min-width="100">
+              <template #default="scope">
+                <el-tag :type="getStatusTagType(scope.row.status)">{{ getStatusText(scope.row.status) }}</el-tag>
+              </template>
+            </el-table-column>
+            <el-table-column label="操作" align="center" fixed="right" width="150">
+              <template #default="scope">
+                <div class="action-buttons">
+                  <el-tooltip content="查看详情" placement="top">
+                    <el-button link type="primary" icon="View" size="small" @click="handleView(scope.row)" v-hasPermi="['rs:overseas:query']" />
+                  </el-tooltip>
+                  <el-tooltip content="审批" placement="top" v-if="scope.row.status === '0'">
+                    <el-button
+                      link
+                      type="success"
+                      icon="Check"
+                      size="small"
+                      @click="handleApproval(scope.row)"
+                      v-hasPermi="[
+                        'rs:overseas:approve',
+                        'rs:overseas:approve1',
+                        'rs:overseas:approve2',
+                        'rs:overseas:approve3',
+                        'rs:overseas:approve4',
+                        'rs:overseas:approve5'
+                      ]"
+                    />
+                  </el-tooltip>
+                </div>
+              </template>
+            </el-table-column>
+          </el-table>
         </div>
 
-        <pagination
-          v-show="total > 0"
-          :total="total"
-          v-model:page="queryParams.pageNum"
-          v-model:limit="queryParams.pageSize"
-          @pagination="applyFilterAndPagination"
-        />
+        <pagination v-show="total > 0" :total="total" v-model:page="queryParams.pageNum" v-model:limit="queryParams.pageSize" @pagination="getList" />
       </el-card>
     </el-card>
 
     <!-- 申请详情对话框 -->
     <el-dialog title="出国申请详情" v-model="viewDialog.visible" width="900px" append-to-body>
-      <el-descriptions v-if="viewData" :column="2" border>
-        <!-- 基本信息 -->
-        <el-descriptions-item label="姓名">{{ viewData.applicantName || '-' }}</el-descriptions-item>
-        <el-descriptions-item label="性别">{{ viewData.gender === '0' ? '男' : viewData.gender === '1' ? '女' : '-' }}</el-descriptions-item>
-        
-        <el-descriptions-item label="出生年月">{{ formatDate(viewData.birthDate) || '-' }}</el-descriptions-item>
-        <el-descriptions-item label="政治面貌">{{ viewData.politicalStatusText || '-' }}</el-descriptions-item>
-        
-        <!-- 工作信息 -->
-        <el-descriptions-item label="现工作部门">{{ viewData.department || '-' }}</el-descriptions-item>
-        <el-descriptions-item label="职称">{{ viewData.professionalTitle || '-' }}</el-descriptions-item>
-        
-        <el-descriptions-item label="职务">{{ viewData.position || '-' }}</el-descriptions-item>
-        <el-descriptions-item label="申领证件名称">{{ viewData.documentName || '-' }}</el-descriptions-item>
-        
-        <!-- 证件信息 -->
-        <el-descriptions-item label="证件号码">{{ viewData.documentNumber || '-' }}</el-descriptions-item>
-        <el-descriptions-item label="前往国家">{{ viewData.destinationCountry || viewData.destination || '-' }}</el-descriptions-item>
-        
-        <!-- 出境信息 -->
-        <el-descriptions-item label="出境事由">{{ viewData.exitReason || '-' }}</el-descriptions-item>
-        <!-- 探亲信息（如果是探亲） -->
-        <el-descriptions-item label="探望对象关系" v-if="viewData.exitReason === '探亲'">
-          {{ viewData.visitRelationship || '-' }}
-        </el-descriptions-item>
-        
-        <!-- 行程安排 -->
-        <el-descriptions-item label="行程安排" :span="2">{{ viewData.itinerary || '-' }}</el-descriptions-item>
-        <el-descriptions-item label="出国天数">{{ viewData.duration || 0 }}天</el-descriptions-item>
-        
-        <!-- 备注 -->
-        <el-descriptions-item label="备注" v-if="viewData.remarks">{{ viewData.remarks }}</el-descriptions-item>
-        
-        <!-- 出国时间 -->
-        <el-descriptions-item label="出发日期">{{ formatDate(viewData.startDate) || '-' }}</el-descriptions-item>
-        <el-descriptions-item label="返回日期">{{ formatDate(viewData.endDate) || '-' }}</el-descriptions-item>
-        
-        <!-- 联系信息 -->
-        <el-descriptions-item label="联系电话">{{ viewData.mobilePhone || viewData.contactPhone || '-' }}</el-descriptions-item>
-        <el-descriptions-item label="应急联系人及电话">{{ viewData.emergencyContact || '-' }}</el-descriptions-item>
-        
-        <!-- 申请状态 -->
-        <el-descriptions-item label="申请状态">
-          <el-tag :type="getStatusTagType(viewData.status)">{{ viewData.statusText }}</el-tag>
-        </el-descriptions-item>
-        <el-descriptions-item label="申请时间">{{ viewData.applyTime || '-' }}</el-descriptions-item>
-        
-        <!-- 管理员备注 -->
-        <el-descriptions-item label="管理员备注" :span="2" v-if="viewData.adminRemark">{{ viewData.adminRemark }}</el-descriptions-item>
-      </el-descriptions>
+      <div v-if="viewData">
+        <el-form label-width="120px" class="view-form">
+          <div class="view-section">
+            <div class="view-section-title">个人信息</div>
+            <el-row :gutter="20">
+              <el-col :span="8">
+                <el-form-item label="姓名">
+                  <span class="form-value">{{ viewData.applicantName || '-' }}</span>
+                </el-form-item>
+              </el-col>
+              <el-col :span="8">
+                <el-form-item label="性别">
+                  <span class="form-value">{{ viewData.gender === '0' ? '男' : viewData.gender === '1' ? '女' : '-' }}</span>
+                </el-form-item>
+              </el-col>
+              <el-col :span="8">
+                <el-form-item label="出生年月">
+                  <span class="form-value">{{ formatYearMonth(viewData.birthDate) || '-' }}</span>
+                </el-form-item>
+              </el-col>
+            </el-row>
+            <el-row :gutter="20">
+              <el-col :span="8">
+                <el-form-item label="政治面貌">
+                  <span class="form-value">{{ viewData.politicalStatusText || '-' }}</span>
+                </el-form-item>
+              </el-col>
+              <el-col :span="8">
+                <el-form-item label="现工作部门">
+                  <span class="form-value">{{ viewData.registeredAddress || '-' }}</span>
+                </el-form-item>
+              </el-col>
+              <el-col :span="8">
+                <el-form-item label="职称">
+                  <span class="form-value">{{ viewData.professionalTitle || '-' }}</span>
+                </el-form-item>
+              </el-col>
+            </el-row>
+          </div>
 
-      <!-- 附件区域 -->
-      <div v-if="viewData" style="margin-top: 20px;">
-        <!-- 出国境登记表盖章文件 -->
-        <div v-if="viewData.stampedFileUploadStatus === '1'" 
-             style="margin-bottom: 15px; padding: 12px; border: 1px solid #e4e7ed; border-radius: 4px; background: #f9fafb;">
-          <div style="font-size: 14px; color: #606266; margin-bottom: 8px;">
-            <el-icon><Document /></el-icon>
-            <span style="margin-left: 5px; font-weight: 500;">出国境登记表盖章文件</span>
+          <div class="view-section">
+            <div class="view-section-title">岗位与证件</div>
+            <el-row :gutter="20">
+              <el-col :span="8">
+                <el-form-item label="职务">
+                  <span class="form-value">{{ viewData.position || '-' }}</span>
+                </el-form-item>
+              </el-col>
+              <el-col :span="8">
+                <el-form-item label="申领证件名称">
+                  <span class="form-value">{{ viewData.documentName || '-' }}</span>
+                </el-form-item>
+              </el-col>
+              <el-col :span="8">
+                <el-form-item label="证件号码">
+                  <span class="form-value">{{ viewData.documentNumber || '-' }}</span>
+                </el-form-item>
+              </el-col>
+            </el-row>
           </div>
-          <div style="display: flex; align-items: center; justify-content: space-between;">
-            <div style="flex: 1;">
-              <el-tag type="success" size="small">
-                <el-icon><Document /></el-icon>
-                {{ viewData.stampedRegistrationFileName }}
-              </el-tag>
-              <span style="margin-left: 10px; font-size: 12px; color: #909399;">
-                上传时间: {{ viewData.stampedFileUploadTime }}
-              </span>
-            </div>
-            <div style="display: flex; gap: 8px;">
-              <el-button 
-                link 
-                type="primary" 
-                size="small" 
-                @click="handlePreviewStampedFile(viewData)"
+
+          <div class="view-section">
+            <div class="view-section-title">出行信息</div>
+            <el-row :gutter="20">
+              <el-col :span="8">
+                <el-form-item label="前往国家或地区">
+                  <span class="form-value">{{ viewData.destinationCountry || viewData.destination || '-' }}</span>
+                </el-form-item>
+              </el-col>
+              <el-col :span="8">
+                <el-form-item label="出境事由">
+                  <span class="form-value">{{ viewData.exitReason || '-' }}</span>
+                </el-form-item>
+              </el-col>
+              <el-col v-if="viewData.exitReason === '探亲'" :span="8">
+                <el-form-item label="探望对象关系">
+                  <span class="form-value">{{ viewData.visitRelationship || '-' }}</span>
+                </el-form-item>
+              </el-col>
+            </el-row>
+            <el-row :gutter="20">
+              <el-col :span="24">
+                <el-form-item label="行程安排" class="multiline-item">
+                  <span class="form-value multiline">{{ viewData.itinerary && viewData.itinerary !== '未填写' ? viewData.itinerary : '-' }}</span>
+                </el-form-item>
+              </el-col>
+            </el-row>
+          </div>
+
+          <div class="view-section">
+            <div class="view-section-title">承诺声明</div>
+            <el-row>
+              <el-col :span="24">
+                <div class="commitment-text readonly-text">
+                  本人承诺，在出国（境）期间遵守当地法律法规和中国的法律法规，结束后如期回国并到学校报到，如逾期不归，同意作自动离职处理。
+                </div>
+              </el-col>
+            </el-row>
+          </div>
+
+          <div class="view-section" v-if="viewData.signature">
+            <div class="view-section-title">手写签字</div>
+            <el-row>
+              <el-col :span="24">
+                <div class="signature-preview">
+                  <img :src="viewData.signature" alt="手写签名" />
+                </div>
+              </el-col>
+            </el-row>
+          </div>
+
+          <div class="view-section">
+            <div class="view-section-title">时间安排</div>
+            <el-row :gutter="20">
+              <el-col :span="8">
+                <el-form-item label="出发日期">
+                  <span class="form-value">{{ formatDate(viewData.startDate) || '-' }}</span>
+                </el-form-item>
+              </el-col>
+              <el-col :span="8">
+                <el-form-item label="返回日期">
+                  <span class="form-value">{{ formatDate(viewData.endDate) || '-' }}</span>
+                </el-form-item>
+              </el-col>
+              <el-col :span="8">
+                <el-form-item label="出国天数">
+                  <span class="form-value">{{ viewData.duration || 0 }}天</span>
+                </el-form-item>
+              </el-col>
+            </el-row>
+          </div>
+
+          <div class="view-section">
+            <div class="view-section-title">联系方式</div>
+            <el-row :gutter="20">
+              <el-col :span="12">
+                <el-form-item label="联系电话">
+                  <span class="form-value">{{ viewData.mobilePhone || viewData.contactPhone || '-' }}</span>
+                </el-form-item>
+              </el-col>
+              <el-col :span="12">
+                <el-form-item>
+                  <template #label>
+                    <span class="nowrap-label">应急联系人及电话：</span>
+                  </template>
+                  <span class="form-value">{{ viewData.emergencyContact || '-' }}</span>
+                </el-form-item>
+              </el-col>
+            </el-row>
+          </div>
+
+          <div class="view-section">
+            <div class="view-section-title">状态信息</div>
+            <el-row :gutter="20">
+              <el-col :span="12">
+                <el-form-item label="申请状态">
+                  <el-tag :type="getStatusTagType(viewData.status)">{{ viewData.statusText || '-' }}</el-tag>
+                </el-form-item>
+              </el-col>
+              <el-col :span="12">
+                <el-form-item label="申请时间">
+                  <span class="form-value">{{ viewData.applyTime || '-' }}</span>
+                </el-form-item>
+              </el-col>
+            </el-row>
+            <el-row v-if="viewData.remarks || viewData.adminRemark" :gutter="20">
+              <el-col :span="24" v-if="viewData.remarks">
+                <el-form-item label="备注">
+                  <span class="form-value multiline">{{ viewData.remarks }}</span>
+                </el-form-item>
+              </el-col>
+              <el-col :span="24" v-if="viewData.adminRemark">
+                <el-form-item label="管理员备注">
+                  <span class="form-value multiline">{{ viewData.adminRemark }}</span>
+                </el-form-item>
+              </el-col>
+            </el-row>
+          </div>
+        </el-form>
+
+        <div class="view-section" style="margin-top: 20px">
+          <div class="view-section-title">
+            <el-icon style="margin-right: 8px"><Clock /></el-icon>
+            审批流程信息
+          </div>
+          <div v-loading="approvalHistoryLoading">
+            <el-empty v-if="!approvalHistoryLoading && approvalHistoryList.length === 0" description="暂无审批流程记录" :image-size="80" />
+            <el-timeline v-else class="approval-timeline">
+              <el-timeline-item
+                v-for="(record, index) in approvalHistoryList"
+                :key="record.approvalId || `${record.approvalLevel}-${record.approvalTime}-${index}`"
+                :timestamp="record.approvalTime ? parseTime(record.approvalTime) : '时间待确认'"
+                placement="top"
               >
-                <el-icon><View /></el-icon> 查看
-              </el-button>
-              <el-button 
-                link 
-                type="primary" 
-                size="small" 
-                @click="handleDownloadStampedFile(viewData)"
-              >
-                <el-icon><Download /></el-icon> 下载
-              </el-button>
+                <div class="timeline-item">
+                  <div class="timeline-header">
+                    <span class="node-name">{{ getApprovalLevelText(record) }}</span>
+                    <el-tag size="small" :type="getApprovalResultTagType(record.approvalStatus)">
+                      {{ record.approvalStatusText || getApprovalResultText(record.approvalStatus) }}
+                    </el-tag>
+                  </div>
+                  <div class="timeline-meta">
+                    <span>审批人：{{ record.approverName || '-' }}</span>
+                    <span v-if="record.approvalTime">审批时间：{{ parseTime(record.approvalTime) }}</span>
+                  </div>
+                  <div v-if="record.approvalOpinion" class="timeline-opinion">审批意见：{{ record.approvalOpinion }}</div>
+                </div>
+              </el-timeline-item>
+            </el-timeline>
+          </div>
+        </div>
+
+        <div v-if="viewAttachmentList.length > 0" class="attachment-section">
+          <div class="section-title attachment-title-primary">
+            <el-icon style="margin-right: 8px"><Paperclip /></el-icon>
+            <strong>申请附件</strong>
+          </div>
+          <div class="attachment-view-grid">
+            <div v-for="file in viewAttachmentList" :key="file.ossId || file.uid || file.url || file.name" class="upload-file-card attachment-card">
+              <div class="upload-file-thumb">
+                <ImagePreview
+                  v-if="isImageFileByName(file.name)"
+                  :src="file.ossId || file.url"
+                  class="upload-thumb-image"
+                  :isOssId="Boolean(file.ossId)"
+                />
+                <div v-else class="upload-file-placeholder">
+                  <el-icon><Document /></el-icon>
+                  <span class="file-ext">{{ getFileExt(file.name || '') }}</span>
+                </div>
+              </div>
+              <div class="upload-file-name" :title="file.name">
+                {{ file.name || '附件' }}
+              </div>
+              <div class="upload-file-meta">上传时间：{{ parseTime(file.uploadTime) }}</div>
+              <div class="upload-file-card-actions">
+                <el-button link type="primary" icon="Download" @click="handleDownloadAttachment(file)">下载</el-button>
+              </div>
             </div>
           </div>
         </div>
-        
-        <!-- 党籍保留附件 -->
-        <div v-if="viewData.partyRetentionUploadStatus === '1'" 
-             style="margin-bottom: 15px; padding: 12px; border: 1px solid #e4e7ed; border-radius: 4px; background: #fff5f5;">
-          <div style="font-size: 14px; color: #ff4757; margin-bottom: 8px;">
-            <el-icon><Warning /></el-icon>
-            <span style="margin-left: 5px; font-weight: 500;">党籍保留附件</span>
-          </div>
-          <div style="display: flex; align-items: center; justify-content: space-between;">
-            <div style="flex: 1;">
-              <el-tag type="danger" size="small">
-                <el-icon><Document /></el-icon>
-                {{ viewData.partyRetentionFileName }}
-              </el-tag>
-              <span style="margin-left: 10px; font-size: 12px; color: #909399;">
-                上传时间: {{ viewData.partyRetentionUploadTime }}
-              </span>
-            </div>
-            <div style="display: flex; gap: 8px;">
-              <el-button 
-                link 
-                type="primary" 
-                size="small" 
-                @click="handlePreviewPartyRetentionFile(viewData)"
-              >
-                <el-icon><View /></el-icon> 查看
-              </el-button>
-              <el-button 
-                link 
-                type="primary" 
-                size="small" 
-                @click="handleDownloadPartyRetentionFile(viewData)"
-              >
-                <el-icon><Download /></el-icon> 下载
-              </el-button>
-            </div>
-          </div>
+
+        <div
+          v-if="viewData.stampedFileUploadStatus !== '1' && viewData.partyRetentionUploadStatus !== '1' && viewAttachmentList.length === 0"
+          style="margin-top: 20px"
+        >
+          <el-empty description="暂无附件" :image-size="100" />
         </div>
-        
-        <!-- 其他申请附件列表 -->
-        <div v-if="viewAttachmentList.length > 0" style="margin-top: 15px;">
-          <div style="font-size: 14px; color: #606266; margin-bottom: 8px;">
-            <el-icon><Paperclip /></el-icon>
-            <span style="margin-left: 5px; font-weight: 500;">其他申请附件</span>
-          </div>
-          <el-table 
-            :data="viewAttachmentList" 
-            border 
-            size="small"
-          >
-            <el-table-column label="序号" type="index" width="60" align="center" />
-            <el-table-column label="附件标题" prop="attachmentTitle" min-width="150" />
-            <el-table-column label="附件说明" prop="attachmentContent" min-width="200" show-overflow-tooltip>
-              <template #default="scope">
-                {{ scope.row.attachmentContent || '-' }}
-              </template>
-            </el-table-column>
-            <el-table-column label="文件名" prop="fileOriginalName" min-width="150" show-overflow-tooltip />
-            <el-table-column label="文件大小" prop="fileSizeFormatted" width="100" align="center" />
-            <el-table-column label="上传时间" prop="uploadTime" width="160" align="center" />
-            <el-table-column label="操作" width="100" align="center">
-              <template #default="scope">
-                <el-button link type="primary" size="small" @click="handleDownloadAttachment(scope.row)">
-                  <el-icon><Download /></el-icon> 下载
-                </el-button>
-              </template>
-            </el-table-column>
-          </el-table>
-        </div>
-        
-        <!-- 无任何附件时的提示 -->
-        <el-empty 
-          v-if="viewData.stampedFileUploadStatus !== '1' 
-                && viewData.partyRetentionUploadStatus !== '1' 
-                && viewAttachmentList.length === 0" 
-          description="暂无附件" 
-          :image-size="100" 
-        />
       </div>
 
-
       <template #footer v-if="viewData && viewData.status === '0'">
         <div class="dialog-footer">
           <el-button type="success" @click="handleApprovalPass(viewData)">通过</el-button>
@@ -317,16 +375,10 @@
         <el-form-item label="审批意见" prop="approvalOpinion">
           <el-input v-model="approvalForm.approvalOpinion" type="textarea" :rows="4" placeholder="请输入审批意见" />
         </el-form-item>
-        
+
         <!-- 手写签字 -->
         <el-form-item label="审批签字" prop="approvalSignature">
-          <SignaturePad 
-            v-model="approvalForm.approvalSignature" 
-            :width="450" 
-            :height="120"
-            :auto-save="true"
-            :show-save-button="false"
-          />
+          <SignaturePad v-model="approvalForm.approvalSignature" :width="450" :height="120" :auto-save="true" :show-save-button="false" />
           <div class="signature-tip">请在上方签字板中手写签名</div>
         </el-form-item>
       </el-form>
@@ -338,42 +390,42 @@
         </div>
       </template>
     </el-dialog>
-
   </div>
 </template>
 
 <script setup lang="ts" name="OverseasApproval">
-import { ref, reactive, toRefs, onMounted, getCurrentInstance, computed } from 'vue';
-import { useRouter } from 'vue-router';
+import { ref, reactive, toRefs, onMounted, getCurrentInstance } from 'vue';
 import {
-  listPendingOverseasApplication,
+  listPendingOverseasApplicationPage,
   getOverseasApplication,
   approveOverseasApplication,
-  listOverseasAttachments,
+  getOverseasApprovalHistory,
   type OverseasApplicationQuery,
   type OverseasApplicationVO,
   type ApprovalRequest,
-  type OverseasAttachmentVO
+  type OverseasApprovalVO
 } from '@/api/rs/overseas';
 import { ElMessage, ElMessageBox } from 'element-plus';
-import { Document, Warning, Paperclip, View, Download } from '@element-plus/icons-vue';
+import { Document, Warning, Paperclip, View, Download, Clock } from '@element-plus/icons-vue';
 import animate from '@/animate';
 import request from '@/utils/request';
 import SignaturePad from '@/components/SignaturePad/index.vue';
+import ImagePreview from '@/components/ImagePreview/index.vue';
 import { getToken } from '@/utils/auth';
+import { parseTime } from '@/utils/ruoyi';
 
 // 响应式数据
 const { proxy } = getCurrentInstance() as any;
-const router = useRouter();
 
 // 附件列表数据
-const viewAttachmentList = ref<OverseasAttachmentVO[]>([]);
+const viewAttachmentList = ref<any[]>([]);
+const approvalHistoryList = ref<OverseasApprovalVO[]>([]);
+const approvalHistoryLoading = ref(false);
 
 const state = reactive({
   // 列表相关
   loading: false,
-  allApplicationList: [] as OverseasApplicationVO[], // 🔴 新增：存储所有待审批数据
-  applicationList: [] as OverseasApplicationVO[], // 过滤和分页后的数据
+  applicationList: [] as OverseasApplicationVO[], // 当前页数据
   total: 0,
   showSearch: true,
   queryParams: {
@@ -430,24 +482,21 @@ onMounted(() => {
   getList();
 });
 
-// 获取申请列表
+// 获取申请列表（后端分页）
 const getList = async () => {
   state.loading = true;
   try {
-    // 🔴 修复：使用待审批接口，只返回当前用户审批级别的待审批数据
-    const response = await listPendingOverseasApplication();
-    
-    // 存储所有待审批数据
-    state.allApplicationList = response.data || [];
-    
-    // 应用本地过滤和分页
-    applyFilterAndPagination();
-    
-    console.log('✅ 成功加载待审批申请列表:', state.allApplicationList.length, '条');
+    // 🔴 使用后端分页接口，传递分页和搜索参数
+    const response = await listPendingOverseasApplicationPage(state.queryParams);
+
+    // 后端返回分页数据
+    state.applicationList = response.rows || [];
+    state.total = response.total || 0;
+
+    console.log('✅ 成功加载待审批申请列表:', state.total, '条，当前页', state.applicationList.length, '条');
   } catch (error: any) {
     console.error('❌ 获取申请列表失败:', error);
     ElMessage.error('获取申请列表失败');
-    state.allApplicationList = [];
     state.applicationList = [];
     state.total = 0;
   } finally {
@@ -455,40 +504,11 @@ const getList = async () => {
   }
 };
 
-// 应用本地过滤和分页
-const applyFilterAndPagination = () => {
-  let filteredList = [...state.allApplicationList];
-  
-  // 🔴 应用搜索过滤
-  if (state.queryParams.destination) {
-    filteredList = filteredList.filter(item => 
-      item.destination?.includes(state.queryParams.destination || '')
-    );
-  }
-  
-  if (state.queryParams.exitReason) {
-    filteredList = filteredList.filter(item => 
-      item.exitReason === state.queryParams.exitReason
-    );
-  }
-  
-  // 更新总数
-  state.total = filteredList.length;
-  
-  // 🔴 应用分页
-  const { pageNum, pageSize } = state.queryParams;
-  const start = (pageNum - 1) * pageSize;
-  const end = start + pageSize;
-  state.applicationList = filteredList.slice(start, end);
-  
-  console.log(`📄 分页结果: 总计 ${state.total} 条，当前显示第 ${pageNum} 页，共 ${state.applicationList.length} 条`);
-};
-
 // 搜索查询
 const handleQuery = () => {
   state.queryParams.pageNum = 1;
-  // 🔴 修复：本地过滤，无需重新请求数据
-  applyFilterAndPagination();
+  // 🔴 重新请求后端数据
+  getList();
 };
 
 // 重置搜索
@@ -518,7 +538,9 @@ const handleView = async (row: OverseasApplicationVO) => {
     state.viewData = response.data;
 
     // 加载附件列表
-    await loadViewAttachmentList(row.applicationId);
+    await loadViewAttachmentList(response.data?.attachmentIds);
+    // 加载审批历史
+    await loadApprovalHistory(row.applicationId);
 
     state.viewDialog.visible = true;
   } catch (error) {
@@ -587,7 +609,22 @@ const cancelApproval = () => {
 // 工具方法
 const formatDate = (date: string) => {
   if (!date) return '';
-  return new Date(date).toLocaleDateString();
+  return parseTime(date, '{y}-{m}-{d}');
+};
+
+const formatYearMonth = (date: string) => {
+  if (!date) return '';
+  return parseTime(date, '{y}-{m}');
+};
+
+const isImageFileByName = (fileName?: string) => {
+  if (!fileName) return false;
+  return /\.(jpg|jpeg|png|gif|bmp|webp)$/i.test(fileName);
+};
+
+const getFileExt = (fileName: string) => {
+  const ext = fileName.split('.').pop()?.toUpperCase();
+  return ext || 'FILE';
 };
 
 const getStatusTagType = (status: string): 'success' | 'warning' | 'danger' | 'info' | 'primary' => {
@@ -612,21 +649,95 @@ const getStatusText = (status: string): string => {
   return statusMap[status] || '未知状态';
 };
 
+type ApprovalLevelSource =
+  | {
+      approvalLevel?: string | number | null;
+      approvalLevelText?: string | null;
+    }
+  | null
+  | undefined;
+
+const approvalLevelMap: Record<string, string> = {
+  '1': '部门负责人',
+  '2': '人事处',
+  '3': '纪委',
+  '4': '学院分管领导',
+  '5': '学院党委书记'
+};
+
+// 获取审批级别文本
+const getApprovalLevelText = (source: ApprovalLevelSource): string => {
+  if (source?.approvalLevelText) {
+    return source.approvalLevelText;
+  }
+  const level = source?.approvalLevel;
+  if (level !== undefined && level !== null && level !== '') {
+    const key = String(level);
+    return approvalLevelMap[key] || `级别${key}`;
+  }
+  return '-';
+};
+
+const getApprovalResultTagType = (status: string): 'success' | 'warning' | 'danger' | 'info' | 'primary' => {
+  const typeMap: Record<string, 'success' | 'warning' | 'danger' | 'info' | 'primary'> = {
+    '0': 'warning',
+    '1': 'success',
+    '2': 'danger'
+  };
+  return typeMap[status] || 'info';
+};
+
+const getApprovalResultText = (status: string): string => {
+  const statusMap: Record<string, string> = {
+    '0': '待审核',
+    '1': '通过',
+    '2': '拒绝'
+  };
+  return statusMap[status] || '未知结果';
+};
+
 // ============== 附件相关方法 ==============
 
-// 加载附件列表
-const loadViewAttachmentList = async (applicationId: number | string) => {
-  console.log('🔍 [附件加载] 开始加载附件列表，applicationId:', applicationId);
+// 加载附件列表（参考申请页面展示样式）
+const loadViewAttachmentList = async (attachmentIds: string | null | undefined) => {
+  console.log('🔍 [附件加载] 开始加载附件列表，attachmentIds:', attachmentIds);
   try {
-    const response = await listOverseasAttachments(applicationId);
-    console.log('✅ [附件加载] API响应成功:', response);
-    
-    viewAttachmentList.value = response.data || [];
-    
-    if (!response.data || response.data.length === 0) {
-      console.warn('⚠️  [附件加载] 该申请暂无附件数据');
+    if (!attachmentIds || !attachmentIds.toString().trim()) {
+      console.log('⚠️ [附件加载] 无附件ID，清空列表');
+      viewAttachmentList.value = [];
+      return;
+    }
+
+    const ossIds = attachmentIds
+      .toString()
+      .split(',')
+      .map((id) => id.trim())
+      .filter((id) => id);
+
+    if (ossIds.length === 0) {
+      console.warn('⚠️ [附件加载] 解析后OSS ID为空');
+      viewAttachmentList.value = [];
+      return;
+    }
+
+    const response = await request({
+      url: `/resource/oss/listByIds/${ossIds.join(',')}`,
+      method: 'get'
+    });
+
+    if (response.code === 200 && response.data) {
+      viewAttachmentList.value = response.data.map((item: any, index: number) => ({
+        uid: `attachment_${index}_${Date.now()}`,
+        name: item.originalName || `附件${index + 1}`,
+        url: item.url,
+        ossId: item.ossId,
+        uploadTime: item.createTime,
+        status: 'success'
+      }));
+      console.log('✅ [附件加载] 附件数量:', viewAttachmentList.value.length);
     } else {
-      console.log('✨ [附件加载] 附件列表:', viewAttachmentList.value);
+      console.warn('⚠️ [附件加载] OSS接口未返回数据');
+      viewAttachmentList.value = [];
     }
   } catch (error: any) {
     console.error('❌ [附件加载] 加载附件列表失败:', error);
@@ -634,28 +745,81 @@ const loadViewAttachmentList = async (applicationId: number | string) => {
   }
 };
 
+// 加载审批历史信息
+const loadApprovalHistory = async (applicationId: number | string | null | undefined) => {
+  if (!applicationId) {
+    approvalHistoryList.value = [];
+    return;
+  }
+  approvalHistoryLoading.value = true;
+  try {
+    const historyResponse = await getOverseasApprovalHistory(applicationId);
+    if (historyResponse.code === 200 && Array.isArray(historyResponse.data)) {
+      const sortedData = [...historyResponse.data].sort((a: OverseasApprovalVO, b: OverseasApprovalVO) => {
+        const timeA = a.approvalTime ? new Date(a.approvalTime).getTime() : 0;
+        const timeB = b.approvalTime ? new Date(b.approvalTime).getTime() : 0;
+        return timeB - timeA;
+      });
+      approvalHistoryList.value = sortedData;
+    } else {
+      approvalHistoryList.value = [];
+      console.warn('⚠️ [审批历史] 接口未返回有效数据:', historyResponse);
+    }
+  } catch (error) {
+    console.error('❌ [审批历史] 加载审批流程信息失败:', error);
+    approvalHistoryList.value = [];
+    ElMessage.error('加载审批流程信息失败，请稍后重试');
+  } finally {
+    approvalHistoryLoading.value = false;
+  }
+};
+
 // 下载附件（从详情页）
-const handleDownloadAttachment = (row: OverseasAttachmentVO) => {
-  console.log('📥 下载附件:', row.fileOriginalName);
-  // 直接通过链接下载
-  const link = document.createElement('a');
-  link.href = row.filePath;
-  link.download = row.fileOriginalName;
-  link.target = '_blank';
-  document.body.appendChild(link);
-  link.click();
-  document.body.removeChild(link);
+const handleDownloadAttachment = async (row: any) => {
+  console.log('📥 下载附件:', row.name || row.fileOriginalName);
+
+  if (!row.ossId) {
+    ElMessage.warning('文件OSS ID不存在，无法下载');
+    return;
+  }
+
+  try {
+    const response = await request({
+      url: `/resource/oss/download/${row.ossId}`,
+      method: 'get',
+      responseType: 'blob'
+    });
+
+    const fileName = row.name || row.fileOriginalName || '附件';
+    const fileExt = fileName.split('.').pop()?.toLowerCase();
+    const mimeType = fileExt === 'pdf' ? 'application/pdf' : 'application/octet-stream';
+
+    const blob = response instanceof Blob ? new Blob([response], { type: mimeType }) : new Blob([response.data], { type: mimeType });
+    const url = window.URL.createObjectURL(blob);
+    const link = document.createElement('a');
+    link.href = url;
+    link.download = fileName;
+    document.body.appendChild(link);
+    link.click();
+    document.body.removeChild(link);
+    window.URL.revokeObjectURL(url);
+
+    ElMessage.success('文件下载成功');
+  } catch (error) {
+    console.error('下载附件失败:', error);
+    ElMessage.error('下载文件失败，请稍后重试');
+  }
 };
 
 // 下载出国境登记表盖章文件
 const handleDownloadStampedFile = async (data: OverseasApplicationVO) => {
   console.log('📥 下载出国境登记表盖章文件:', data.stampedRegistrationFileName);
-  
+
   if (!data.stampedFileOssId) {
     ElMessage.warning('文件OSS ID不存在，无法下载');
     return;
   }
-  
+
   try {
     // 使用request下载文件
     const response = await request({
@@ -663,24 +827,23 @@ const handleDownloadStampedFile = async (data: OverseasApplicationVO) => {
       method: 'get',
       responseType: 'blob'
     });
-    
+
     // 创建带MIME类型的Blob并触发下载
-    const blob = response instanceof Blob 
-      ? new Blob([response], { type: 'application/pdf' })
-      : new Blob([response.data], { type: 'application/pdf' });
+    const blob =
+      response instanceof Blob ? new Blob([response], { type: 'application/pdf' }) : new Blob([response.data], { type: 'application/pdf' });
     const url = window.URL.createObjectURL(blob);
-    
+
     const link = document.createElement('a');
     link.href = url;
     link.download = data.stampedRegistrationFileName || '出国境登记表盖章文件.pdf';
-    
+
     document.body.appendChild(link);
     link.click();
-    
+
     // 清理资源
     document.body.removeChild(link);
     window.URL.revokeObjectURL(url);
-    
+
     ElMessage.success('文件下载成功');
   } catch (error) {
     console.error('下载出国境登记表盖章文件失败:', error);
@@ -691,12 +854,12 @@ const handleDownloadStampedFile = async (data: OverseasApplicationVO) => {
 // 下载党籍保留附件
 const handleDownloadPartyRetentionFile = async (data: OverseasApplicationVO) => {
   console.log('📥 下载党籍保留附件:', data.partyRetentionFileName);
-  
+
   if (!data.partyRetentionFileOssId) {
     ElMessage.warning('文件OSS ID不存在，无法下载');
     return;
   }
-  
+
   try {
     // 使用request下载文件
     const response = await request({
@@ -704,24 +867,23 @@ const handleDownloadPartyRetentionFile = async (data: OverseasApplicationVO) =>
       method: 'get',
       responseType: 'blob'
     });
-    
+
     // 创建带MIME类型的Blob并触发下载
-    const blob = response instanceof Blob 
-      ? new Blob([response], { type: 'application/pdf' })
-      : new Blob([response.data], { type: 'application/pdf' });
+    const blob =
+      response instanceof Blob ? new Blob([response], { type: 'application/pdf' }) : new Blob([response.data], { type: 'application/pdf' });
     const url = window.URL.createObjectURL(blob);
-    
+
     const link = document.createElement('a');
     link.href = url;
     link.download = data.partyRetentionFileName || '党籍保留附件.pdf';
-    
+
     document.body.appendChild(link);
     link.click();
-    
+
     // 清理资源
     document.body.removeChild(link);
     window.URL.revokeObjectURL(url);
-    
+
     ElMessage.success('文件下载成功');
   } catch (error) {
     console.error('下载党籍保留附件失败:', error);
@@ -732,40 +894,39 @@ const handleDownloadPartyRetentionFile = async (data: OverseasApplicationVO) =>
 // 预览党籍保留附件
 const handlePreviewPartyRetentionFile = async (data: OverseasApplicationVO) => {
   console.log('👁️ 预览党籍保留附件:', data.partyRetentionFileName);
-  
+
   if (!data.partyRetentionFileOssId) {
     ElMessage.warning('文件OSS ID不存在，无法预览');
     return;
   }
-  
+
   try {
     // 获取文件扩展名
     const fileName = data.partyRetentionFileName || '';
     const fileExt = fileName.substring(fileName.lastIndexOf('.') + 1).toLowerCase();
-    
+
     // 使用request获取文件blob
     const response = await request({
       url: `/resource/oss/download/${data.partyRetentionFileOssId}`,
       method: 'get',
       responseType: 'blob'
     });
-    
+
     // 创建带MIME类型的Blob（关键：指定type为application/pdf才能正常预览）
-    const blob = response instanceof Blob 
-      ? new Blob([response], { type: 'application/pdf' })
-      : new Blob([response.data], { type: 'application/pdf' });
+    const blob =
+      response instanceof Blob ? new Blob([response], { type: 'application/pdf' }) : new Blob([response.data], { type: 'application/pdf' });
     const fileUrl = window.URL.createObjectURL(blob);
-    
+
     // 根据文件类型进行预览
     if (fileExt === 'pdf') {
       // PDF直接在新标签页打开
       window.open(fileUrl, '_blank');
-      
+
       // 60秒后清理URL
       setTimeout(() => {
         window.URL.revokeObjectURL(fileUrl);
       }, 60000);
-    } 
+    }
     // 其他文件类型提示下载
     else {
       ElMessage.info('该文件类型不支持在线预览，请下载后查看');
@@ -780,40 +941,39 @@ const handlePreviewPartyRetentionFile = async (data: OverseasApplicationVO) => {
 // 预览出国境登记表盖章文件
 const handlePreviewStampedFile = async (data: OverseasApplicationVO) => {
   console.log('👁️ 预览出国境登记表盖章文件:', data.stampedRegistrationFileName);
-  
+
   if (!data.stampedFileOssId) {
     ElMessage.warning('文件OSS ID不存在，无法预览');
     return;
   }
-  
+
   try {
     // 获取文件扩展名
     const fileName = data.stampedRegistrationFileName || '';
     const fileExt = fileName.substring(fileName.lastIndexOf('.') + 1).toLowerCase();
-    
+
     // 使用request获取文件blob
     const response = await request({
       url: `/resource/oss/download/${data.stampedFileOssId}`,
       method: 'get',
       responseType: 'blob'
     });
-    
+
     // 创建带MIME类型的Blob（关键：指定type为application/pdf才能正常预览）
-    const blob = response instanceof Blob 
-      ? new Blob([response], { type: 'application/pdf' })
-      : new Blob([response.data], { type: 'application/pdf' });
+    const blob =
+      response instanceof Blob ? new Blob([response], { type: 'application/pdf' }) : new Blob([response.data], { type: 'application/pdf' });
     const fileUrl = window.URL.createObjectURL(blob);
-    
+
     // 根据文件类型进行预览
     if (fileExt === 'pdf') {
       // PDF直接在新标签页打开
       window.open(fileUrl, '_blank');
-      
+
       // 60秒后清理URL
       setTimeout(() => {
         window.URL.revokeObjectURL(fileUrl);
       }, 60000);
-    } 
+    }
     // 其他文件类型提示下载
     else {
       ElMessage.info('该文件类型不支持在线预览，请下载后查看');
@@ -901,7 +1061,7 @@ const handlePreviewStampedFile = async (data: OverseasApplicationVO) => {
   .action-buttons {
     gap: 4px;
   }
-  
+
   .action-buttons .el-button {
     padding: 2px 4px;
     font-size: 12px;
@@ -915,4 +1075,223 @@ const handlePreviewStampedFile = async (data: OverseasApplicationVO) => {
   color: #909399;
   text-align: center;
 }
+
+/* 详情弹窗样式（同步 index.vue） */
+.view-form {
+  margin-top: 10px;
+}
+
+.view-form :deep(.el-form-item) {
+  align-items: center;
+}
+
+.view-form :deep(.el-form-item__label) {
+  color: #909399;
+  font-weight: 600;
+  padding-right: 4px;
+}
+
+.view-form :deep(.el-form-item__label)::after {
+  content: '：';
+}
+
+.view-form :deep(.nowrap-label) {
+  white-space: nowrap;
+}
+
+.view-section {
+  margin-bottom: 16px;
+  padding: 16px 20px 4px;
+  border: 1px solid #ebeef5;
+  border-radius: 8px;
+  background: #fff;
+  box-shadow: 0 1px 3px rgba(0, 0, 0, 0.02);
+}
+
+.view-section-title {
+  font-size: 15px;
+  font-weight: 600;
+  color: #303133;
+  margin-bottom: 12px;
+  display: flex;
+  align-items: center;
+}
+
+.view-section-title::before {
+  content: '';
+  width: 4px;
+  height: 14px;
+  background: #409eff;
+  border-radius: 2px;
+  margin-right: 8px;
+}
+
+.view-form .form-value {
+  display: inline-block;
+  min-height: 32px;
+  line-height: 32px;
+  color: #1f2d3d;
+  font-weight: 500;
+}
+
+.view-form .form-value.multiline {
+  line-height: 1.6;
+  white-space: pre-wrap;
+  padding-top: 4px;
+}
+
+.view-form :deep(.multiline-item) {
+  align-items: flex-start;
+}
+
+.readonly-text {
+  padding: 12px;
+  background-color: #f5f7fa;
+  border: 1px solid #ebeef5;
+  border-radius: 4px;
+  color: #606266;
+  line-height: 1.6;
+}
+
+.signature-preview {
+  width: 100%;
+  max-height: 200px;
+  border: 1px solid #ebeef5;
+  border-radius: 6px;
+  background: #fff;
+  display: flex;
+  align-items: center;
+  justify-content: center;
+  padding: 12px;
+}
+
+.signature-preview img {
+  max-width: 100%;
+  max-height: 180px;
+}
+
+.attachment-section {
+  margin-top: 20px;
+}
+
+.section-title {
+  display: flex;
+  align-items: center;
+  font-size: 14px;
+  color: #303133;
+  margin-bottom: 12px;
+}
+
+.attachment-title-primary {
+  padding: 10px;
+  border-left: 4px solid #409eff;
+  background-color: #f5f7fa;
+}
+
+.attachment-view-grid {
+  display: grid;
+  grid-template-columns: repeat(auto-fill, minmax(200px, 1fr));
+  gap: 12px;
+}
+
+.attachment-card {
+  border: 1px solid #ebeef5;
+  border-radius: 6px;
+  background: #fff;
+  padding: 10px;
+  display: flex;
+  flex-direction: column;
+  gap: 8px;
+}
+
+.upload-file-thumb {
+  flex: 1;
+  display: flex;
+  align-items: center;
+  justify-content: center;
+  position: relative;
+  background: #f5f7fa;
+  overflow: hidden;
+  min-height: 120px;
+}
+
+.upload-thumb-image {
+  width: 100%;
+  height: 100%;
+  object-fit: cover;
+}
+
+.upload-file-placeholder {
+  display: flex;
+  flex-direction: column;
+  align-items: center;
+  justify-content: center;
+  color: #909399;
+  font-size: 24px;
+}
+
+.upload-file-placeholder .file-ext {
+  font-size: 12px;
+  margin-top: 8px;
+  font-weight: 500;
+}
+
+.upload-file-name {
+  font-size: 12px;
+  color: #606266;
+  text-align: center;
+  white-space: nowrap;
+  overflow: hidden;
+  text-overflow: ellipsis;
+}
+
+.upload-file-meta {
+  font-size: 12px;
+  color: #909399;
+  text-align: center;
+}
+
+.upload-file-card-actions {
+  display: flex;
+  justify-content: center;
+}
+
+.approval-timeline {
+  padding-left: 4px;
+}
+
+.approval-timeline .timeline-item {
+  padding: 8px 12px;
+  border: 1px solid #ebeef5;
+  border-radius: 6px;
+  background: #fff;
+}
+
+.timeline-header {
+  display: flex;
+  justify-content: space-between;
+  align-items: center;
+  font-weight: 600;
+  color: #303133;
+  margin-bottom: 4px;
+}
+
+.timeline-meta {
+  display: flex;
+  flex-wrap: wrap;
+  gap: 12px;
+  font-size: 13px;
+  color: #606266;
+}
+
+.timeline-opinion {
+  margin-top: 6px;
+  font-size: 13px;
+  color: #303133;
+  line-height: 1.6;
+}
+
+:global(.app-container) {
+  padding: 0 !important;
+}
 </style>
diff --git a/web/src/views/rs/overseas/index.vue b/web/src/views/rs/overseas/index.vue
index 13571d09..a8804d93 100644
--- a/web/src/views/rs/overseas/index.vue
+++ b/web/src/views/rs/overseas/index.vue
@@ -17,13 +17,13 @@
                           <el-input v-model="applicationQueryParams.destination" placeholder="请输入前往国家" clearable />
                         </el-form-item>
                       </el-col>
-      <el-col :span="5">
-        <el-form-item label="出境事由" prop="exitReason">
-          <el-select v-model="applicationQueryParams.exitReason" placeholder="请选择出境事由" clearable style="width: 100%">
-            <el-option v-for="dict in exitReasonOptions" :key="dict.label" :label="dict.label" :value="dict.label" />
-          </el-select>
-        </el-form-item>
-      </el-col>
+                      <el-col :span="5">
+                        <el-form-item label="出境事由" prop="exitReason">
+                          <el-select v-model="applicationQueryParams.exitReason" placeholder="请选择出境事由" clearable style="width: 100%">
+                            <el-option v-for="dict in exitReasonOptions" :key="dict.label" :label="dict.label" :value="dict.label" />
+                          </el-select>
+                        </el-form-item>
+                      </el-col>
                     </el-row>
 
                     <el-row>
@@ -59,7 +59,7 @@
               <el-table v-loading="applicationLoading" border :data="applicationList" @row-dblclick="handleViewApplication">
                 <el-table-column type="selection" width="55" align="center" />
                 <el-table-column label="姓名" align="center" prop="applicantName" min-width="100" :show-overflow-tooltip="true" />
-                <el-table-column label="现工作部门" align="center" prop="department" min-width="140" :show-overflow-tooltip="true" />
+                <el-table-column label="现工作部门" align="center" prop="registeredAddress" min-width="140" :show-overflow-tooltip="true" />
                 <el-table-column label="职称" align="center" prop="professionalTitle" min-width="110" :show-overflow-tooltip="true" />
                 <el-table-column label="前往国家" align="center" prop="destination" min-width="110" :show-overflow-tooltip="true" />
                 <el-table-column label="出境事由" align="center" prop="exitReason" min-width="100" :show-overflow-tooltip="true" />
@@ -122,6 +122,16 @@
                     <el-tooltip content="审批历史" placement="top" v-if="scope.row.status === '1' || scope.row.status === '2'">
                       <el-button link type="info" icon="InfoFilled" @click="handleViewApprovalHistory(scope.row)"></el-button>
                     </el-tooltip>
+                    <!-- 生成承诺书按钮 -->
+                    <el-tooltip content="生成承诺书" placement="top">
+                      <el-button
+                        link
+                        type="warning"
+                        icon="Document"
+                        @click="handleGeneratePromiseLetter(scope.row)"
+                        v-hasPermi="['rs:overseas:query']"
+                      ></el-button>
+                    </el-tooltip>
                     <!-- 删除按钮：仅在未通过的状态下显示（待审核、已拒绝、已取消） -->
                     <el-tooltip content="删除" placement="top" v-if="scope.row.status !== '1'">
                       <el-button
@@ -158,12 +168,7 @@
                     <el-row :gutter="20">
                       <el-col :span="6">
                         <el-form-item label="前往国家" prop="destination">
-                          <el-input
-                            v-model="recordQueryParams.destination"
-                            placeholder="请输入前往国家"
-                            clearable
-                            @keyup.enter="handleRecordQuery"
-                          />
+                          <el-input v-model="recordQueryParams.destination" placeholder="请输入前往国家" clearable @keyup.enter="handleRecordQuery" />
                         </el-form-item>
                       </el-col>
                       <el-col :span="6">
@@ -496,35 +501,38 @@
         <!-- 承诺条款 -->
         <div style="margin-bottom: 25px">
           <p style="margin-bottom: 20px; text-indent: 2em">
-            <strong>一、严格遵守政治纪律。</strong>坚定理想信念，坚持四项基本原则，不妄议中央大政方针，不丑化党和国家形象，不诋毁、歪曲党史、军史；决不与法轮功、台独、藏独、疆独等打着各种旗号企图分裂、颠覆、污蔑党和国家的组织和人员接触，不接受、私藏、阅看此类组织和人员赠送、散发的宣传品、礼物等；不参加宗教活动，不接受宗教团体和宗教人员以宗教为目的赠送的宣传品、礼物等；不参观故意诋毁中国带有明显政治性目的和污蔑、污辱中华民族等带有歧视性的场地和场所；不购买、私带污蔑、歪曲党和国家历史、形象的出版物、音像制品等；不接受境外组织和个人带有采访性质的谈话和约稿等。
+            <strong>一、严格遵守政治纪律。</strong
+            >坚定理想信念，坚持四项基本原则，不妄议中央大政方针，不丑化党和国家形象，不诋毁、歪曲党史、军史；决不与法轮功、台独、藏独、疆独等打着各种旗号企图分裂、颠覆、污蔑党和国家的组织和人员接触，不接受、私藏、阅看此类组织和人员赠送、散发的宣传品、礼物等；不参加宗教活动，不接受宗教团体和宗教人员以宗教为目的赠送的宣传品、礼物等；不参观故意诋毁中国带有明显政治性目的和污蔑、污辱中华民族等带有歧视性的场地和场所；不购买、私带污蔑、歪曲党和国家历史、形象的出版物、音像制品等；不接受境外组织和个人带有采访性质的谈话和约稿等。
           </p>
 
           <p style="margin-bottom: 20px; text-indent: 2em">
-            <strong>二、严格遵守组织纪律。</strong>自觉遵守个人重大事项报告规定，如实报告因私出国（境）理由、时间、行程、随同人员、经费来源等情况，并严格按个人申报、组织批准的出国（境）时间、国别和行程旅行；不擅自延长和变更境外停留时间和行程路线，若遇不可抗力需要变更时，在第一时间报告单位领导，经允许后再行动，并在回国后及时向组织书面说明情况（由旅行社或导游签署意见，自由行的有一人以上证明）；单位若遇紧急情况需要本人提前结束行程，愿意服从组织决定。
+            <strong>二、严格遵守组织纪律。</strong
+            >自觉遵守个人重大事项报告规定，如实报告因私出国（境）理由、时间、行程、随同人员、经费来源等情况，并严格按个人申报、组织批准的出国（境）时间、国别和行程旅行；不擅自延长和变更境外停留时间和行程路线，若遇不可抗力需要变更时，在第一时间报告单位领导，经允许后再行动，并在回国后及时向组织书面说明情况（由旅行社或导游签署意见，自由行的有一人以上证明）；单位若遇紧急情况需要本人提前结束行程，愿意服从组织决定。
           </p>
 
           <p style="margin-bottom: 20px; text-indent: 2em">
-            <strong>三、严格遵守保密纪律。</strong>行前严格检查行李和随身物品，坚决不将任何涉密载体（纸质材料，电脑、手机、照相器材、电子存储器等电子设备）带出国境；不在境外任何场所、不与任何人谈论可能涉及国家秘密和工作秘密的任何事项。
+            <strong>三、严格遵守保密纪律。</strong
+            >行前严格检查行李和随身物品，坚决不将任何涉密载体（纸质材料，电脑、手机、照相器材、电子存储器等电子设备）带出国境；不在境外任何场所、不与任何人谈论可能涉及国家秘密和工作秘密的任何事项。
           </p>
 
           <p style="margin-bottom: 20px; text-indent: 2em">
-            <strong>四、严格遵守外事纪律。</strong>忠于祖国，尊重别国，友好交往，不卑不亢；凡不利于国与国、民族与民族之间友好、团结的话不说、事不做；按照内外有别原则，自觉遵守当事国法律法规、国家制度、民族习惯和宗教信仰等，不非议、不妄评；特殊情况下，自觉接受和服从我国驻外使领馆的领导和指示要求。
+            <strong>四、严格遵守外事纪律。</strong
+            >忠于祖国，尊重别国，友好交往，不卑不亢；凡不利于国与国、民族与民族之间友好、团结的话不说、事不做；按照内外有别原则，自觉遵守当事国法律法规、国家制度、民族习惯和宗教信仰等，不非议、不妄评；特殊情况下，自觉接受和服从我国驻外使领馆的领导和指示要求。
           </p>
 
           <p style="margin-bottom: 20px; text-indent: 2em">
-            <strong>五、严格遵守公序良俗。</strong>弘扬中华民族礼仪之邦的优良传统，遵照国际惯例和当事国风俗，文明出游；远离黄、赌、毒等场所，决不参加黄、赌、毒等活动；厉行节约，反对奢靡；规范言行举止，自觉维护中国人的良好形象。
+            <strong>五、严格遵守公序良俗。</strong
+            >弘扬中华民族礼仪之邦的优良传统，遵照国际惯例和当事国风俗，文明出游；远离黄、赌、毒等场所，决不参加黄、赌、毒等活动；厉行节约，反对奢靡；规范言行举止，自觉维护中国人的良好形象。
           </p>
 
-          <p style="margin-bottom: 20px; text-indent: 2em">
-            如有违反上述承诺，愿意接受党纪和有关规定的处理。
-          </p>
+          <p style="margin-bottom: 20px; text-indent: 2em">如有违反上述承诺，愿意接受党纪和有关规定的处理。</p>
         </div>
 
         <!-- 承诺书署名 -->
-        <div style="text-align: right; margin-top: 40px; line-height: 2.5">
+        <!-- <div style="text-align: right; margin-top: 40px; line-height: 2.5">
           <p>承诺人：{{ userStore.nickname }}</p>
           <p>承诺时间：{{ getCurrentDate() }}</p>
-        </div>
+        </div> -->
       </div>
 
       <!-- 弹窗底部操作按钮 -->
@@ -533,7 +541,13 @@
           <el-button v-if="state.commitmentCountdownActive" type="info" disabled size="large" style="min-width: 200px">
             请阅读承诺书内容 ({{ state.commitmentCountdown }}s)
           </el-button>
-          <el-button v-else-if="state.commitmentReadCompleted" type="primary" @click="handleCommitmentReadComplete" size="large" style="min-width: 200px">
+          <el-button
+            v-else-if="state.commitmentReadCompleted"
+            type="primary"
+            @click="handleCommitmentReadComplete"
+            size="large"
+            style="min-width: 200px"
+          >
             本人已阅读并同意承诺，进入申请
           </el-button>
           <el-button type="default" @click="handleCloseCommitment" size="large" style="margin-left: 20px"> 取消 </el-button>
@@ -546,7 +560,7 @@
       :title="state.applicationDialog.title"
       v-model="state.applicationDialog.visible"
       :key="state.applicationDialog.key"
-      width="900px"
+      width="1050px"
       append-to-body
       :close-on-click-modal="false"
       destroy-on-close
@@ -568,25 +582,21 @@
 
         <div style="max-height: 65vh; overflow-y: auto; padding-right: 10px">
           <el-form ref="applicationFormRef" :model="applicationForm" :rules="applicationRules" label-width="120px">
-            <!-- 第一排：姓名、性别 -->
+            <!-- 第一排：姓名、性别、出生年月 -->
             <el-row :gutter="20">
-              <el-col :span="12">
+              <el-col :span="8">
                 <el-form-item label="姓名" prop="applicantName">
                   <el-input v-model="applicationForm.applicantName" placeholder="请输入姓名" />
                 </el-form-item>
               </el-col>
-              <el-col :span="12">
+              <el-col :span="8">
                 <el-form-item label="性别" prop="gender">
                   <el-select v-model="applicationForm.gender" placeholder="请选择性别" style="width: 100%">
                     <el-option v-for="dict in sys_user_sex" :key="dict.value" :label="dict.label" :value="dict.value" />
                   </el-select>
                 </el-form-item>
               </el-col>
-            </el-row>
-
-            <!-- 第二排：出生年月、政治面貌 -->
-            <el-row :gutter="20">
-              <el-col :span="12">
+              <el-col :span="8">
                 <el-form-item label="出生年月" prop="birthDate">
                   <el-date-picker
                     v-model="applicationForm.birthDate"
@@ -598,17 +608,17 @@
                   />
                 </el-form-item>
               </el-col>
-              <el-col :span="12">
+            </el-row>
+
+            <!-- 第二排：政治面貌、现工作部门、职称 -->
+            <el-row :gutter="20">
+              <el-col :span="8">
                 <el-form-item label="政治面貌" prop="politicalStatus">
                   <el-select v-model="applicationForm.politicalStatus" placeholder="请选择政治面貌" style="width: 100%">
-                    <el-option v-for="dict in xg_political_status" :key="dict.value" :label="dict.label" :value="dict.value" />
+                    <el-option v-for="dict in politicalStatusOptions" :key="dict.value" :label="dict.label" :value="dict.value" />
                   </el-select>
                 </el-form-item>
               </el-col>
-            </el-row>
-
-            <!-- 第三排：现工作部门、职称、职务 -->
-            <el-row :gutter="20">
               <el-col :span="8">
                 <el-form-item label="现工作部门" prop="department">
                   <el-input v-model="applicationForm.department" placeholder="请输入工作部门（教学系）" />
@@ -619,47 +629,49 @@
                   <el-input v-model="applicationForm.professionalTitle" placeholder="请输入职称" />
                 </el-form-item>
               </el-col>
+            </el-row>
+
+            <!-- 第三排：职务与证件信息 -->
+            <el-row :gutter="20">
               <el-col :span="8">
                 <el-form-item label="职务" prop="position">
                   <el-input v-model="applicationForm.position" placeholder="请输入职务" />
                 </el-form-item>
               </el-col>
-            </el-row>
-
-            <!-- 第四排：申领证件名称、证件号码 -->
-            <el-row :gutter="20">
-              <el-col :span="12">
+              <el-col :span="8">
                 <el-form-item label="申领证件名称" prop="documentName">
                   <el-input v-model="applicationForm.documentName" placeholder="请输入申领证件名称" />
                 </el-form-item>
               </el-col>
-              <el-col :span="12">
+              <el-col :span="8">
                 <el-form-item label="证件号码" prop="documentNumber">
                   <el-input v-model="applicationForm.documentNumber" placeholder="请输入证件号码" />
                 </el-form-item>
               </el-col>
             </el-row>
 
-            <!-- 第五排：前往国家、出境事由 -->
+            <!-- 第四排：前往国家、出境事由 -->
             <el-row :gutter="20">
               <el-col :span="8">
                 <el-form-item label="前往国家或地区" prop="destinationCountry">
                   <el-input v-model="applicationForm.destinationCountry" placeholder="请输入前往国家或地区" />
                 </el-form-item>
               </el-col>
-              <el-col :span="16">
+              <el-col :span="8">
                 <el-form-item label="出境事由" prop="exitReason">
                   <el-select v-model="applicationForm.exitReason" placeholder="请选择出境事由" clearable style="width: 100%">
                     <el-option v-for="dict in exitReasonOptions" :key="dict.value" :label="dict.label" :value="dict.label" />
                   </el-select>
                 </el-form-item>
               </el-col>
+              <el-col :span="8"></el-col>
             </el-row>
-
-            <!-- 探亲时显示的额外字段 -->
-            <el-row :gutter="20" v-if="applicationForm.exitReason === '探亲'">
+            <el-row v-if="applicationForm.exitReason === '探亲'" :gutter="20">
               <el-col :span="24">
-                <el-form-item label="探望对象姓名及与申请者关系" prop="visitRelationship">
+                <el-form-item prop="visitRelationship">
+                  <template #label>
+                    <span class="form-label-multiline">探望对象姓名及与申请者关系</span>
+                  </template>
                   <el-input v-model="applicationForm.visitRelationship" placeholder="请输入探望对象姓名及与申请者关系" />
                 </el-form-item>
               </el-col>
@@ -689,13 +701,8 @@
             </el-row>
 
             <!-- 出国（境）时间 -->
-            <el-row :gutter="10">
-              <el-col :span="2">
-                <el-form-item label="出国（境）时间" label-width="110px" style="font-weight: 600; white-space: nowrap">
-                  <span></span>
-                </el-form-item>
-              </el-col>
-              <el-col :span="8" :offset="0">
+            <el-row :gutter="20">
+              <el-col :span="8">
                 <el-form-item label="出发日期" prop="startDate">
                   <el-date-picker
                     v-model="applicationForm.startDate"
@@ -707,7 +714,7 @@
                   />
                 </el-form-item>
               </el-col>
-              <el-col :span="6">
+              <el-col :span="8">
                 <el-form-item label="返回日期" prop="endDate">
                   <el-date-picker
                     v-model="applicationForm.endDate"
@@ -719,7 +726,7 @@
                   />
                 </el-form-item>
               </el-col>
-              <el-col :span="5" :offset="1">
+              <el-col :span="8">
                 <el-form-item label="出国天数" prop="duration">
                   <el-input v-model="applicationForm.duration" placeholder="天数" disabled style="min-width: 120px">
                     <template #append>天</template>
@@ -739,16 +746,16 @@
               </el-col>
             </el-row>
 
-            <!-- 手写签字、联系电话、应急联系人 -->
+            <!-- 手写签字 -->
             <el-row :gutter="20">
-              <el-col :span="8">
+              <el-col :span="24">
                 <el-form-item label="手写签字" prop="signature">
                   <div class="signature-container">
                     <canvas
                       ref="signatureCanvas"
                       class="signature-canvas"
-                      width="200"
-                      height="80"
+                      width="800"
+                      height="120"
                       @mousedown="startDrawing"
                       @mousemove="draw"
                       @mouseup="stopDrawing"
@@ -763,16 +770,22 @@
                   </div>
                 </el-form-item>
               </el-col>
-              <el-col :span="12">
-                <el-form-item label="联系电话" prop="mobilePhone" label-width="120px" style="margin-left: 6%">
-                  <el-input v-model="applicationForm.mobilePhone" placeholder="请输入联系电话" maxlength="11" show-word-limit style="width: 60%" />
-                </el-form-item>
-                <el-form-item label="应急联系人及联系电话" prop="emergencyContact" label-width="160px" style="margin-left: 10%">
-                  <el-input v-model="applicationForm.emergencyContact" placeholder="请输入应急联系人及联系电话" style="width: 90%" />
+            </el-row>
+
+            <!-- 联系电话与应急联系人 -->
+            <el-row :gutter="20">
+              <el-col :span="8">
+                <el-form-item label="联系电话" prop="mobilePhone">
+                  <el-input v-model="applicationForm.mobilePhone" placeholder="请输入联系电话" maxlength="11" />
                 </el-form-item>
               </el-col>
-              <el-col :span="4">
-                <!-- 预留空间 -->
+              <el-col :span="16">
+                <el-form-item prop="emergencyContact">
+                  <template #label>
+                    <span class="form-label-multiline">应急联系人及联系电话</span>
+                  </template>
+                  <el-input v-model="applicationForm.emergencyContact" placeholder="请输入应急联系人及联系电话" />
+                </el-form-item>
               </el-col>
             </el-row>
           </el-form>
@@ -794,21 +807,13 @@
       > -->
 
           <!-- 党籍保留附件上传区域（仅当中共党员且出国天数>30天时显示） -->
-          <div
-            v-if="showPartyRetentionUpload"
-            class="party-retention-upload-section"
-            style="margin: 10px 0; padding: 10px; border: 1px dashed #ff4757; border-radius: 4px; background: #fff5f5"
-          >
-            <div style="font-size: 14px; color: #ff4757; margin-bottom: 8px; font-weight: bold">
-              <el-icon><Warning /></el-icon>
-              党籍保留附件上传（必填）
-            </div>
+          <div class="party-retention-upload-section" style="margin: 10px 0; padding: 10px; border: 1px solid #dcdfe6; border-radius: 4px">
             <div style="font-size: 12px; color: #606266; margin-bottom: 8px">
-              您是中共党员且出国天数超过30天，需要先提交党籍保留流程，审批通过后下载并上传盖章附件
+              需办理党籍保留流程的，请先提交党籍保留流程，审批通过后下载并上传盖章附件
             </div>
             <!-- 下载PDF空白模板按钮 -->
             <div style="margin-bottom: 10px">
-              <el-button type="primary" size="small" icon="Download" @click="handleDownloadPartyRetention"> 下载党籍保留申请PDF模板 </el-button>
+              <el-button type="primary" size="small" icon="Download" @click="handleDownloadPartyRetention"> 下载党籍保留申请Word模板 </el-button>
               <span style="margin-left: 10px; font-size: 12px; color: #909399"> * 请先下载空白模板并手工填写，然后上传盖章后的文件 </span>
             </div>
             <!-- 上传组件 -->
@@ -818,6 +823,7 @@
                 :file-list="state.partyRetentionFileList"
                 class="upload-demo"
                 drag
+                multiple
                 list-type="picture-card"
                 :on-preview="handlePartyRetentionFilePreview"
                 :action="uploadPartyRetentionFileAction"
@@ -827,50 +833,43 @@
                 :before-upload="beforePartyRetentionFileUpload"
                 :on-success="handlePartyRetentionFileUploadSuccess"
                 :on-error="handlePartyRetentionFileUploadError"
-                :on-remove="handlePartyRetentionFileRemoveConfirm"
+                :before-remove="handlePartyRetentionFileBeforeRemove"
+                :on-remove="handlePartyRetentionFileRemove"
                 :on-change="handlePartyRetentionFileChange"
-                :limit="1"
                 :show-file-list="true"
-                accept=".pdf,.jpg,.jpeg,.png"
               >
                 <template #tip>
-                  <div class="el-upload__tip">支持PDF、JPG、PNG格式，文件大小不超过10MB，只能上传1个文件</div>
+                  <div class="el-upload__tip">支持任意格式文件，单个文件大小不超过10MB，可上传多个附件。</div>
                 </template>
 
-                <!-- 调整拖拽上传图标与文字在同一行、居中对齐 -->
-                <div class="el-upload-dragger1">
+                <div class="el-upload-dragger-attachment">
                   <el-icon class="el-icon--upload"><UploadFilled /></el-icon>
-                  <div class="el-upload__text"><em>点击上传</em></div>
+                  <div class="el-upload__text">将文件拖到此处，或<em>点击上传</em></div>
                 </div>
 
-                <!-- 自定义文件卡片缩略图（含文件名） -->
                 <template #file="{ file }">
                   <div class="upload-file-card">
-                    <!-- 缩略图区域 -->
                     <div class="upload-file-thumb">
                       <ImagePreview
-                        v-if="isImageFileParty(file) && file.url"
-                        :src="getFileOssIdParty(file)"
+                        v-if="isImageFileParty(file) && getPartyRetentionPreviewSrc(file)"
+                        :src="getPartyRetentionPreviewSrc(file)"
                         class="upload-thumb-image"
-                        :isOssId="true"
+                        :isOssId="Boolean(file.ossId)"
                       />
                       <div v-else class="upload-file-placeholder">
                         <el-icon><Document /></el-icon>
                         <span class="file-ext">{{ getFileExtParty(file.name) }}</span>
                       </div>
-                      <!-- loading 遮罩只在上传中显示 -->
                       <div v-if="file.status === 'uploading'" class="upload-file-loading">
                         <el-icon class="is-loading"><Loading /></el-icon>
                         <span class="loading-text">上传中...</span>
                       </div>
                     </div>
 
-                    <!-- 文件名称 -->
                     <div class="upload-file-name" :title="file.name">
                       {{ getShortFileNameParty(file.name) }}
                     </div>
 
-                    <!-- 操作按钮区域 - 固定在文件名下方 -->
                     <div class="upload-file-card-actions" v-if="file.status && file.status !== 'ready'">
                       <el-button-group size="small">
                         <el-button
@@ -881,7 +880,7 @@
                         >
                           <el-icon><Download /></el-icon>
                         </el-button>
-                        <el-button type="danger" @click.stop="handlePartyRetentionFileRemoveConfirm(file)" title="删除">
+                        <el-button type="danger" @click.stop="handlePartyRetentionFileActionRemove(file)" title="删除">
                           <el-icon><Delete /></el-icon>
                         </el-button>
                       </el-button-group>
@@ -950,125 +949,255 @@
     </el-dialog>
 
     <!-- 查看详情对话框 -->
-    <el-dialog :title="state.viewDialog.title" v-model="state.viewDialog.visible" width="900px" append-to-body>
+    <el-dialog :title="state.viewDialog.title" v-model="state.viewDialog.visible" width="1050px" append-to-body>
       <!-- 申请详情 -->
-      <el-descriptions v-if="state.viewData && 'applicationId' in state.viewData && !('recordId' in state.viewData)" :column="2" border>
-        <!-- 基本信息 -->
-        <el-descriptions-item label="姓名">{{ state.viewData.applicantName || '-' }}</el-descriptions-item>
-        <el-descriptions-item label="性别">{{ state.viewData.genderText || '-' }}</el-descriptions-item>
+      <el-form v-if="viewApplication" label-width="120px" class="view-form">
+        <div class="view-section">
+          <div class="view-section-title">个人信息</div>
+          <el-row :gutter="20">
+            <el-col :span="8">
+              <el-form-item label="姓名">
+                <span class="form-value">{{ viewApplication.applicantName || '-' }}</span>
+              </el-form-item>
+            </el-col>
+            <el-col :span="8">
+              <el-form-item label="性别">
+                <span class="form-value">{{ viewApplication.genderText || '-' }}</span>
+              </el-form-item>
+            </el-col>
+            <el-col :span="8">
+              <el-form-item label="出生年月">
+                <span class="form-value">{{ formatYearMonth(viewApplication.birthDate) || '-' }}</span>
+              </el-form-item>
+            </el-col>
+          </el-row>
+          <el-row :gutter="20">
+            <el-col :span="8">
+              <el-form-item label="政治面貌">
+                <span class="form-value">{{ viewApplication.politicalStatusText || '-' }}</span>
+              </el-form-item>
+            </el-col>
+            <el-col :span="8">
+              <el-form-item label="现工作部门">
+                <span class="form-value">{{ viewApplication.registeredAddress || '-' }}</span>
+              </el-form-item>
+            </el-col>
+            <el-col :span="8">
+              <el-form-item label="职称">
+                <span class="form-value">{{ viewApplication.professionalTitle || '-' }}</span>
+              </el-form-item>
+            </el-col>
+          </el-row>
+        </div>
 
-        <el-descriptions-item label="出生年月">{{ formatDate((state.viewData as OverseasApplicationVO).birthDate) }}</el-descriptions-item>
-        <el-descriptions-item label="政治面貌">{{ state.viewData.politicalStatusText || '-' }}</el-descriptions-item>
+        <div class="view-section">
+          <div class="view-section-title">岗位与证件</div>
+          <el-row :gutter="20">
+            <el-col :span="8">
+              <el-form-item label="职务">
+                <span class="form-value">{{ viewApplication.position || '-' }}</span>
+              </el-form-item>
+            </el-col>
+            <el-col :span="8">
+              <el-form-item label="申领证件名称">
+                <span class="form-value">{{ viewApplication.documentName || '-' }}</span>
+              </el-form-item>
+            </el-col>
+            <el-col :span="8">
+              <el-form-item label="证件号码">
+                <span class="form-value">{{ viewApplication.documentNumber || '-' }}</span>
+              </el-form-item>
+            </el-col>
+          </el-row>
+        </div>
 
-        <!-- 工作信息 -->
-        <el-descriptions-item label="现工作部门">{{ state.viewData.department || '-' }}</el-descriptions-item>
-        <el-descriptions-item label="职称">{{ state.viewData.professionalTitle || '-' }}</el-descriptions-item>
+        <div class="view-section">
+          <div class="view-section-title">出行信息</div>
+          <el-row :gutter="20">
+            <el-col :span="8">
+              <el-form-item label="前往国家或地区">
+                <span class="form-value">{{ viewApplication.destinationCountry || '-' }}</span>
+              </el-form-item>
+            </el-col>
+            <el-col :span="8">
+              <el-form-item label="出境事由">
+                <span class="form-value">{{ viewApplication.exitReason || '-' }}</span>
+              </el-form-item>
+            </el-col>
+            <el-col v-if="viewApplication.exitReason === '探亲'" :span="8">
+              <el-form-item label="探望对象关系">
+                <span class="form-value">{{ viewApplication.visitRelationship || '-' }}</span>
+              </el-form-item>
+            </el-col>
+          </el-row>
+          <el-row :gutter="20">
+            <el-col :span="24">
+              <el-form-item label="行程安排" class="multiline-item">
+                <span class="form-value multiline">{{
+                  viewApplication.itinerary && viewApplication.itinerary !== '未填写' ? viewApplication.itinerary : '-'
+                }}</span>
+              </el-form-item>
+            </el-col>
+          </el-row>
+        </div>
 
-        <el-descriptions-item label="职务">{{ state.viewData.position || '-' }}</el-descriptions-item>
-        <el-descriptions-item label="申领证件名称">{{ state.viewData.documentName || '-' }}</el-descriptions-item>
+        <div class="view-section">
+          <div class="view-section-title">承诺声明</div>
+          <el-row>
+            <el-col :span="24">
+              <div class="commitment-text readonly-text">
+                本人承诺，在出国（境）期间遵守当地法律法规和中国的法律法规，结束后如期回国并到学校报到，如逾期不归，同意作自动离职处理。
+              </div>
+            </el-col>
+          </el-row>
+        </div>
 
-        <!-- 证件信息 -->
-        <el-descriptions-item label="证件号码">{{ state.viewData.documentNumber || '-' }}</el-descriptions-item>
-        <el-descriptions-item label="前往国家">{{ state.viewData.destinationCountry || '-' }}</el-descriptions-item>
+        <div class="view-section" v-if="viewApplication.signature">
+          <div class="view-section-title">手写签字</div>
+          <el-row>
+            <el-col :span="24">
+              <div class="signature-preview">
+                <img :src="viewApplication.signature" alt="手写签名" />
+              </div>
+            </el-col>
+          </el-row>
+        </div>
 
-        <!-- 出境信息 -->
-        <el-descriptions-item label="出境事由">{{ state.viewData.exitReason || '-' }}</el-descriptions-item>
-        <!-- 探亲信息（如果是探亲） -->
-        <el-descriptions-item label="探望对象关系" v-if="state.viewData.exitReason === '探亲'">
-          {{ state.viewData.visitRelationship || '-' }}
-        </el-descriptions-item>
+        <div class="view-section">
+          <div class="view-section-title">时间安排</div>
+          <el-row :gutter="20">
+            <el-col :span="8">
+              <el-form-item label="出发日期">
+                <span class="form-value">{{ formatDate(viewApplication.startDate) || '-' }}</span>
+              </el-form-item>
+            </el-col>
+            <el-col :span="8">
+              <el-form-item label="返回日期">
+                <span class="form-value">{{ formatDate(viewApplication.endDate) || '-' }}</span>
+              </el-form-item>
+            </el-col>
+            <el-col :span="8">
+              <el-form-item label="出国天数">
+                <span class="form-value">{{ viewApplication.duration || 0 }}天</span>
+              </el-form-item>
+            </el-col>
+          </el-row>
+        </div>
 
-        <!-- 行程安排 -->
-        <el-descriptions-item label="行程安排" :span="2">{{ state.viewData.itinerary || '-' }}</el-descriptions-item>
-        <el-descriptions-item label="出国天数">{{ (state.viewData as OverseasApplicationVO).duration || 0 }}天</el-descriptions-item>
+        <div class="view-section">
+          <div class="view-section-title">联系方式</div>
+          <el-row :gutter="20">
+            <el-col :span="12">
+              <el-form-item label="联系电话">
+                <span class="form-value">{{ viewApplication.mobilePhone || '-' }}</span>
+              </el-form-item>
+            </el-col>
+            <el-col :span="12">
+              <el-form-item>
+                <template #label>
+                  <span class="nowrap-label">应急联系人及电话：</span>
+                </template>
+                <span class="form-value">{{ viewApplication.emergencyContact || '-' }}</span>
+              </el-form-item>
+            </el-col>
+          </el-row>
+        </div>
 
-        <!-- 备注 -->
-        <el-descriptions-item label="备注" v-if="state.viewData.remarks">{{ state.viewData.remarks }}</el-descriptions-item>
+        <div class="view-section">
+          <div class="view-section-title">状态信息</div>
+          <el-row :gutter="20">
+            <el-col :span="12">
+              <el-form-item label="申请状态">
+                <el-tag :type="getStatusTagType(viewApplication.status)">{{ viewApplication.statusText || '-' }}</el-tag>
+              </el-form-item>
+            </el-col>
+            <el-col :span="12">
+              <el-form-item label="申请时间">
+                <span class="form-value">{{ viewApplication.applyTime || '-' }}</span>
+              </el-form-item>
+            </el-col>
+          </el-row>
+          <el-row v-if="viewApplication.remarks || viewApplication.adminRemark" :gutter="20">
+            <el-col :span="24" v-if="viewApplication.remarks">
+              <el-form-item label="备注">
+                <span class="form-value multiline">{{ viewApplication.remarks }}</span>
+              </el-form-item>
+            </el-col>
+            <el-col :span="24" v-if="viewApplication.adminRemark">
+              <el-form-item label="管理员备注">
+                <span class="form-value multiline">{{ viewApplication.adminRemark }}</span>
+              </el-form-item>
+            </el-col>
+          </el-row>
+        </div>
 
-        <!-- 出国时间 -->
-        <el-descriptions-item label="出发日期">{{ formatDate((state.viewData as OverseasApplicationVO).startDate) || '-' }}</el-descriptions-item>
-        <el-descriptions-item label="返回日期">{{ formatDate((state.viewData as OverseasApplicationVO).endDate) || '-' }}</el-descriptions-item>
-
-        <!-- 联系信息 -->
-        <el-descriptions-item label="联系电话">{{ state.viewData.mobilePhone || '-' }}</el-descriptions-item>
-        <el-descriptions-item label="应急联系人及电话">{{ state.viewData.emergencyContact || '-' }}</el-descriptions-item>
-
-        <!-- 申请状态 -->
-        <el-descriptions-item label="申请状态">
-          <el-tag :type="getStatusTagType((state.viewData as OverseasApplicationVO).status)">{{
-            (state.viewData as OverseasApplicationVO).statusText
-          }}</el-tag>
-        </el-descriptions-item>
-        <el-descriptions-item label="申请时间">{{ (state.viewData as OverseasApplicationVO).applyTime || '-' }}</el-descriptions-item>
-
-        <!-- 管理员备注 -->
-        <el-descriptions-item label="管理员备注" :span="2" v-if="(state.viewData as OverseasApplicationVO).adminRemark">{{
-          (state.viewData as OverseasApplicationVO).adminRemark
-        }}</el-descriptions-item>
-      </el-descriptions>
+        <!-- 审批记录 -->
+        <div class="view-section" style="margin-top: 20px">
+          <div class="view-section-title">
+            <el-icon style="vertical-align: middle; margin-right: 5px"><EditPen /></el-icon>
+            审批记录
+          </div>
+          <div v-loading="approvalHistoryLoading">
+            <el-empty v-if="!approvalHistoryLoading && approvalHistoryList.length === 0" description="暂无审批记录" :image-size="80" />
+            <el-table v-else :data="approvalHistoryList" border style="width: 100%" max-height="400px">
+              <el-table-column label="审批级别" align="center" prop="approvalLevel" width="120">
+                <template #default="scope">
+                  <span v-if="scope.row.approvalLevel === '1'">部门负责人</span>
+                  <span v-else-if="scope.row.approvalLevel === '2'">人事处</span>
+                  <span v-else-if="scope.row.approvalLevel === '3'">纪委</span>
+                  <span v-else-if="scope.row.approvalLevel === '4'">学院分管领导</span>
+                  <span v-else-if="scope.row.approvalLevel === '5'">学院党委书记</span>
+                  <span v-else>{{ scope.row.approvalLevel }}</span>
+                </template>
+              </el-table-column>
+              <el-table-column label="审批人" align="center" prop="approverName" width="120" />
+              <el-table-column label="审批时间" align="center" prop="approvalTime" width="160">
+                <template #default="scope">
+                  <span>{{ parseTime(scope.row.approvalTime) }}</span>
+                </template>
+              </el-table-column>
+              <el-table-column label="审批结果" align="center" prop="approvalStatus" width="100">
+                <template #default="scope">
+                  <el-tag :type="getOldApprovalStatusTagType(scope.row.approvalStatus)">
+                    <span v-if="scope.row.approvalStatus === '0'">待审核</span>
+                    <span v-else-if="scope.row.approvalStatus === '1'">通过</span>
+                    <span v-else-if="scope.row.approvalStatus === '2'">拒绝</span>
+                    <span v-else>{{ scope.row.approvalStatus }}</span>
+                  </el-tag>
+                </template>
+              </el-table-column>
+              <el-table-column label="审批意见" align="center" prop="approvalOpinion" min-width="200" :show-overflow-tooltip="true" />
+            </el-table>
+          </div>
+        </div>
+      </el-form>
 
       <!-- 申请附件显示区域 -->
-      <div v-if="state.viewData && 'applicationId' in state.viewData && !('recordId' in state.viewData) && viewAttachmentList.length > 0" class="attachment-section" style="margin-top: 20px;">
-        <div class="section-title" style="margin-bottom: 15px; padding: 10px; border-left: 4px solid #409eff; background-color: #f5f7fa;">
-          <el-icon style="margin-right: 8px;"><Paperclip /></el-icon>
+      <div v-if="viewApplication && viewAttachmentList.length > 0" class="attachment-section" style="margin-top: 20px">
+        <div class="section-title attachment-title-primary">
+          <el-icon style="margin-right: 8px"><Paperclip /></el-icon>
           <strong>申请附件</strong>
         </div>
-        <el-table :data="viewAttachmentList" border size="small">
-          <el-table-column label="序号" type="index" width="60" align="center" />
-          <el-table-column label="文件名称" prop="name" align="left" show-overflow-tooltip />
-          <el-table-column label="上传时间" prop="uploadTime" width="180" align="center">
-            <template #default="scope">
-              {{ parseTime(scope.row.uploadTime) }}
-            </template>
-          </el-table-column>
-          <el-table-column label="操作" width="100" align="center">
-            <template #default="scope">
-              <el-button type="primary" link icon="Download" @click="handleDownloadAttachment(scope.row)" size="small">
-                下载
-              </el-button>
-            </template>
-          </el-table-column>
-        </el-table>
-      </div>
-
-      <!-- 党籍保留附件显示区域 -->
-      <div 
-        v-if="state.viewData && 'applicationId' in state.viewData && !('recordId' in state.viewData) && (state.viewData as OverseasApplicationVO).partyRetentionUploadStatus === '1'" 
-        class="attachment-section" 
-        style="margin-top: 20px;"
-      >
-        <div class="section-title" style="margin-bottom: 15px; padding: 10px; border-left: 4px solid #67c23a; background-color: #f0f9ff;">
-          <el-icon style="margin-right: 8px;"><Document /></el-icon>
-          <strong>党籍保留附件</strong>
-        </div>
-        <div style="padding: 15px; border: 1px solid #e4e7ed; border-radius: 4px; background: #fafafa;">
-          <div style="display: flex; align-items: center; justify-content: space-between;">
-            <div style="flex: 1;">
-              <el-tag type="success" size="large" style="padding: 8px 16px;">
+        <div class="attachment-view-grid">
+          <div v-for="file in viewAttachmentList" :key="file.ossId || file.uid || file.url || file.name" class="upload-file-card attachment-card">
+            <div class="upload-file-thumb">
+              <ImagePreview
+                v-if="isImageFileByName(file.name)"
+                :src="file.ossId || file.url"
+                class="upload-thumb-image"
+                :isOssId="Boolean(file.ossId)"
+              />
+              <div v-else class="upload-file-placeholder">
                 <el-icon><Document /></el-icon>
-                <span style="margin-left: 8px;">{{ (state.viewData as OverseasApplicationVO).partyRetentionFileName }}</span>
-              </el-tag>
-              <div style="margin-top: 8px; font-size: 12px; color: #909399;">
-                上传时间: {{ (state.viewData as OverseasApplicationVO).partyRetentionUploadTime }}
+                <span class="file-ext">{{ getFileExtParty(file.name || '') }}</span>
               </div>
             </div>
-            <div style="display: flex; gap: 8px;">
-              <el-button 
-                type="primary" 
-                icon="View" 
-                @click="handlePreviewPartyRetentionFile(state.viewData as OverseasApplicationVO)"
-                v-if="(state.viewData as OverseasApplicationVO).partyRetentionFilePath"
-              >
-                预览
-              </el-button>
-              <el-button 
-                type="success" 
-                icon="Download" 
-                @click="handleDownloadPartyRetentionFile(state.viewData as OverseasApplicationVO)"
-                v-if="(state.viewData as OverseasApplicationVO).partyRetentionFileOssId"
-              >
-                下载
-              </el-button>
+            <div class="upload-file-name" :title="file.name">
+              {{ file.name || '附件' }}
+            </div>
+            <div class="upload-file-meta">上传时间：{{ parseTime(file.uploadTime) }}</div>
+            <div class="upload-file-card-actions">
+              <el-button link type="primary" icon="Download" @click="handleDownloadAttachment(file)">下载</el-button>
             </div>
           </div>
         </div>
@@ -1078,7 +1207,7 @@
       <div v-if="false">
         <!-- 出国境登记表盖章文件 -->
         <div
-          v-if="(state.viewData as OverseasApplicationVO).stampedFileUploadStatus === '1'"
+          v-if="viewApplication && viewApplication.stampedFileUploadStatus === '1'"
           style="margin-bottom: 15px; padding: 12px; border: 1px solid #e4e7ed; border-radius: 4px; background: #f9fafb"
         >
           <div style="font-size: 14px; color: #606266; margin-bottom: 8px">
@@ -1089,17 +1218,15 @@
             <div style="flex: 1">
               <el-tag type="success" size="small">
                 <el-icon><Document /></el-icon>
-                {{ (state.viewData as OverseasApplicationVO).stampedRegistrationFileName }}
+                {{ viewApplication.stampedRegistrationFileName }}
               </el-tag>
-              <span style="margin-left: 10px; font-size: 12px; color: #909399">
-                上传时间: {{ (state.viewData as OverseasApplicationVO).stampedFileUploadTime }}
-              </span>
+              <span style="margin-left: 10px; font-size: 12px; color: #909399"> 上传时间: {{ viewApplication.stampedFileUploadTime }} </span>
             </div>
             <div style="display: flex; gap: 8px">
-              <el-button link type="primary" size="small" @click="handlePreviewStampedFile(state.viewData as OverseasApplicationVO)">
+              <el-button link type="primary" size="small" @click="handlePreviewStampedFile(viewApplication)">
                 <el-icon><View /></el-icon> 查看
               </el-button>
-              <el-button link type="primary" size="small" @click="handleDownloadStampedFile(state.viewData as OverseasApplicationVO)">
+              <el-button link type="primary" size="small" @click="handleDownloadStampedFile(viewApplication)">
                 <el-icon><Download /></el-icon> 下载
               </el-button>
             </div>
@@ -1108,7 +1235,7 @@
 
         <!-- 党籍保留附件 -->
         <div
-          v-if="(state.viewData as OverseasApplicationVO).partyRetentionUploadStatus === '1'"
+          v-if="viewApplication && viewApplication.partyRetentionUploadStatus === '1'"
           style="margin-bottom: 15px; padding: 12px; border: 1px solid #e4e7ed; border-radius: 4px; background: #fff5f5"
         >
           <div style="font-size: 14px; color: #ff4757; margin-bottom: 8px">
@@ -1119,17 +1246,15 @@
             <div style="flex: 1">
               <el-tag type="danger" size="small">
                 <el-icon><Document /></el-icon>
-                {{ (state.viewData as OverseasApplicationVO).partyRetentionFileName }}
+                {{ viewApplication.partyRetentionFileName }}
               </el-tag>
-              <span style="margin-left: 10px; font-size: 12px; color: #909399">
-                上传时间: {{ (state.viewData as OverseasApplicationVO).partyRetentionUploadTime }}
-              </span>
+              <span style="margin-left: 10px; font-size: 12px; color: #909399"> 上传时间: {{ viewApplication.partyRetentionUploadTime }} </span>
             </div>
             <div style="display: flex; gap: 8px">
-              <el-button link type="primary" size="small" @click="handlePreviewPartyRetentionFile(state.viewData as OverseasApplicationVO)">
+              <el-button link type="primary" size="small" @click="handlePreviewPartyRetentionFile(viewApplication)">
                 <el-icon><View /></el-icon> 查看
               </el-button>
-              <el-button link type="primary" size="small" @click="handleDownloadPartyRetentionFile(state.viewData as OverseasApplicationVO)">
+              <el-button link type="primary" size="small" @click="handleDownloadPartyRetentionFile(viewApplication)">
                 <el-icon><Download /></el-icon> 下载
               </el-button>
             </div>
@@ -1162,11 +1287,10 @@
             </el-table-column>
           </el-table>
         </div>
-
       </div>
 
       <!-- 申请详情操作按钮 -->
-      <template #footer v-if="state.viewData && 'applicationId' in state.viewData && !('recordId' in state.viewData)">
+      <template #footer v-if="viewApplication">
         <div class="dialog-footer">
           <el-button @click="state.viewDialog.visible = false">关闭</el-button>
         </div>
@@ -1178,7 +1302,7 @@
         <el-descriptions-item label="姓名">{{ state.viewData.applicantName || '-' }}</el-descriptions-item>
         <el-descriptions-item label="性别">{{ (state.viewData as OverseasRecordVO).genderText || '-' }}</el-descriptions-item>
 
-        <el-descriptions-item label="出生年月">{{ formatDate((state.viewData as OverseasRecordVO).birthDate) || '-' }}</el-descriptions-item>
+        <el-descriptions-item label="出生年月">{{ formatYearMonth((state.viewData as OverseasRecordVO).birthDate) || '-' }}</el-descriptions-item>
         <el-descriptions-item label="政治面貌">{{
           formatPoliticalStatus((state.viewData as OverseasRecordVO).politicalStatus)
         }}</el-descriptions-item>
@@ -1384,7 +1508,7 @@ import {
   type OverseasAttachmentVO
 } from '@/api/rs/overseas';
 import { ElMessage, ElMessageBox } from 'element-plus';
-import { UploadFilled, Document, Loading, Download, Delete, View, EditPen } from '@element-plus/icons-vue';
+import { UploadFilled, Document, Loading, Download, Delete, View, EditPen, Paperclip } from '@element-plus/icons-vue';
 import ImagePreview from '@/components/ImagePreview/index.vue';
 import animate from '@/animate';
 import { parseTime } from '@/utils/ruoyi';
@@ -1404,9 +1528,7 @@ const { proxy } = getCurrentInstance() as any;
 const userStore = useUserStore();
 
 // 字典：性别、政治面貌
-const { sys_user_sex, xg_political_status } = toRefs<any>(
-  proxy?.useDict('sys_user_sex', 'xg_political_status') || {}
-);
+const { sys_user_sex, xg_political_status } = toRefs<any>(proxy?.useDict('sys_user_sex', 'xg_political_status') || {});
 
 // 表单引用
 const applicationFormRef = ref<any>(null);
@@ -1414,13 +1536,15 @@ const applicationQueryForm = ref<any>(null);
 const recordQueryForm = ref<any>(null);
 const attachmentFormRef = ref<any>(null);
 const attachmentUploadRef = ref<any>(null);
+const partyRetentionUpload = ref<any>(null);
 // 工作流组件引用
 const submitVerifyRef = ref<any>(null);
 const approvalRecordRef = ref<any>(null);
 
 // 附件相关数据
 const attachmentList = ref<OverseasAttachmentVO[]>([]);
-const viewAttachmentList = ref<OverseasAttachmentVO[]>([]);
+const viewAttachmentList = ref<OverseasAttachmentVO[]>([]); // 查看详情用的附件列表
+const applicationAttachmentList = ref<any[]>([]); // 🔴 新增：编辑/重新提交弹窗中的申请附件列表
 const attachmentDialog = reactive({
   visible: false,
   uploading: false
@@ -1437,7 +1561,6 @@ const attachmentRules = {
 };
 
 // 申请附件上传相关（新增 - 参考培训申请模式）
-const applicationAttachmentFileList = ref<any[]>([]);
 const baseApi = import.meta.env.VITE_APP_BASE_API || '/dev-api';
 const clientId = import.meta.env.VITE_APP_CLIENT_ID || 'e5cd7e4891bf95d1d19206ce24a7b32e';
 
@@ -1559,10 +1682,10 @@ const state = reactive({
     { label: '其他', value: 'other' }
   ],
 
-exitReasonOptions: [
-  { label: '旅游', value: 'tourism' },
-  { label: '探亲', value: 'visiting_relatives' }
-],
+  exitReasonOptions: [
+    { label: '旅游', value: 'tourism' },
+    { label: '探亲', value: 'visiting_relatives' }
+  ],
 
   completionStatusOptions: [
     { label: '进行中', value: '0' },
@@ -1602,6 +1725,14 @@ const {
   completionStatusOptions
 } = toRefs(state);
 
+const viewApplication = computed<OverseasApplicationVO | null>(() => {
+  const data = state.viewData as any;
+  if (data && 'applicationId' in data && !('recordId' in data)) {
+    return data as OverseasApplicationVO;
+  }
+  return null;
+});
+
 // 上传文件的headers配置
 const uploadHeaders = computed(() => {
   return {
@@ -1804,7 +1935,7 @@ const handleReadComplete = () => {
   state.countdown = 5;
   state.countdownActive = false;
   state.readCompleted = false;
-  
+
   // 打开第二个承诺书对话框
   state.commitmentDialog.visible = true;
   state.commitmentCountdown = 5;
@@ -1842,7 +1973,7 @@ const handleCommitmentReadComplete = () => {
   state.commitmentCountdown = 5;
   state.commitmentCountdownActive = false;
   state.commitmentReadCompleted = false;
-  
+
   // 重置申请表单并打开申请对话框
   resetApplicationForm();
   state.applicationDialog.title = '新增因私出国（境）申请登记报备表';
@@ -1868,6 +1999,9 @@ const handleUpdateApplication = async (row: OverseasApplicationVO) => {
     // 加载申请详情
     const response = await getOverseasApplication(row.applicationId);
     state.applicationForm = response.data;
+    // 🔴 修复：异步加载所有党籍保留附件
+    await syncPartyRetentionFileListFromForm();
+
     state.applicationDialog.title = '编辑因私出国（境）申请登记报备表';
     state.pageType = 'edit';
     // 更新弹窗key，确保每次打开都是全新的组件
@@ -1909,6 +2043,11 @@ const handleViewApplication = async (row: OverseasApplicationVO) => {
     // 加载附件列表（传入attachmentIds而不是applicationId）
     await loadViewAttachmentList(response.data.attachmentIds);
     console.log('✅ [查看详情] 附件列表加载完成');
+
+    // 加载审批历史记录
+    console.log('🔄 [查看详情] 开始加载审批历史记录...');
+    await loadViewApprovalHistory(row.applicationId);
+    console.log('✅ [查看详情] 审批历史记录加载完成');
   } catch (error) {
     console.error('❌ [查看详情] 获取申请详情失败:', error);
     ElMessage.error('获取申请详情失败');
@@ -1944,15 +2083,13 @@ const handleUpdateAndResubmitApplication = async (row: OverseasApplicationVO) =>
     // 加载申请详情
     const response = await getOverseasApplication(row.applicationId);
     state.applicationForm = response.data;
+    // 🔴 修复：异步加载所有党籍保留附件
+    await syncPartyRetentionFileListFromForm();
+
     state.applicationDialog.title = '修改并重新提交因私出国（境）申请';
     state.pageType = 'resubmit';
     state.isResubmitMode = true; // 标记为重新提交模式
-    
-    // 加载已上传的附件列表（关键：用于编辑时显示已有附件）
-    console.log('🔄 [重新提交] 开始加载已上传的附件列表，attachmentIds:', response.data.attachmentIds);
-    await loadApplicationAttachmentList(response.data.attachmentIds);
-    console.log('✅ [重新提交] 附件列表加载完成');
-    
+
     // 更新弹窗key，确保每次打开都是全新的组件
     state.applicationDialog.key = Date.now();
     console.log('🔄 [重新提交] 打开弹窗，更新key:', state.applicationDialog.key);
@@ -2024,7 +2161,13 @@ const handleViewApprovalHistory = async (row: OverseasApplicationVO) => {
     const historyResponse = await getOverseasApprovalHistory(applicationId);
 
     if (historyResponse.code === 200 && historyResponse.data) {
-      approvalHistoryList.value = historyResponse.data || [];
+      // 按审批时间倒序排列（最新的在前面）
+      const sortedData = (historyResponse.data || []).sort((a: any, b: any) => {
+        const timeA = a.approvalTime ? new Date(a.approvalTime).getTime() : 0;
+        const timeB = b.approvalTime ? new Date(b.approvalTime).getTime() : 0;
+        return timeB - timeA; // 倒序：时间大的（新的）在前面
+      });
+      approvalHistoryList.value = sortedData;
     } else {
       console.warn('审批历史API响应不成功:', historyResponse);
       approvalHistoryList.value = [];
@@ -2064,7 +2207,13 @@ const handleViewRecordApprovalHistory = async (row: OverseasRecordVO) => {
     const historyResponse = await getOverseasApprovalHistory(row.applicationId);
 
     if (historyResponse.code === 200 && historyResponse.data) {
-      approvalHistoryList.value = historyResponse.data || [];
+      // 按审批时间倒序排列（最新的在前面）
+      const sortedData = (historyResponse.data || []).sort((a: any, b: any) => {
+        const timeA = a.approvalTime ? new Date(a.approvalTime).getTime() : 0;
+        const timeB = b.approvalTime ? new Date(b.approvalTime).getTime() : 0;
+        return timeB - timeA; // 倒序：时间大的（新的）在前面
+      });
+      approvalHistoryList.value = sortedData;
     } else {
       console.warn('审批历史API响应不成功:', historyResponse);
       approvalHistoryList.value = [];
@@ -2079,6 +2228,40 @@ const handleViewRecordApprovalHistory = async (row: OverseasRecordVO) => {
   }
 };
 
+// 加载查看详情弹窗中的审批历史记录
+const loadViewApprovalHistory = async (applicationId: number) => {
+  if (!applicationId) {
+    console.warn('applicationId为空,无法加载审批历史');
+    approvalHistoryList.value = [];
+    return;
+  }
+
+  approvalHistoryLoading.value = true;
+  try {
+    console.log('🔄 [查看详情审批历史] 开始加载审批历史记录, applicationId:', applicationId);
+    const historyResponse = await getOverseasApprovalHistory(applicationId);
+
+    if (historyResponse.code === 200 && historyResponse.data) {
+      // 按审批时间倒序排列（最新的在前面）
+      const sortedData = (historyResponse.data || []).sort((a: any, b: any) => {
+        const timeA = a.approvalTime ? new Date(a.approvalTime).getTime() : 0;
+        const timeB = b.approvalTime ? new Date(b.approvalTime).getTime() : 0;
+        return timeB - timeA; // 倒序：时间大的（新的）在前面
+      });
+      approvalHistoryList.value = sortedData;
+      console.log('✅ [查看详情审批历史] 审批历史记录加载成功, 共', approvalHistoryList.value.length, '条记录（已按审批时间倒序排列）');
+    } else {
+      console.warn('⚠️ [查看详情审批历史] 获取审批历史失败:', historyResponse.msg);
+      approvalHistoryList.value = [];
+    }
+  } catch (error) {
+    console.error('❌ [查看详情审批历史] 加载审批历史记录失败:', error);
+    approvalHistoryList.value = [];
+  } finally {
+    approvalHistoryLoading.value = false;
+  }
+};
+
 // 导出
 const handleExportApplication = async () => {
   try {
@@ -2129,8 +2312,10 @@ const handleApproval = (row: OverseasApplicationVO) => {
 
   // 加载申请详情
   getOverseasApplication(row.applicationId)
-    .then((response: any) => {
+    .then(async (response: any) => {
       state.applicationForm = response.data;
+      // 🔴 修复：异步加载所有党籍保留附件
+      await syncPartyRetentionFileListFromForm();
       // 更新弹窗key，确保每次打开都是全新的组件
       state.applicationDialog.key = Date.now();
       console.log('👍 [审批] 打开弹窗，更新key:', state.applicationDialog.key);
@@ -2253,6 +2438,179 @@ const submitForm = async (type: string) => {
   }
 };
 
+/**
+ * 生成承诺书
+ */
+const handleGeneratePromiseLetter = async (row: OverseasApplicationVO) => {
+  console.log('📄 [生成承诺书] 开始生成承诺书, applicationId:', row.applicationId);
+
+  try {
+    // 检查必要字段
+    if (!row.startDate || !row.endDate || !row.destinationCountry) {
+      ElMessage.warning('申请信息不完整，无法生成承诺书');
+      return;
+    }
+
+    ElMessage.info('正在生成承诺书，请稍候...');
+
+    // 动态导入 docxtemplater、pizzip 和图片模块
+    const [Docxtemplater, PizZip, ImageModule] = await Promise.all([
+      import('docxtemplater'),
+      import('pizzip'),
+      import('docxtemplater-image-module-free')
+    ]);
+
+    // 加载 Word 模板
+    const response = await fetch('/zunshoudangjichengnuoshu.docx');
+    if (!response.ok) {
+      throw new Error('无法加载模板文件');
+    }
+    const arrayBuffer = await response.arrayBuffer();
+
+    // 解析模板 - 使用更宽松的配置来处理 Word 格式问题
+    const zip = new PizZip.default(arrayBuffer);
+
+    // 配置图片模块
+    const imageOpts = {
+      centered: false,
+      getImage: (tagValue: string) => {
+        // 将 base64 转换为 ArrayBuffer
+        if (!tagValue || tagValue === 'undefined') {
+          return null;
+        }
+
+        // 移除 base64 前缀（如 data:image/png;base64,）
+        const base64Data = tagValue.split(',')[1] || tagValue;
+        const binaryString = atob(base64Data);
+        const bytes = new Uint8Array(binaryString.length);
+        for (let i = 0; i < binaryString.length; i++) {
+          bytes[i] = binaryString.charCodeAt(i);
+        }
+        return bytes.buffer;
+      },
+      getSize: () => {
+        // 返回图片大小（单位：像素）
+        // [宽度, 高度] 500x200 像素，约 13cm x 5cm
+        return [200, 100];
+      }
+    };
+
+    // 创建 docxtemplater 实例，添加图片模块
+    const doc = new Docxtemplater.default(zip, {
+      paragraphLoop: true,
+      linebreaks: true,
+      delimiters: {
+        start: '{{',
+        end: '}}'
+      },
+      modules: [new ImageModule.default(imageOpts)],
+      // 关闭严格模式，允许一些格式问题
+      parser: (tag: string) => {
+        return {
+          get: (scope: any) => {
+            // 移除可能的空格和特殊字符
+            const cleanTag = tag.trim();
+            return scope[cleanTag];
+          }
+        };
+      }
+    });
+
+    // 解析日期
+    const startDate = new Date(row.startDate);
+    const endDate = new Date(row.endDate);
+    const signDate = new Date();
+
+    // 准备填充数据
+    const templateData = {
+      startYear: startDate.getFullYear(),
+      startMonth: (startDate.getMonth() + 1).toString().padStart(2, '0'),
+      startDay: startDate.getDate().toString().padStart(2, '0'),
+      endYear: endDate.getFullYear(),
+      endMonth: (endDate.getMonth() + 1).toString().padStart(2, '0'),
+      endDay: endDate.getDate().toString().padStart(2, '0'),
+      destinationCountry: row.destinationCountry || row.destination || '',
+      applicantName: row.applicantName || '',
+      signature: row.signature || '', // base64 签字图片
+      signYear: signDate.getFullYear(),
+      signMonth: (signDate.getMonth() + 1).toString().padStart(2, '0'),
+      signDay: signDate.getDate().toString().padStart(2, '0')
+    };
+
+    // 🔍 调试：检查签字数据
+    console.log('📋 [生成承诺书] 填充数据:', {
+      ...templateData,
+      signature: templateData.signature ? `(签字图片已提供，长度: ${templateData.signature.length})` : '(无签字)'
+    });
+
+    if (!templateData.signature) {
+      console.warn('⚠️ [生成承诺书] 警告：申请记录中没有签字数据');
+    } else {
+      console.log('✅ [生成承诺书] 签字数据格式:', templateData.signature.substring(0, 50) + '...');
+    }
+
+    // 填充模板
+    doc.render(templateData);
+
+    // 生成文档
+    const output = doc.getZip().generate({
+      type: 'blob',
+      mimeType: 'application/vnd.openxmlformats-officedocument.wordprocessingml.document'
+    });
+
+    // 下载文件
+    const fileName = `遵守党纪承诺书-${row.applicantName || row.applicationId}-${signDate.getFullYear()}${(signDate.getMonth() + 1).toString().padStart(2, '0')}${signDate.getDate().toString().padStart(2, '0')}.docx`;
+
+    // 创建下载链接
+    const url = window.URL.createObjectURL(output);
+    const link = document.createElement('a');
+    link.href = url;
+    link.download = fileName;
+    link.setAttribute('download', fileName); // 确保设置下载属性
+
+    // 添加到 DOM 并触发点击
+    document.body.appendChild(link);
+
+    // 使用 setTimeout 确保链接被正确添加到 DOM
+    setTimeout(() => {
+      link.click();
+
+      // 延迟清理，确保下载已开始
+      setTimeout(() => {
+        document.body.removeChild(link);
+        window.URL.revokeObjectURL(url);
+      }, 100);
+    }, 0);
+
+    ElMessage.success('承诺书生成成功！');
+    console.log('✅ [生成承诺书] 生成成功:', fileName);
+  } catch (error: any) {
+    console.error('❌ [生成承诺书] 生成失败:', error);
+
+    // 检查是否是模板格式错误
+    if (error.properties?.errors) {
+      const errors = error.properties.errors;
+      console.error('模板错误详情:', errors);
+
+      ElMessageBox.alert(
+        `Word 模板中的占位符格式有问题。\n\n常见原因：\n1. 占位符被 Word 拆分了（如 {{startYear}} 被拆成多段）\n2. 占位符应用了格式（加粗、斜体等）\n\n解决方法：\n1. 在 Word 中删除所有占位符\n2. 重新手动输入占位符（不要复制粘贴）\n3. 不要对占位符应用任何格式\n4. 保存后重试\n\n或者使用记事本先编辑好模板内容再粘贴到 Word。`,
+        '模板格式错误',
+        {
+          confirmButtonText: '知道了',
+          type: 'warning',
+          customClass: 'word-template-error-dialog'
+        }
+      );
+    } else if (error.message?.includes('Cannot read properties')) {
+      ElMessage.error('Word模板格式错误，请检查模板文件中的占位符');
+    } else if (error.message?.includes('Failed to fetch') || error.message?.includes('无法加载')) {
+      ElMessage.error('无法加载承诺书模板，请确认模板文件存在于 /public 目录');
+    } else {
+      ElMessage.error('生成承诺书失败：' + (error.message || '未知错误'));
+    }
+  }
+};
+
 /**
  * 打开审批确认对话框（标准工作流模式）
  */
@@ -2334,6 +2692,7 @@ const resetApplicationForm = () => {
     partyRetentionFileName: '',
     partyRetentionUploadTime: '',
     partyRetentionUploadStatus: '0',
+    partyRetentionFileOssId: undefined,
     // budget 字段已删除，但保留默认值避免类型错误
     budget: 0
   };
@@ -2342,10 +2701,6 @@ const resetApplicationForm = () => {
   state.partyRetentionFileList = [];
   console.log('🧹 [重置表单] 已清空党籍保留附件列表');
 
-  // ✅ 清空申请附件列表（关键修复！）
-  applicationAttachmentFileList.value = [];
-  console.log('🧹 [重置表单] 已清空申请附件列表');
-
   // 重置签名画布
   nextTick(() => {
     if (signatureCanvas.value) {
@@ -2449,9 +2804,9 @@ const submitApplicationForm = () => {
 
       // 7. 处理人员类别代码：根据政治面貌判断，默认为普通工作人员
       if (!state.applicationForm.personnelCategory) {
-        // 中共党员可能属于备案人员，其他为普通人员
+        // 中国共产党党员可能属于备案人员，其他为普通人员
         const isPartyMember = state.applicationForm.politicalStatus === '1' || state.applicationForm.politicalStatus === '中共党员';
-        state.applicationForm.personnelCategory = isPartyMember ? '01' : '99'; // 01=党员干部，99=其他人员
+        state.applicationForm.personnelCategory = isPartyMember ? '1' : '99'; // 01=党员干部，99=其他人员
         console.log('✅ personnelCategory已映射:', state.applicationForm.personnelCategory, '(政治面貌:', state.applicationForm.politicalStatus, ')');
       }
 
@@ -2465,6 +2820,27 @@ const submitApplicationForm = () => {
 
       // budget 和 budgetSource 字段已删除，无需设置
 
+      // 6. 处理党籍保留附件（多文件支持）：收集所有上传文件的OSS ID
+      if (state.partyRetentionFileList && state.partyRetentionFileList.length > 0) {
+        const ossIds = state.partyRetentionFileList
+          .map((file) => file.ossId || file.response?.data?.ossId || file.response?.ossId)
+          .filter((id) => id)
+          .join(',');
+
+        if (ossIds) {
+          // 用户明确要求：附件OSS ID存储在党籍保留相关的数据库字段中，且支持多个附件用逗号分隔
+          // 因此我们将逗号分隔的字符串赋值给 partyRetentionFileOssId
+          // 注意：这里需要绕过TS类型检查，因为前端定义可能是number
+          (state.applicationForm as any).partyRetentionFileOssId = ossIds;
+
+          // 同时为了兼容性，也赋值给 attachmentIds
+          (state.applicationForm as any).attachmentIds = ossIds;
+
+          state.applicationForm.partyRetentionUploadStatus = '1';
+          console.log('✅ 已收集附件OSS ID列表并赋值给partyRetentionFileOssId:', ossIds);
+        }
+      }
+
       // 打印最终提交的数据（关键字段）
       console.log('=== 最终提交数据（关键字段） ===');
       console.log({
@@ -2609,6 +2985,92 @@ watch(
   { immediate: true }
 );
 
+// 🔴 修复：从逗号分隔的partyRetentionFileOssId中加载所有附件
+const syncPartyRetentionFileListFromForm = async () => {
+  const hasUploaded =
+    state.applicationForm.partyRetentionUploadStatus === '1' &&
+    (state.applicationForm.partyRetentionFileOssId || state.applicationForm.partyRetentionFilePath);
+
+  if (!hasUploaded) {
+    state.partyRetentionFileList = [];
+    return;
+  }
+
+  // 🔴 修复：支持逗号分隔的多个OSS ID
+  const ossIdStr = state.applicationForm.partyRetentionFileOssId || '';
+  if (!ossIdStr) {
+    state.partyRetentionFileList = [];
+    return;
+  }
+
+  // 解析OSS ID列表（支持逗号分隔的多个ID）
+  const ossIdsArray = ossIdStr
+    .toString()
+    .split(',')
+    .map((id) => id.trim())
+    .filter((id) => id);
+
+  if (ossIdsArray.length === 0) {
+    state.partyRetentionFileList = [];
+    return;
+  }
+
+  console.log('🔍 [党籍保留附件] 开始加载附件列表，OSS ID列表:', ossIdsArray, '共', ossIdsArray.length, '个附件');
+
+  try {
+    // 调用OSS接口获取文件信息
+    const response = await request({
+      url: `/resource/oss/listByIds/${ossIdsArray.join(',')}`,
+      method: 'get'
+    });
+
+    if (response.code === 200 && response.data) {
+      console.log('✅ [党籍保留附件] 获取OSS文件信息成功:', response.data);
+
+      // 转换数据格式
+      state.partyRetentionFileList = response.data.map((item: any, index: number) => ({
+        uid: `party_retention_${index}_${Date.now()}`,
+        name: item.originalName || state.applicationForm.partyRetentionFileName || `党籍保留附件${index + 1}`,
+        status: 'success',
+        ossId: item.ossId,
+        url: item.url,
+        uploadTime: item.createTime,
+        response: {
+          code: 200,
+          data: {
+            ossId: item.ossId,
+            url: item.url
+          }
+        }
+      }));
+
+      console.log('✨ [党籍保留附件] 附件数据处理完成，共', state.partyRetentionFileList.length, '个附件');
+    } else {
+      console.warn('⚠️ [党籍保留附件] OSS接口返回数据为空');
+      state.partyRetentionFileList = [];
+    }
+  } catch (error: any) {
+    console.error('❌ [党籍保留附件] 加载附件列表失败:', error);
+    // 如果加载失败，至少显示一个附件（兼容旧数据）
+    state.partyRetentionFileList = [
+      {
+        uid: `party_retention_${Date.now()}`,
+        name: state.applicationForm.partyRetentionFileName || '党籍保留附件',
+        status: 'success',
+        ossId: ossIdsArray[0],
+        url: state.applicationForm.partyRetentionFilePath || '',
+        response: {
+          code: 200,
+          data: {
+            ossId: ossIdsArray[0],
+            url: state.applicationForm.partyRetentionFilePath || ''
+          }
+        }
+      }
+    ];
+  }
+};
+
 // 处理保留党籍附件
 const handlePartyMembershipAttachment = async () => {
   try {
@@ -2860,7 +3322,13 @@ const restoreSignature = (base64Image: string) => {
 // 工具方法
 const formatDate = (date: string) => {
   if (!date) return '';
-  return new Date(date).toLocaleDateString();
+  return parseTime(date, '{y}-{m}-{d}');
+};
+
+// 格式化年月（不显示日）
+const formatYearMonth = (date: string) => {
+  if (!date) return '';
+  return parseTime(date, '{y}-{m}');
 };
 
 const formatMoney = (amount: number) => {
@@ -2868,25 +3336,43 @@ const formatMoney = (amount: number) => {
   return amount.toLocaleString('zh-CN', { minimumFractionDigits: 2, maximumFractionDigits: 2 });
 };
 
+const resolveExitReasonText = (row: OverseasRecordVO | OverseasApplicationVO) => {
+  const candidates = [(row as OverseasRecordVO).exitReason, (row as OverseasRecordVO).purposeText, (row as OverseasRecordVO).purpose];
+
+  for (const text of candidates) {
+    if (text && text !== '-') {
+      return text;
+    }
+  }
+
+  return '旅游';
+};
+
 // 格式化政治面貌
+const POLITICAL_STATUS_MAP: Record<string, string> = {
+  '1': '中共党员',
+  '2': '中共预备党员',
+  '3': '共青团员',
+  '4': '民革党员',
+  '5': '民盟盟员',
+  '6': '民建会员',
+  '7': '民进会员',
+  '8': '农工党党员',
+  '9': '致公党党员',
+  '10': '九三学社社员',
+  '11': '台盟盟员',
+  '12': '无党派人士',
+  '13': '群众'
+};
+
+const politicalStatusOptions = Object.entries(POLITICAL_STATUS_MAP).map(([value, label]) => ({
+  value,
+  label
+}));
+
 const formatPoliticalStatus = (status: string | undefined) => {
   if (!status) return '-';
-  const statusMap: Record<string, string> = {
-    '1': '中共党员',
-    '2': '中共预备党员',
-    '3': '共青团员',
-    '4': '民革党员',
-    '5': '民盟盟员',
-    '6': '民建会员',
-    '7': '民进会员',
-    '8': '农工党党员',
-    '9': '致公党党员',
-    '10': '九三学社社员',
-    '11': '台盟盟员',
-    '12': '无党派人士',
-    '13': '群众'
-  };
-  return statusMap[status] || status;
+  return POLITICAL_STATUS_MAP[status] || status;
 };
 
 const getStatusTagType = (status: string): 'primary' | 'success' | 'info' | 'warning' | 'danger' => {
@@ -2961,41 +3447,58 @@ const loadChangeHistory = async (recordId: number) => {
 
 // 下载因私出国（境）情况回执PDF
 const handleDownloadReceipt = async (row: OverseasRecordVO) => {
+  const startDateStr = row.actualStartDate || row.startDate;
+  const endDateStr = row.actualEndDate || row.endDate;
+
+  if (!startDateStr || !endDateStr) {
+    ElMessage.warning('缺少出国起止日期，无法生成回执');
+    return;
+  }
+
   try {
-    // 获取recordId，优先使用row的recordId，如果没有则使用applicationId（来自已通过申请的数据）
-    const recordId = row.recordId || row.applicationId;
-    if (!recordId) {
-      ElMessage.error('无法获取记录ID');
-      return;
+    ElMessage.info('正在生成回执Word文件，请稍候...');
+
+    const [Docxtemplater, PizZip] = await Promise.all([import('docxtemplater'), import('pizzip')]);
+    const templateResponse = await fetch('/chuguoqingkuanghuizhi.docx', { cache: 'no-store' });
+
+    if (!templateResponse.ok) {
+      throw new Error('模板文件加载失败，请联系管理员');
     }
 
-    ElMessage.info('正在生成PDF，请稍候...');
-
-    // 调用后端API下载PDF
-    const response = await fetch(`${import.meta.env.VITE_APP_BASE_API}/rs/overseas/record/downloadReceipt/${recordId}`, {
-      method: 'GET',
-      headers: {
-        'Authorization': 'Bearer ' + getToken(),
-        'clientid': import.meta.env.VITE_APP_CLIENT_ID
-      }
+    const arrayBuffer = await templateResponse.arrayBuffer();
+    const zip = new PizZip.default(arrayBuffer);
+    const doc = new Docxtemplater.default(zip, {
+      paragraphLoop: true,
+      linebreaks: true,
+      delimiters: { start: '{{', end: '}}' }
     });
 
-    if (!response.ok) {
-      throw new Error(`下载失败: ${response.statusText}`);
-    }
+    const start = dayjs(startDateStr);
+    const end = dayjs(endDateStr);
+    const duration = row.actualDuration ?? row.duration ?? Math.max(end.diff(start, 'day') + 1, 1);
 
-    // 获取文件名
-    const contentDisposition = response.headers.get('Content-Disposition');
-    let fileName = '因私出国情况回执.pdf';
-    if (contentDisposition) {
-      const fileNameMatch = contentDisposition.match(/filename\*=UTF-8''(.+)/);
-      if (fileNameMatch && fileNameMatch[1]) {
-        fileName = decodeURIComponent(fileNameMatch[1]);
-      }
-    }
+    const templateData = {
+      applicantName: row.applicantName || '',
+      startYear: start.format('YYYY'),
+      startMonth: start.format('MM'),
+      startDay: start.format('DD'),
+      endYear: end.format('YYYY'),
+      endMonth: end.format('MM'),
+      endDay: end.format('DD'),
+      destinationText: row.destinationCountry || row.destination || '',
+      exitReasonText: resolveExitReasonText(row),
+      durationDays: duration,
+      expenseType: '费用自理'
+    };
 
-    // 创建Blob并触发下载
-    const blob = await response.blob();
+    doc.render(templateData);
+
+    const blob = doc.getZip().generate({
+      type: 'blob',
+      mimeType: 'application/vnd.openxmlformats-officedocument.wordprocessingml.document'
+    });
+
+    const fileName = `因私出国情况回执-${templateData.applicantName || dayjs().format('YYYYMMDDHHmmss')}.docx`;
     const url = window.URL.createObjectURL(blob);
     const link = document.createElement('a');
     link.href = url;
@@ -3005,10 +3508,10 @@ const handleDownloadReceipt = async (row: OverseasRecordVO) => {
     document.body.removeChild(link);
     window.URL.revokeObjectURL(url);
 
-    ElMessage.success('PDF下载成功！');
+    ElMessage.success('回执下载成功');
   } catch (error: any) {
-    console.error('下载PDF失败:', error);
-    ElMessage.error('下载失败: ' + (error.message || '未知错误'));
+    console.error('下载因私出国（境）情况回执失败:', error);
+    ElMessage.error(error?.message || '下载回执失败，请稍后重试');
   }
 };
 
@@ -3027,42 +3530,23 @@ const shouldShowPartyRetentionDownload = (application: OverseasApplicationVO) =>
   return isPartyMember && needRetention;
 };
 
-// 下载党籍保留申请PDF空白模板
-const handleDownloadPartyRetention = async () => {
+// 下载党籍保留申请Word空白模板
+const handleDownloadPartyRetention = () => {
   try {
-    ElMessage.info('正在生成PDF，请稍候...');
+    const baseUrl = (import.meta.env.BASE_URL || '/').replace(/\/?$/, '/');
+    const fileUrl = new URL(`${baseUrl}baoliudangji.docx`, window.location.origin).toString();
 
-    // 使用request工具发送请求，自动包含认证头
-    const response = await request({
-      url: '/rs/overseas/record/downloadPartyRetention',
-      method: 'get',
-      responseType: 'blob' // 指定响应类型为blob
-    });
-
-    // 创建blob并触发下载（response已经是blob对象）
-    const blob =
-      response instanceof Blob ? new Blob([response], { type: 'application/pdf' }) : new Blob([response.data], { type: 'application/pdf' });
-
-    console.log('📥 生成的Blob大小:', blob.size, 'bytes');
-    console.log('📥 Blob类型:', blob.type);
-
-    if (blob.size === 0) {
-      throw new Error('下载的文件为空');
-    }
-
-    const url = window.URL.createObjectURL(blob);
     const link = document.createElement('a');
-    link.href = url;
-    link.download = `党籍保留申请_${new Date().getTime()}.pdf`;
+    link.href = fileUrl;
+    link.download = '党籍保留申请模板.docx';
     link.style.display = 'none';
     document.body.appendChild(link);
     link.click();
     document.body.removeChild(link);
-    window.URL.revokeObjectURL(url);
 
-    ElMessage.success('PDF下载成功！');
+    ElMessage.success('Word模板下载成功！');
   } catch (error: any) {
-    console.error('❌ 下载PDF失败:', error);
+    console.error('❌ 下载Word模板失败:', error);
     ElMessage.error('下载失败: ' + (error.message || '未知错误'));
   }
 };
@@ -3074,21 +3558,42 @@ const uploadPartyRetentionFileAction = computed(() => {
   return import.meta.env.VITE_APP_BASE_API + '/rs/overseas/application/uploadPartyRetentionFile';
 });
 
-// 文件数量超出限制
-const handlePartyRetentionFileExceed = () => {
-  ElMessage.warning('只能上传一个党籍保留附件文件！');
+const extractPartyRetentionMeta = (file: any) => {
+  const responseData = file?.response?.data || file?.response || {};
+  return {
+    filePath: responseData.filePath || file.url || '',
+    fileName: responseData.fileName || file.name || '',
+    uploadTime: responseData.uploadTime || file.uploadTime || '',
+    ossId: responseData.ossId || file.ossId || null
+  };
+};
+
+const updatePartyRetentionFormFields = (meta?: { filePath?: string; fileName?: string; uploadTime?: string; ossId?: number | string | null }) => {
+  if (!meta) {
+    state.applicationForm.partyRetentionFilePath = '';
+    state.applicationForm.partyRetentionFileName = '';
+    state.applicationForm.partyRetentionUploadTime = '';
+    state.applicationForm.partyRetentionUploadStatus = '0';
+    state.applicationForm.partyRetentionFileOssId = undefined;
+    return;
+  }
+
+  state.applicationForm.partyRetentionFilePath = meta.filePath || '';
+  state.applicationForm.partyRetentionFileName = meta.fileName || '';
+  state.applicationForm.partyRetentionUploadTime = meta.uploadTime || '';
+  state.applicationForm.partyRetentionUploadStatus = meta.filePath ? '1' : '0';
+
+  const ossIdValue = meta.ossId;
+  // 修改：不再强制转换为Number，允许字符串（用于存储逗号分隔的多个ID）
+  (state.applicationForm as any).partyRetentionFileOssId = ossIdValue;
+};
+
+const getPartyRetentionFileOssId = (file: any) => {
+  return file?.ossId || file?.response?.data?.ossId || file?.response?.ossId || null;
 };
 
 // 上传前校验
 const beforePartyRetentionFileUpload = async (file: File) => {
-  // 检查文件格式
-  const isValidFormat = ['application/pdf', 'image/jpeg', 'image/jpg', 'image/png'].includes(file.type);
-  if (!isValidFormat) {
-    ElMessage.error('只支持PDF、JPG、PNG格式的文件！');
-    return false;
-  }
-
-  // 检查文件大小（10MB）
   const isValidSize = file.size / 1024 / 1024 < 10;
   if (!isValidSize) {
     ElMessage.error('文件大小不能超过10MB！');
@@ -3105,11 +3610,17 @@ const beforePartyRetentionFileUpload = async (file: File) => {
 const handlePartyRetentionFileUploadSuccess = (response: any, file: any) => {
   if (response.code === 200) {
     // 更新表单数据
-    state.applicationForm.partyRetentionFilePath = response.data.filePath;
-    state.applicationForm.partyRetentionFileName = response.data.fileName;
-    state.applicationForm.partyRetentionUploadTime = response.data.uploadTime;
-    state.applicationForm.partyRetentionUploadStatus = '1';
-    state.applicationForm.partyRetentionFileOssId = response.data.ossId; // ⭐ 保存OSS文件ID
+    updatePartyRetentionFormFields({
+      filePath: response.data.filePath,
+      fileName: response.data.fileName,
+      uploadTime: response.data.uploadTime,
+      ossId: response.data.ossId
+    });
+
+    file.url = response.data.url || response.data.filePath || '';
+    file.ossId = response.data.ossId || file.ossId;
+    file.status = 'success';
+    file.response = response;
 
     ElMessage.success('党籍保留附件上传成功！');
   } else {
@@ -3124,18 +3635,37 @@ const handlePartyRetentionFileUploadError = (error: any) => {
 };
 
 // 移除文件回调
-const handlePartyRetentionFileRemove = () => {
-  // 清空表单数据
-  state.applicationForm.partyRetentionFilePath = '';
-  state.applicationForm.partyRetentionFileName = '';
-  state.applicationForm.partyRetentionUploadTime = '';
-  state.applicationForm.partyRetentionUploadStatus = '0';
-  state.applicationForm.partyRetentionFileOssId = null; // ⭐ 清空OSS文件ID
+const handlePartyRetentionFileBeforeRemove = (file: any) => {
+  return ElMessageBox.confirm('确定要删除这个文件吗？', '提示', {
+    confirmButtonText: '确定',
+    cancelButtonText: '取消',
+    type: 'warning'
+  })
+    .then(() => true)
+    .catch(() => false);
+};
 
-  // 清空文件列表（重要：解决删除后文件仍显示的问题）
-  state.partyRetentionFileList = [];
+const handlePartyRetentionFileRemove = (file: any, fileList: any[]) => {
+  state.partyRetentionFileList = fileList;
 
-  ElMessage.info('已移除党籍保留附件');
+  if (!fileList || fileList.length === 0) {
+    updatePartyRetentionFormFields();
+    ElMessage.info('已移除党籍保留附件');
+    return;
+  }
+
+  const removedOssId = getPartyRetentionFileOssId(file);
+  const currentOssId = state.applicationForm.partyRetentionFileOssId;
+
+  if (removedOssId && currentOssId && String(removedOssId) === String(currentOssId)) {
+    const lastFile = fileList[fileList.length - 1];
+    if (lastFile) {
+      const meta = extractPartyRetentionMeta(lastFile);
+      updatePartyRetentionFormFields(meta);
+    } else {
+      updatePartyRetentionFormFields();
+    }
+  }
 };
 
 // 党籍保留附件-文件变更
@@ -3144,19 +3674,10 @@ const handlePartyRetentionFileChange = (file: any, fileList: any) => {
   state.partyRetentionFileList = fileList;
 };
 
-// 党籍保留附件-删除确认
-const handlePartyRetentionFileRemoveConfirm = (file: any) => {
-  ElMessageBox.confirm('确定要删除这个文件吗？', '提示', {
-    confirmButtonText: '确定',
-    cancelButtonText: '取消',
-    type: 'warning'
-  })
-    .then(() => {
-      handlePartyRetentionFileRemove();
-    })
-    .catch(() => {
-      // 取消删除
-    });
+const handlePartyRetentionFileActionRemove = (file: any) => {
+  if (partyRetentionUpload.value?.handleRemove) {
+    partyRetentionUpload.value.handleRemove(file);
+  }
 };
 
 // 党籍保留附件-文件预览
@@ -3173,7 +3694,12 @@ const handlePartyRetentionFilePreview = (file: any) => {
 // 党籍保留附件-判断是否为图片
 const isImageFileParty = (file: any) => {
   const imageTypes = ['image/jpeg', 'image/png', 'image/gif', 'image/bmp', 'image/webp'];
-  return imageTypes.includes(file.raw?.type) || (file.url && /\.(jpg|jpeg|png|gif|bmp|webp)$/i.test(file.name));
+  return imageTypes.includes(file.raw?.type) || /\.(jpg|jpeg|png|gif|bmp|webp)$/i.test(file.name || '');
+};
+
+const isImageFileByName = (fileName?: string) => {
+  if (!fileName) return false;
+  return /\.(jpg|jpeg|png|gif|bmp|webp)$/i.test(fileName);
 };
 
 // 党籍保留附件-获取文件OSS ID
@@ -3181,6 +3707,10 @@ const getFileOssIdParty = (file: any) => {
   return file.ossId || '';
 };
 
+const getPartyRetentionPreviewSrc = (file: any) => {
+  return file.ossId || file.url || '';
+};
+
 // 党籍保留附件-获取文件扩展名
 const getFileExtParty = (fileName: string) => {
   const ext = fileName.split('.').pop()?.toUpperCase();
@@ -3322,6 +3852,71 @@ const loadAttachmentList = async (applicationId: number | string) => {
   }
 };
 
+// 🔴 新增：加载编辑弹窗中的申请附件列表（从attachmentIds中解析多个附件）
+const loadApplicationAttachmentList = async (attachmentIds: string | null | undefined) => {
+  console.log('🔍 [编辑弹窗附件] 开始加载附件列表，attachmentIds:', attachmentIds);
+  try {
+    // 检查是否有附件ID
+    if (!attachmentIds || !attachmentIds.toString().trim()) {
+      console.log('⚠️ [编辑弹窗附件] 该申请暂无附件数据');
+      applicationAttachmentList.value = [];
+      return;
+    }
+
+    // 解析OSS ID列表（支持逗号分隔的多个ID）
+    const ossIdsArray = attachmentIds
+      .toString()
+      .split(',')
+      .map((id) => id.trim())
+      .filter((id) => id);
+
+    if (ossIdsArray.length === 0) {
+      console.warn('⚠️ [编辑弹窗附件] OSS ID列表为空');
+      applicationAttachmentList.value = [];
+      return;
+    }
+
+    console.log('📋 [编辑弹窗附件] OSS ID列表:', ossIdsArray, '共', ossIdsArray.length, '个附件');
+
+    // 调用OSS接口获取文件信息
+    const response = await request({
+      url: `/resource/oss/listByIds/${ossIdsArray.join(',')}`,
+      method: 'get'
+    });
+
+    if (response.code === 200 && response.data) {
+      console.log('✅ [编辑弹窗附件] 获取OSS文件信息成功:', response.data);
+
+      // 转换数据格式
+      const attachmentFiles = response.data.map((item: any, index: number) => ({
+        uid: `application_attachment_${index}_${Date.now()}`,
+        name: item.originalName || `附件${index + 1}`,
+        url: item.url,
+        ossId: item.ossId,
+        status: 'success',
+        fileSize: item.fileSize || 0,
+        uploadTime: item.createTime,
+        response: {
+          code: 200,
+          data: {
+            url: item.url,
+            ossId: item.ossId
+          }
+        }
+      }));
+
+      applicationAttachmentList.value = attachmentFiles;
+      console.log('✨ [编辑弹窗附件] 附件数据处理完成，共', attachmentFiles.length, '个附件');
+    } else {
+      console.warn('⚠️ [编辑弹窗附件] OSS接口返回数据为空');
+      applicationAttachmentList.value = [];
+    }
+  } catch (error: any) {
+    console.error('❌ [编辑弹窗附件] 加载附件列表失败:', error);
+    applicationAttachmentList.value = [];
+  }
+};
+
 // 查询详情的附件列表（参考培训申请模式 - 从OSS接口获取）
 const loadViewAttachmentList = async (attachmentIds: string | null | undefined) => {
   console.log('🔍 [申请附件] 开始加载附件列表，attachmentIds:', attachmentIds);
@@ -3402,87 +3997,6 @@ const loadViewAttachmentList = async (attachmentIds: string | null | undefined)
   }
 };
 
-// 加载编辑表单的附件列表（用于编辑/重新提交时显示已上传的附件）
-const loadApplicationAttachmentList = async (attachmentIds: string | null | undefined) => {
-  console.log('🔍 [编辑附件] 开始加载附件列表，attachmentIds:', attachmentIds);
-  try {
-    // 清空现有列表
-    applicationAttachmentFileList.value = [];
-
-    // 检查是否有附件ID
-    if (!attachmentIds || !attachmentIds.toString().trim()) {
-      console.log('⚠️ [编辑附件] 该申请暂无附件数据');
-      return;
-    }
-
-    // 解析OSS ID列表
-    const ossIdsArray = attachmentIds
-      .toString()
-      .split(',')
-      .map((id) => id.trim())
-      .filter((id) => id);
-
-    if (ossIdsArray.length === 0) {
-      console.warn('⚠️ [编辑附件] OSS ID列表为空');
-      return;
-    }
-
-    console.log('📋 [编辑附件] OSS ID列表:', ossIdsArray);
-
-    // 调用OSS接口获取文件信息
-    const response = await request({
-      url: `/resource/oss/listByIds/${ossIdsArray.join(',')}`,
-      method: 'get'
-    });
-
-    if (response.code === 200 && response.data) {
-      console.log('✅ [编辑附件] 获取OSS文件信息成功:', response.data);
-
-      // 转换数据格式到 el-upload 需要的格式
-      const attachmentFiles = response.data.map((item: any, index: number) => ({
-        uid: `edit_attachment_${index}_${Date.now()}`,
-        name: item.originalName || `附件${index + 1}`,
-        url: item.url,
-        ossId: item.ossId,
-        status: 'success', // 标记为上传成功
-        fileSize: item.fileSize || 0,
-        uploadTime: item.createTime,
-        response: {
-          code: 200,
-          data: {
-            url: item.url,
-            ossId: item.ossId
-          }
-        }
-      }));
-
-      applicationAttachmentFileList.value = attachmentFiles;
-      console.log('✨ [编辑附件] 附件数据处理完成，共', attachmentFiles.length, '个附件');
-      
-      // 更新表单的 attachmentIds 字段
-      updateApplicationFormAttachmentIds();
-    } else {
-      console.warn('⚠️ [编辑附件] OSS接口返回数据为空');
-    }
-  } catch (error: any) {
-    console.error('❌ [编辑附件] 加载附件列表失败:', error);
-    console.error('📋 [编辑附件] 错误详情:', {
-      message: error.message,
-      response: error.response,
-      status: error.response?.status,
-      data: error.response?.data
-    });
-
-    // 根据错误类型给出提示
-    if (error.response?.status === 403) {
-      console.error('🔒 [编辑附件] 权限不足！请检查是否有 resource:oss:list 权限');
-      ElMessage.warning('您没有查询附件的权限，请联系管理员');
-    } else if (error.response?.status === 404) {
-      console.error('🔍 [编辑附件] OSS接口不存在！请检查后端服务是否正常');
-    }
-  }
-};
-
 // 打开添加附件对话框
 const handleAddAttachment = () => {
   if (!state.applicationForm.applicationId) {
@@ -3579,23 +4093,48 @@ const handleDeleteAttachment = async (row: OverseasAttachmentVO) => {
   }
 };
 
-// 下载附件（从详情页）
-// 下载附件（兼容转换后的数据格式）
-const handleDownloadAttachment = (row: any) => {
+// 下载附件（从详情页）- 使用 OSS ID 安全下载
+const handleDownloadAttachment = async (row: any) => {
+  console.log('📥 下载附件:', row.name || row.fileOriginalName);
+
+  // 检查是否有 OSS ID
+  if (!row.ossId) {
+    ElMessage.warning('文件OSS ID不存在，无法下载');
+    console.error('❌ 附件信息:', row);
+    return;
+  }
+
   try {
-    // 直接通过链接下载
+    // 使用 OSS API 下载，自动包含认证头
+    const response = await request({
+      url: `/resource/oss/download/${row.ossId}`,
+      method: 'get',
+      responseType: 'blob'
+    });
+
+    // 创建 blob 并触发下载
+    const fileName = row.name || row.fileOriginalName || '附件';
+    const fileExt = fileName.split('.').pop()?.toLowerCase();
+    const mimeType = fileExt === 'pdf' ? 'application/pdf' : 'application/octet-stream';
+
+    const blob = response instanceof Blob ? new Blob([response], { type: mimeType }) : new Blob([response.data], { type: mimeType });
+    const url = window.URL.createObjectURL(blob);
+
     const link = document.createElement('a');
-    link.href = row.url || row.filePath;  // 兼容新旧格式
-    link.download = row.name || row.fileOriginalName;  // 兼容新旧格式
-    link.target = '_blank';
+    link.href = url;
+    link.download = fileName;
     document.body.appendChild(link);
     link.click();
+
+    // 清理资源
     document.body.removeChild(link);
-    
-    console.log('📥 下载附件成功:', row.name || row.fileOriginalName);
+    window.URL.revokeObjectURL(url);
+
+    ElMessage.success('文件下载成功');
+    console.log('✅ 下载附件成功:', fileName);
   } catch (error) {
     console.error('❌ 下载附件失败:', error);
-    ElMessage.error('下载附件失败，请稍后重试');
+    ElMessage.error('下载文件失败，请检查文件权限或稍后重试');
   }
 };
 
@@ -3826,124 +4365,6 @@ const handleDownloadPartyRetentionFile = async (data: OverseasApplicationVO) =>
     ElMessage.error('下载失败，请稍后重试');
   }
 };
-
-// ==================== 申请附件上传相关方法（新增 - 参考培训申请模式） ====================
-
-/** 申请附件上传前检查 */
-function beforeApplicationAttachmentUpload(file: File) {
-  const isValidType = [
-    'application/pdf',
-    'application/msword',
-    'application/vnd.openxmlformats-officedocument.wordprocessingml.document',
-    'application/vnd.ms-excel',
-    'application/vnd.openxmlformats-officedocument.spreadsheetml.sheet',
-    'image/jpeg',
-    'image/png'
-  ].includes(file.type);
-  const isLt20M = file.size / 1024 / 1024 < 20;
-
-  if (!isValidType) {
-    proxy?.$modal.msgError('上传附件文件只能是PDF/Word/Excel/图片格式!');
-    return false;
-  }
-
-  if (!isLt20M) {
-    proxy?.$modal.msgError('上传附件文件大小不能超过20MB!');
-    return false;
-  }
-
-  return true;
-}
-
-/** 申请附件上传成功处理 */
-function handleApplicationAttachmentSuccess(response: any, file: any) {
-  if (response.code === 200 && response.data) {
-    file.url = response.data.url;
-    file.ossId = response.data.ossId;
-
-    proxy?.$modal.msgSuccess('附件上传成功!');
-    console.log('✅ [申请附件] 上传成功:', response.data);
-
-    // 更新文件状态为成功
-    file.status = 'success';
-    file.response = response;
-
-    // 更新 applicationForm 中的 attachmentIds 字段
-    updateApplicationFormAttachmentIds();
-  }
-}
-
-/** 申请附件上传失败处理 */
-function handleApplicationAttachmentError(error: any) {
-  console.error('❌ [申请附件] 上传失败:', error);
-  let errorMessage = '附件上传失败，请重试!';
-
-  // 尝试从错误响应中获取具体错误信息
-  if (error && error.response && error.response.data) {
-    if (error.response.data.msg) {
-      errorMessage = error.response.data.msg;
-    } else if (error.response.data.message) {
-      errorMessage = error.response.data.message;
-    }
-  }
-
-  proxy?.$modal.msgError(errorMessage);
-}
-
-/** 更新 applicationForm 中的 attachmentIds 字段 */
-function updateApplicationFormAttachmentIds() {
-  // 提取所有成功上传的 ossId
-  const attachmentOssIds = applicationAttachmentFileList.value
-    .filter((file) => file.status === 'success' && file.ossId)
-    .map((file) => file.ossId);
-
-  // 更新 applicationForm 的 attachmentIds 字段（逗号分隔）
-  (state.applicationForm as any).attachmentIds = attachmentOssIds.join(',');
-
-  console.log('📋 [申请附件] 更新 attachmentIds:', attachmentOssIds);
-  console.log('📋 [申请附件] applicationForm.attachmentIds:', (state.applicationForm as any).attachmentIds);
-}
-
-/** 移除申请附件 */
-/** 预览申请附件 */
-function handlePreviewApplicationAttachment(file: any) {
-  console.log('👁️ [申请附件] 预览附件:', file);
-  if (file.url) {
-    window.open(file.url, '_blank');
-  } else {
-    proxy?.$modal.msgWarning('该附件暂无预览地址');
-  }
-}
-
-/** 下载申请附件 */
-function handleDownloadApplicationAttachment(file: any) {
-  console.log('⬇️ [申请附件] 下载附件:', file);
-  if (file.url) {
-    const link = document.createElement('a');
-    link.href = file.url;
-    link.download = file.name;
-    link.click();
-  } else {
-    proxy?.$modal.msgWarning('该附件暂无下载地址');
-  }
-}
-
-/** 确认移除申请附件 */
-function confirmRemoveApplicationAttachment(file: any, fileList: any[]) {
-  proxy?.$modal
-    .confirm('确定要移除附件【' + file.name + '】吗？')
-    .then(() => {
-      handleRemoveApplicationAttachment(file);
-      proxy?.$modal.msgSuccess('附件移除成功');
-    })
-    .catch(() => {});
-}
-
-function handleRemoveApplicationAttachment(file: any) {
-  console.log('🗑️ [申请附件] 移除附件:', file.name);
-  // 更新 attachmentIds
-  updateApplicationFormAttachmentIds();
-}
 </script>
 
 <style scoped>
@@ -4007,8 +4428,9 @@ function handleRemoveApplicationAttachment(file: any) {
 .signature-container {
   display: flex;
   flex-direction: column;
-  align-items: center;
+  align-items: stretch;
   gap: 8px;
+  width: 100%;
 }
 
 .signature-canvas {
@@ -4017,6 +4439,8 @@ function handleRemoveApplicationAttachment(file: any) {
   cursor: crosshair;
   background-color: #ffffff;
   display: block;
+  width: 100%;
+  height: 120px;
 }
 
 .signature-canvas:hover {
@@ -4028,6 +4452,134 @@ function handleRemoveApplicationAttachment(file: any) {
   gap: 8px;
 }
 
+.signature-preview {
+  width: 100%;
+  max-height: 200px;
+  border: 1px solid #ebeef5;
+  border-radius: 6px;
+  background: #fff;
+  display: flex;
+  align-items: center;
+  justify-content: center;
+  padding: 12px;
+}
+
+.signature-preview img {
+  max-width: 100%;
+  max-height: 180px;
+}
+
+.attachment-title-primary {
+  margin-bottom: 15px;
+  padding: 10px;
+  border-left: 4px solid #409eff;
+  background-color: #f5f7fa;
+}
+
+.attachment-title-success {
+  margin-bottom: 15px;
+  padding: 10px;
+  border-left: 4px solid #67c23a;
+  background-color: #f0f9ff;
+}
+
+.attachment-view-grid {
+  display: grid;
+  grid-template-columns: repeat(auto-fill, minmax(200px, 1fr));
+  gap: 12px;
+}
+
+.attachment-card {
+  border: 1px solid #ebeef5;
+  border-radius: 6px;
+  background: #fff;
+  padding: 10px;
+  display: flex;
+  flex-direction: column;
+  gap: 8px;
+}
+
+.attachment-card.single-card {
+  max-width: 260px;
+}
+
+.upload-file-meta {
+  font-size: 12px;
+  color: #909399;
+}
+
+.attachment-actions {
+  display: flex;
+  gap: 8px;
+}
+
+.view-form {
+  margin-top: 10px;
+}
+
+.view-form :deep(.el-form-item) {
+  align-items: center;
+}
+
+.view-form :deep(.el-form-item__label) {
+  color: #909399;
+  font-weight: 600;
+  padding-right: 4px;
+}
+
+.view-form :deep(.el-form-item__label)::after {
+  content: '：';
+}
+
+.view-form :deep(.nowrap-label) {
+  white-space: nowrap;
+}
+
+.view-section {
+  margin-bottom: 16px;
+  padding: 16px 20px 4px;
+  border: 1px solid #ebeef5;
+  border-radius: 8px;
+  background: #fff;
+  box-shadow: 0 1px 3px rgba(0, 0, 0, 0.02);
+}
+
+.view-section-title {
+  font-size: 15px;
+  font-weight: 600;
+  color: #303133;
+  margin-bottom: 12px;
+  display: flex;
+  align-items: center;
+}
+
+.view-section-title::before {
+  content: '';
+  width: 4px;
+  height: 14px;
+  background: #409eff;
+  border-radius: 2px;
+  margin-right: 8px;
+}
+
+.view-form .form-value {
+  display: inline-block;
+  min-height: 32px;
+  line-height: 32px;
+  color: #1f2d3d;
+  font-weight: 500;
+}
+
+.view-form .form-value.multiline {
+  line-height: 1.6;
+  white-space: pre-wrap;
+  padding-top: 4px;
+}
+
+.view-form :deep(.multiline-item) {
+  align-items: flex-start;
+}
+
 /* ========== 上传附件样式（参考学生请假） ========== */
 .attachment-upload-container {
   width: 100%;
@@ -4064,7 +4616,7 @@ function handleRemoveApplicationAttachment(file: any) {
   padding: 10px 15px;
   min-height: 50px;
   background: #fafafa;
-  border: 1px dashed #d9d9d9;
+  border: 0 !important;
   border-radius: 4px;
   transition: all 0.3s;
 }
@@ -4091,6 +4643,17 @@ function handleRemoveApplicationAttachment(file: any) {
   font-style: normal;
 }
 
+.form-label-multiline {
+  display: inline-block;
+  line-height: 18px;
+  white-space: normal;
+}
+
+:deep(.el-upload-dragger) {
+  padding: 0 !important;
+  border: 0 !important;
+}
+
 /* 自定义文件卡片样式 */
 .upload-file-card {
   width: 100%;
@@ -4204,9 +4767,15 @@ function handleRemoveApplicationAttachment(file: any) {
 
 .upload-file-card-actions .el-button-group {
   width: 100%;
+  display: flex;
+  justify-content: center;
 }
 
 .upload-file-card-actions .el-button {
   flex: 1;
 }
+
+:global(.app-container) {
+  padding: 0 !important;
+}
 </style>
diff --git a/web/src/views/rs/overseas/itinerary-change-approval.vue b/web/src/views/rs/overseas/itinerary-change-approval.vue
index a39dc44b..b2bcf37f 100644
--- a/web/src/views/rs/overseas/itinerary-change-approval.vue
+++ b/web/src/views/rs/overseas/itinerary-change-approval.vue
@@ -1,30 +1,6 @@
 <template>
   <div class="app-container">
     <el-card class="box-card">
-      <!-- 🔴 标准化改造：提示用户使用标准工作流页面 -->
-      <el-alert
-        title="功能迁移通知"
-        type="info"
-        description="出国行程变更审批功能已标准化，请使用系统统一的工作流页面查看和处理任务"
-        show-icon
-        :closable="false"
-        class="mb-4"
-      >
-        <template #default>
-          <div class="mt-2">
-            <p><strong>推荐操作：</strong></p>
-            <ul class="ml-4">
-              <li>访问 <strong>工作流 > 我的任务 > 待办任务</strong> 页面</li>
-              <li>在统一的待办列表中查看"出国行程变更审批"任务</li>
-              <li>使用工作流的筛选功能按业务类型查看</li>
-            </ul>
-            <div class="mt-3">
-              <el-button type="primary" @click="navigateToTaskWaiting"> 前往待办任务页面 </el-button>
-            </div>
-          </div>
-        </template>
-      </el-alert>
-
       <!-- 审批管理选项卡 -->
       <el-tabs v-model="activeTab" type="border-card" @tab-click="handleTabClick">
         <!-- 待审批 -->
@@ -69,13 +45,8 @@
                 </el-row>
               </template>
 
-              <!-- 🔴 标准化改造：显示迁移提示 -->
-              <el-empty description="请使用标准工作流待办页面查看审批任务" :image-size="120">
-                <el-button type="primary" @click="navigateToTaskWaiting">前往待办页面</el-button>
-              </el-empty>
-
-              <!-- 保留原表格结构用于兼容（隐藏显示） -->
-              <el-table v-loading="pendingLoading" border :data="pendingList" @row-dblclick="handleView" style="display: none">
+              <!-- 待审批变更列表 -->
+              <el-table v-loading="pendingLoading" border :data="pendingList" @row-dblclick="handleView">
                 <el-table-column type="selection" width="55" align="center" />
                 <el-table-column label="申请人" align="center" prop="applicantName" min-width="100" />
                 <el-table-column label="部门" align="center" prop="department" min-width="120" />
@@ -190,7 +161,7 @@
                   </template>
                 </el-table-column>
                 <el-table-column label="审批时间" align="center" prop="approvalTime" min-width="160" />
-                <el-table-column label="审批人" align="center" prop="approvalByName" min-width="100" />
+                <el-table-column label="审批人" align="center" prop="approverName" min-width="100" show-overflow-tooltip />
                 <el-table-column label="操作" align="center" width="80" fixed="right">
                   <template #default="scope">
                     <el-tooltip content="查看详情" placement="top">
@@ -243,7 +214,7 @@
           <el-tag :type="getStatusTagType(viewData.status)">{{ viewData.statusText }}</el-tag>
         </el-descriptions-item>
         <el-descriptions-item label="申请时间">{{ viewData.createTime || '-' }}</el-descriptions-item>
-        <el-descriptions-item label="审批人" v-if="viewData.approvalByName">{{ viewData.approvalByName }}</el-descriptions-item>
+        <el-descriptions-item label="审批人" v-if="viewData.approverName">{{ viewData.approverName }}</el-descriptions-item>
         <el-descriptions-item label="审批时间" v-if="viewData.approvalTime">{{ viewData.approvalTime }}</el-descriptions-item>
         <el-descriptions-item label="审批意见" :span="2" v-if="viewData.approvalOpinion">{{ viewData.approvalOpinion }}</el-descriptions-item>
       </el-descriptions>
@@ -267,16 +238,10 @@
         <el-form-item label="审批意见" prop="opinion">
           <el-input v-model="approvalForm.opinion" type="textarea" :rows="4" placeholder="请输入审批意见" maxlength="500" show-word-limit />
         </el-form-item>
-        
+
         <!-- 手写签字 -->
         <el-form-item label="审批签字">
-          <SignaturePad 
-            v-model="approvalForm.signature" 
-            :width="450" 
-            :height="120"
-            :auto-save="true"
-            :show-save-button="false"
-          />
+          <SignaturePad v-model="approvalForm.signature" :width="450" :height="120" :auto-save="true" :show-save-button="false" />
           <div class="signature-tip">请在上方签字板中手写签名</div>
         </el-form-item>
       </el-form>
@@ -413,17 +378,24 @@ const handleTabClick = (tab: any) => {
   }
 };
 
-// 🔴 标准化改造：简化待审批列表获取（仅用于兼容模式）
+// 获取待审批变更列表（status=0）
 const getPendingList = async () => {
   state.pendingLoading = true;
-
-  // 提示用户使用标准工作流页面
-  ElMessage.info('请使用标准工作流待办页面查看审批任务');
-
-  // 清空数据，不再调用自定义API
-  state.pendingList = [];
-  state.pendingTotal = 0;
-  state.pendingLoading = false;
+  try {
+    // 查询待审核状态的变更申请（status='0'）
+    const params = { ...state.pendingQueryParams };
+    params.status = '0'; // 只查询待审核的
+    const response = await listPendingItineraryChange(params);
+    state.pendingList = response.rows || [];
+    state.pendingTotal = response.total || 0;
+  } catch (error) {
+    console.error('获取待审批列表失败:', error);
+    ElMessage.error('获取待审批列表失败');
+    state.pendingList = [];
+    state.pendingTotal = 0;
+  } finally {
+    state.pendingLoading = false;
+  }
 };
 
 // 查询审批记录列表
@@ -446,20 +418,22 @@ const getRecordList = async () => {
   }
 };
 
-// 🔴 标准化改造：导航到标准工作流待办页面
-const navigateToTaskWaiting = () => {
-  // 跳转到标准工作流待办页面
-  router.push('/workflow/task/taskWaiting');
-};
-
 // 搜索查询 - 待审批列表
 const handlePendingQuery = () => {
-  ElMessage.info('请使用标准工作流待办页面查看审批任务');
+  state.pendingQueryParams.pageNum = 1;
+  getPendingList();
 };
 
 // 重置搜索 - 待审批列表
 const resetPendingQuery = () => {
-  ElMessage.info('请使用标准工作流待办页面查看审批任务');
+  pendingQueryFormRef.value?.resetFields();
+  Object.assign(state.pendingQueryParams, {
+    pageNum: 1,
+    pageSize: 10,
+    applicantName: '',
+    destination: ''
+  });
+  getPendingList();
 };
 
 // 搜索查询 - 审批记录
@@ -574,4 +548,7 @@ const getStatusTagType = (status: string): 'primary' | 'success' | 'info' | 'war
   color: #909399;
   text-align: center;
 }
+:global(.app-container) {
+  padding: 0 !important;
+}
 </style>
diff --git a/web/src/views/rs/overseas/itinerary-change.vue b/web/src/views/rs/overseas/itinerary-change.vue
index efef1824..b4a42385 100644
--- a/web/src/views/rs/overseas/itinerary-change.vue
+++ b/web/src/views/rs/overseas/itinerary-change.vue
@@ -3,7 +3,6 @@
     <el-card class="box-card">
       <!-- Tab切换：变更申请 / 变更记录 -->
       <el-tabs v-model="activeTab" type="border-card" @tab-click="handleTabClick">
-        
         <!-- Tab 1: 变更申请（待审核） -->
         <el-tab-pane label="变更申请（待审核）" name="all">
           <div class="tab-content">
@@ -23,15 +22,6 @@
                           <el-input v-model="queryParams.destination" placeholder="请输入目的地国家" clearable />
                         </el-form-item>
                       </el-col>
-                      <el-col :span="6">
-                        <el-form-item label="变更状态" prop="status">
-                          <el-select v-model="queryParams.status" placeholder="请选择变更状态" clearable style="width: 100%">
-                            <el-option label="待审核" value="0" />
-                            <el-option label="已通过" value="1" />
-                            <el-option label="已拒绝" value="2" />
-                          </el-select>
-                        </el-form-item>
-                      </el-col>
                     </el-row>
 
                     <el-row>
@@ -52,9 +42,7 @@
               <template #header>
                 <el-row :gutter="10" class="mb8">
                   <el-col :span="1.5">
-                    <el-button type="primary" plain icon="Plus" @click="handleAdd" v-hasPermi="['rs:itineraryChange:add']">
-                      新增变更申请
-                    </el-button>
+                    <el-button type="primary" plain icon="Plus" @click="handleAdd" v-hasPermi="['rs:itineraryChange:add']"> 新增变更申请 </el-button>
                   </el-col>
                   <right-toolbar v-model:showSearch="showSearch" @queryTable="getList"></right-toolbar>
                 </el-row>
@@ -62,45 +50,65 @@
 
               <!-- 变更行程列表 -->
               <el-table v-loading="loading" border :data="changeList" @row-dblclick="handleView">
-          <el-table-column type="selection" width="55" align="center" />
-          <el-table-column label="申请人" align="center" prop="applicantName" min-width="100" />
-          <el-table-column label="原目的地" align="center" prop="originalDestination" min-width="120" />
-          <el-table-column label="新目的地" align="center" prop="newDestination" min-width="120" />
-          <el-table-column label="原出国时间" align="center" min-width="200">
-            <template #default="scope">
-              {{ formatDate(scope.row.originalStartDate) }} 至 {{ formatDate(scope.row.originalEndDate) }}
-            </template>
-          </el-table-column>
-          <el-table-column label="新出国时间" align="center" min-width="200">
-            <template #default="scope">
-              {{ formatDate(scope.row.newStartDate) }} 至 {{ formatDate(scope.row.newEndDate) }}
-            </template>
-          </el-table-column>
-          <el-table-column label="变更状态" align="center" prop="statusText" min-width="100">
-            <template #default="scope">
-              <el-tag :type="getStatusTagType(scope.row.status)">{{ scope.row.statusText }}</el-tag>
-            </template>
-          </el-table-column>
-          <el-table-column label="申请时间" align="center" prop="createTime" min-width="160" />
+                <el-table-column type="selection" width="55" align="center" />
+                <el-table-column label="申请人" align="center" prop="applicantName" min-width="100" />
+                <el-table-column label="原目的地" align="center" prop="originalDestination" min-width="120" />
+                <el-table-column label="新目的地" align="center" prop="newDestination" min-width="120" />
+                <el-table-column label="原出国时间" align="center" min-width="200">
+                  <template #default="scope"> {{ formatDate(scope.row.originalStartDate) }} 至 {{ formatDate(scope.row.originalEndDate) }} </template>
+                </el-table-column>
+                <el-table-column label="新出国时间" align="center" min-width="200">
+                  <template #default="scope"> {{ formatDate(scope.row.newStartDate) }} 至 {{ formatDate(scope.row.newEndDate) }} </template>
+                </el-table-column>
+                <el-table-column label="变更状态" align="center" prop="statusText" min-width="100">
+                  <template #default="scope">
+                    <el-tag :type="getStatusTagType(scope.row.status)">{{ scope.row.statusText }}</el-tag>
+                  </template>
+                </el-table-column>
+                <el-table-column label="申请时间" align="center" prop="createTime" min-width="160" />
                 <el-table-column label="操作" align="center" width="250" fixed="right">
                   <template #default="scope">
                     <el-tooltip content="查看详情" placement="top">
                       <el-button link type="primary" icon="View" @click="handleView(scope.row)" v-hasPermi="['rs:itineraryChange:query']"></el-button>
                     </el-tooltip>
                     <el-tooltip content="变更历史" placement="top">
-                      <el-button link type="info" icon="List" @click="handleViewHistory(scope.row)" v-hasPermi="['rs:itineraryChange:query']"></el-button>
+                      <el-button
+                        link
+                        type="info"
+                        icon="List"
+                        @click="handleViewHistory(scope.row)"
+                        v-hasPermi="['rs:itineraryChange:query']"
+                      ></el-button>
                     </el-tooltip>
                     <!-- 待审核状态：显示撤回按钮 -->
                     <el-tooltip content="撤回申请" placement="top" v-if="scope.row.status === '0'">
-                      <el-button link type="warning" icon="RefreshLeft" @click="handleCancel(scope.row)" v-hasPermi="['rs:itineraryChange:cancel']"></el-button>
+                      <el-button
+                        link
+                        type="warning"
+                        icon="RefreshLeft"
+                        @click="handleCancel(scope.row)"
+                        v-hasPermi="['rs:itineraryChange:cancel']"
+                      ></el-button>
                     </el-tooltip>
-                    <!-- 已拒绝状态：显示重新提交按钮 -->
-                    <el-tooltip content="重新提交" placement="top" v-if="scope.row.status === '2'">
-                      <el-button link type="success" icon="RefreshRight" @click="handleResubmit(scope.row)" v-hasPermi="['rs:itineraryChange:edit']"></el-button>
+                    <!-- 已拒绝或已撤回状态：显示重新提交按钮 -->
+                    <el-tooltip content="重新提交" placement="top" v-if="scope.row.status === '2' || scope.row.status === '3'">
+                      <el-button
+                        link
+                        type="success"
+                        icon="RefreshRight"
+                        @click="handleResubmit(scope.row)"
+                        v-hasPermi="['rs:itineraryChange:edit']"
+                      ></el-button>
                     </el-tooltip>
                     <!-- 删除按钮 -->
                     <el-tooltip content="删除" placement="top" v-if="scope.row.status !== '1'">
-                      <el-button link type="danger" icon="Delete" @click="handleDelete(scope.row)" v-hasPermi="['rs:itineraryChange:remove']"></el-button>
+                      <el-button
+                        link
+                        type="danger"
+                        icon="Delete"
+                        @click="handleDelete(scope.row)"
+                        v-hasPermi="['rs:itineraryChange:remove']"
+                      ></el-button>
                     </el-tooltip>
                   </template>
                 </el-table-column>
@@ -131,15 +139,6 @@
                           <el-input v-model="myQueryParams.destination" placeholder="请输入目的地国家" clearable />
                         </el-form-item>
                       </el-col>
-                      <el-col :span="6">
-                        <el-form-item label="变更状态" prop="status">
-                          <el-select v-model="myQueryParams.status" placeholder="请选择变更状态" clearable style="width: 100%">
-                            <el-option label="待审核" value="0" />
-                            <el-option label="已通过" value="1" />
-                            <el-option label="已拒绝" value="2" />
-                          </el-select>
-                        </el-form-item>
-                      </el-col>
                     </el-row>
 
                     <el-row>
@@ -169,14 +168,10 @@
                 <el-table-column label="原目的地" align="center" prop="originalDestination" min-width="120" />
                 <el-table-column label="新目的地" align="center" prop="newDestination" min-width="120" />
                 <el-table-column label="原出国时间" align="center" min-width="200">
-                  <template #default="scope">
-                    {{ formatDate(scope.row.originalStartDate) }} 至 {{ formatDate(scope.row.originalEndDate) }}
-                  </template>
+                  <template #default="scope"> {{ formatDate(scope.row.originalStartDate) }} 至 {{ formatDate(scope.row.originalEndDate) }} </template>
                 </el-table-column>
                 <el-table-column label="新出国时间" align="center" min-width="200">
-                  <template #default="scope">
-                    {{ formatDate(scope.row.newStartDate) }} 至 {{ formatDate(scope.row.newEndDate) }}
-                  </template>
+                  <template #default="scope"> {{ formatDate(scope.row.newStartDate) }} 至 {{ formatDate(scope.row.newEndDate) }} </template>
                 </el-table-column>
                 <el-table-column label="变更状态" align="center" prop="statusText" min-width="100">
                   <template #default="scope">
@@ -190,19 +185,43 @@
                       <el-button link type="primary" icon="View" @click="handleView(scope.row)" v-hasPermi="['rs:itineraryChange:query']"></el-button>
                     </el-tooltip>
                     <el-tooltip content="变更历史" placement="top">
-                      <el-button link type="info" icon="List" @click="handleViewHistory(scope.row)" v-hasPermi="['rs:itineraryChange:query']"></el-button>
+                      <el-button
+                        link
+                        type="info"
+                        icon="List"
+                        @click="handleViewHistory(scope.row)"
+                        v-hasPermi="['rs:itineraryChange:query']"
+                      ></el-button>
                     </el-tooltip>
                     <!-- 待审核状态：显示撤回按钮 -->
                     <el-tooltip content="撤回申请" placement="top" v-if="scope.row.status === '0'">
-                      <el-button link type="warning" icon="RefreshLeft" @click="handleCancel(scope.row)" v-hasPermi="['rs:itineraryChange:cancel']"></el-button>
+                      <el-button
+                        link
+                        type="warning"
+                        icon="RefreshLeft"
+                        @click="handleCancel(scope.row)"
+                        v-hasPermi="['rs:itineraryChange:cancel']"
+                      ></el-button>
                     </el-tooltip>
-                    <!-- 已拒绝状态：显示重新提交按钮 -->
-                    <el-tooltip content="重新提交" placement="top" v-if="scope.row.status === '2'">
-                      <el-button link type="success" icon="RefreshRight" @click="handleResubmit(scope.row)" v-hasPermi="['rs:itineraryChange:edit']"></el-button>
+                    <!-- 已拒绝或已撤回状态：显示重新提交按钮 -->
+                    <el-tooltip content="重新提交" placement="top" v-if="scope.row.status === '2' || scope.row.status === '3'">
+                      <el-button
+                        link
+                        type="success"
+                        icon="RefreshRight"
+                        @click="handleResubmit(scope.row)"
+                        v-hasPermi="['rs:itineraryChange:edit']"
+                      ></el-button>
                     </el-tooltip>
                     <!-- 删除按钮 -->
                     <el-tooltip content="删除" placement="top" v-if="scope.row.status !== '1'">
-                      <el-button link type="danger" icon="Delete" @click="handleDelete(scope.row)" v-hasPermi="['rs:itineraryChange:remove']"></el-button>
+                      <el-button
+                        link
+                        type="danger"
+                        icon="Delete"
+                        @click="handleDelete(scope.row)"
+                        v-hasPermi="['rs:itineraryChange:remove']"
+                      ></el-button>
                     </el-tooltip>
                   </template>
                 </el-table-column>
@@ -223,24 +242,23 @@
 
     <!-- 新增/编辑对话框 -->
     <el-dialog :title="dialog.title" v-model="dialog.visible" width="900px" append-to-body :close-on-click-modal="false" destroy-on-close>
-      <div style="max-height: 70vh; overflow-y: auto; padding-right: 10px;">
+      <div style="max-height: 70vh; overflow-y: auto; padding-right: 10px">
         <el-form ref="formRef" :model="form" :rules="rules" label-width="140px">
-          
           <!-- 选择原出国申请 -->
           <el-row :gutter="20">
             <el-col :span="24">
               <el-form-item label="选择原出国申请" prop="applicationId">
-                <el-select 
-                  v-model="form.applicationId" 
-                  placeholder="请选择已审批通过的出国申请" 
+                <el-select
+                  v-model="form.applicationId"
+                  placeholder="请选择已审批通过的出国申请"
                   style="width: 100%"
                   @change="handleApplicationChange"
                   :disabled="!!form.changeId"
                   filterable
                 >
-                  <el-option 
-                    v-for="application in availableApplicationList" 
-                    :key="application.applicationId" 
+                  <el-option
+                    v-for="application in availableApplicationList"
+                    :key="application.applicationId"
                     :label="`${application.applicantName} - ${application.destination} (${formatDate(application.startDate)}至${formatDate(application.endDate)})`"
                     :value="application.applicationId"
                   />
@@ -336,13 +354,7 @@
           <el-row :gutter="20">
             <el-col :span="24">
               <el-form-item label="行程安排">
-                <el-input
-                  v-model="form.originalItinerary"
-                  type="textarea"
-                  :rows="3"
-                  disabled
-                  placeholder="原行程安排"
-                />
+                <el-input v-model="form.originalItinerary" type="textarea" :rows="3" disabled placeholder="原行程安排" />
               </el-form-item>
             </el-col>
           </el-row>
@@ -384,14 +396,7 @@
           <el-row :gutter="20">
             <el-col :span="24">
               <el-form-item label="行程安排" prop="newItinerary">
-                <el-input
-                  v-model="form.newItinerary"
-                  type="textarea"
-                  :rows="3"
-                  placeholder="请输入实际行程安排"
-                  maxlength="1000"
-                  show-word-limit
-                />
+                <el-input v-model="form.newItinerary" type="textarea" :rows="3" placeholder="请输入实际行程安排" maxlength="1000" show-word-limit />
               </el-form-item>
             </el-col>
           </el-row>
@@ -401,10 +406,10 @@
           <el-row :gutter="20">
             <el-col :span="24">
               <el-form-item prop="changeReason">
-                <el-input 
-                  v-model="form.changeReason" 
-                  type="textarea" 
-                  :rows="4" 
+                <el-input
+                  v-model="form.changeReason"
+                  type="textarea"
+                  :rows="4"
                   placeholder="请详细说明行程变更的原因（相关证明材料可附后）"
                   maxlength="500"
                   show-word-limit
@@ -418,21 +423,13 @@
           <el-row :gutter="20">
             <el-col :span="24">
               <el-form-item>
-                <el-input 
-                  v-model="form.remark" 
-                  type="textarea" 
-                  :rows="3" 
-                  placeholder="请填写有关认识和态度"
-                  maxlength="200"
-                  show-word-limit
-                />
-                <div style="margin-top: 12px; color: #303133; font-size: 14px; font-weight: bold;">
+                <el-input v-model="form.remark" type="textarea" :rows="3" placeholder="请填写有关认识和态度" maxlength="200" show-word-limit />
+                <div style="margin-top: 12px; color: #303133; font-size: 14px; font-weight: bold">
                   我承诺，以上情况说明完全属实。如有不实行为，愿意接受组织处理。
                 </div>
               </el-form-item>
             </el-col>
           </el-row>
-
         </el-form>
       </div>
 
@@ -450,14 +447,14 @@
         <!-- 基本信息 -->
         <el-descriptions-item label="申请人">{{ viewData.applicantName || '-' }}</el-descriptions-item>
         <el-descriptions-item label="部门">{{ viewData.department || '-' }}</el-descriptions-item>
-        
+
         <!-- 原申请信息 -->
         <el-descriptions-item label="原目的地">{{ viewData.originalDestination || '-' }}</el-descriptions-item>
         <el-descriptions-item label="原出境事由">{{ viewData.originalExitReason || '-' }}</el-descriptions-item>
         <el-descriptions-item label="原出发日期">{{ formatDate(viewData.originalStartDate) }}</el-descriptions-item>
         <el-descriptions-item label="原返回日期">{{ formatDate(viewData.originalEndDate) }}</el-descriptions-item>
         <el-descriptions-item label="原出国天数" :span="2">{{ viewData.originalDuration || 0 }}天</el-descriptions-item>
-        
+
         <!-- 变更信息 -->
         <el-descriptions-item label="变更类型" :span="2">{{ viewData.changeType || '-' }}</el-descriptions-item>
         <el-descriptions-item label="新目的地" v-if="viewData.newDestination">{{ viewData.newDestination }}</el-descriptions-item>
@@ -468,7 +465,7 @@
         <el-descriptions-item label="新行程安排" :span="2" v-if="viewData.newItinerary">{{ viewData.newItinerary }}</el-descriptions-item>
         <el-descriptions-item label="变更原因" :span="2">{{ viewData.changeReason || '-' }}</el-descriptions-item>
         <el-descriptions-item label="备注" :span="2" v-if="viewData.remark">{{ viewData.remark }}</el-descriptions-item>
-        
+
         <!-- 审批信息 -->
         <el-descriptions-item label="变更状态">
           <el-tag :type="getStatusTagType(viewData.status)">{{ viewData.statusText }}</el-tag>
@@ -513,7 +510,6 @@
         </div>
       </template>
     </el-dialog>
-
   </div>
 </template>
 
@@ -522,7 +518,8 @@ import { ref, reactive, toRefs, onMounted, computed, watch } from 'vue';
 import { ElMessage, ElMessageBox } from 'element-plus';
 import animate from '@/animate';
 import { parseTime } from '@/utils/ruoyi';
-import { 
+import { useUserStore } from '@/store/modules/user';
+import {
   listItineraryChange,
   listMyItineraryChange,
   getItineraryChange,
@@ -535,6 +532,7 @@ import {
   getOverseasApplication,
   getItineraryChangeHistory,
   getOverseasRecordByApplication,
+  listOverseasApplication,
   type ItineraryChangeQuery,
   type ItineraryChangeVO,
   type ItineraryChangeForm,
@@ -553,7 +551,7 @@ const formRef = ref();
 const state = reactive({
   // Tab切换
   activeTab: 'all',
-  
+
   // 全部变更列表
   loading: false,
   showSearch: true,
@@ -565,9 +563,10 @@ const state = reactive({
     pageSize: 10,
     applicantName: '',
     destination: '',
-    status: ''
+    status: '',
+    applicantId: undefined as number | undefined
   } as ItineraryChangeQuery,
-  
+
   // 我的变更列表
   myLoading: false,
   showMySearch: true,
@@ -577,9 +576,10 @@ const state = reactive({
     pageNum: 1,
     pageSize: 10,
     destination: '',
-    status: ''
+    status: '',
+    applicantId: undefined as number | undefined
   } as ItineraryChangeQuery,
-  
+
   // 对话框
   dialog: {
     visible: false,
@@ -591,21 +591,21 @@ const state = reactive({
   historyDialog: {
     visible: false
   },
-  
+
   // 表单数据
   form: {} as ItineraryChangeForm,
   viewData: null as ItineraryChangeVO | null,
-  
+
   // 变更历史
   historyLoading: false,
   historyList: [] as ItineraryChangeVO[],
-  
+
   // 可用的出国申请列表（已审批通过）
   availableApplicationList: [] as OverseasApplicationVO[],
-  
+
   // 变更类型（多选）
   changeTypes: [] as string[],
-  
+
   // 表单验证规则
   rules: {
     applicationId: [{ required: true, message: '请选择原出国申请', trigger: 'change' }],
@@ -690,7 +690,7 @@ onMounted(() => {
 const handleTabClick = (tab: any) => {
   const tabName = tab.props?.name || tab.paneName;
   state.activeTab = tabName;
-  
+
   if (tabName === 'all') {
     getList();
   } else if (tabName === 'my') {
@@ -698,18 +698,36 @@ const handleTabClick = (tab: any) => {
   }
 };
 
-// 查询变更申请列表（只显示待审核的数据）
+// 查询变更申请列表（只显示当前登录人的待审核和已撤回的数据）
 const getList = async () => {
   state.loading = true;
   try {
-    // 如果用户没有手动选择状态，默认只显示待审核的申请
-    const params = { ...state.queryParams };
-    if (!params.status) {
-      params.status = '0'; // 默认只显示待审核状态
-    }
+    const userStore = useUserStore();
+    // 先获取所有当前登录人的数据（不分页），然后在前端过滤和分页
+    const params = {
+      pageNum: 1,
+      pageSize: 10000, // 设置一个较大的值，获取所有数据
+      applicantId: Number(userStore.userId),
+      applicantName: state.queryParams.applicantName,
+      destination: state.queryParams.destination
+    };
+
     const response = await listItineraryChange(params);
-    state.changeList = response.rows;
-    state.total = response.total;
+
+    // 前端过滤：只显示状态为 0（待审核）和 3（已撤回）的数据
+    const filteredRows = response.rows.filter((item: ItineraryChangeVO) => {
+      return item.status === '0' || item.status === '3';
+    });
+
+    // 前端分页
+    const pageNum = state.queryParams.pageNum;
+    const pageSize = state.queryParams.pageSize;
+    const total = filteredRows.length;
+    const start = (pageNum - 1) * pageSize;
+    const end = Math.min(start + pageSize, total);
+
+    state.changeList = filteredRows.slice(start, end);
+    state.total = total;
   } catch (error) {
     console.error('获取变更行程列表失败:', error);
   } finally {
@@ -717,13 +735,35 @@ const getList = async () => {
   }
 };
 
-// 查询我的变更记录列表（只显示已通过的变更申请）
+// 查询我的变更记录列表（只显示当前登录人的已通过和已拒绝的数据）
 const getMyList = async () => {
   state.myLoading = true;
   try {
-    const response = await listMyItineraryChange(state.myQueryParams);
-    state.myChangeList = response.rows;
-    state.myTotal = response.total;
+    const userStore = useUserStore();
+    // 先获取所有当前登录人的数据（不分页），然后在前端过滤和分页
+    const params = {
+      pageNum: 1,
+      pageSize: 10000, // 设置一个较大的值，获取所有数据
+      applicantId: Number(userStore.userId),
+      destination: state.myQueryParams.destination
+    };
+
+    const response = await listItineraryChange(params);
+
+    // 前端过滤：只显示状态为 1（已通过）和 2（已拒绝）的数据
+    const filteredRows = response.rows.filter((item: ItineraryChangeVO) => {
+      return item.status === '1' || item.status === '2';
+    });
+
+    // 前端分页
+    const pageNum = state.myQueryParams.pageNum;
+    const pageSize = state.myQueryParams.pageSize;
+    const total = filteredRows.length;
+    const start = (pageNum - 1) * pageSize;
+    const end = Math.min(start + pageSize, total);
+
+    state.myChangeList = filteredRows.slice(start, end);
+    state.myTotal = total;
   } catch (error) {
     console.error('获取我的变更记录失败:', error);
   } finally {
@@ -731,13 +771,25 @@ const getMyList = async () => {
   }
 };
 
-// 获取已审批通过的出国申请列表
+// 获取已审批通过的出国申请列表（只显示当前登录人的）
 const getApprovedApplicationList = async () => {
   try {
-    const response = await getApprovedOverseasApplications();
-    state.availableApplicationList = response.data;
+    const userStore = useUserStore();
+    // 使用listOverseasApplication查询当前登录人的已通过申请
+    const response = await listOverseasApplication({
+      pageNum: 1,
+      pageSize: 1000, // 设置一个较大的值，获取所有数据
+      applicantId: Number(userStore.userId), // 只查询当前登录人的申请
+      status: '1' // 只查询已通过的状态
+    });
+
+    // 确保只返回已通过审批的申请
+    state.availableApplicationList = response.rows.filter((item: OverseasApplicationVO) => {
+      return item.status === '1';
+    });
   } catch (error) {
     console.error('获取已审批通过的出国申请列表失败:', error);
+    ElMessage.error('获取已审批通过的出国申请列表失败');
   }
 };
 
@@ -798,30 +850,30 @@ const handleApplicationChange = async (applicationId: number) => {
     // 1. 获取出国申请详情
     const response = await getOverseasApplication(applicationId);
     const selectedApplication = response.data;
-    
+
     // 2. 根据申请ID获取出国记录（包含recordId）
     const recordResponse = await getOverseasRecordByApplication(applicationId);
     const recordData = recordResponse.data;
-    
+
     if (selectedApplication && recordData) {
       // 设置recordId（关键字段，必填）
       state.form.recordId = recordData.recordId;
-      
+
       // 设置申请人ID（关键字段，必填）
       state.form.applicantId = selectedApplication.applicantId;
-      
+
       // 填充本人基本情况
       state.form.applicantName = selectedApplication.applicantName;
       state.form.gender = selectedApplication.gender;
       state.form.birthDate = selectedApplication.birthDate;
       // 政治面貌：将字典值转换为文本标签
-      state.form.politicalStatus = getPoliticalStatusLabel(selectedApplication.politicalStatus);
+      state.form.politicalStatus = selectedApplication.politicalStatus ? getPoliticalStatusLabel(selectedApplication.politicalStatus) : '';
       state.form.professionalTitle = selectedApplication.professionalTitle;
       state.form.position = selectedApplication.position;
       state.form.documentName = selectedApplication.documentName;
       state.form.documentNumber = selectedApplication.documentNumber;
       state.form.department = selectedApplication.department;
-      
+
       // 填充申请行程情况
       // 前往国家：优先使用destinationCountry，其次使用destination
       state.form.originalDestination = selectedApplication.destinationCountry || selectedApplication.destination;
@@ -833,7 +885,7 @@ const handleApplicationChange = async (applicationId: number) => {
       state.form.originalStartDate = selectedApplication.startDate;
       state.form.originalEndDate = selectedApplication.endDate;
       state.form.originalDuration = selectedApplication.duration;
-      
+
       // 默认将原信息复制到新信息
       state.form.newDestination = selectedApplication.destinationCountry || selectedApplication.destination;
       state.form.newDestinationCity = selectedApplication.destinationCity;
@@ -867,22 +919,24 @@ const handleCancel = (row: ItineraryChangeVO) => {
     confirmButtonText: '确定',
     cancelButtonText: '取消',
     inputPlaceholder: '请输入撤回原因'
-  }).then(async ({ value }) => {
-    try {
-      await cancelItineraryChange(row.changeId, value);
-      ElMessage.success('撤回成功');
-      
-      // 根据当前Tab刷新列表
-      if (state.activeTab === 'all') {
-        getList();
-      } else if (state.activeTab === 'my') {
-        getMyList();
+  })
+    .then(async ({ value }) => {
+      try {
+        await cancelItineraryChange(row.changeId, value);
+        ElMessage.success('撤回成功');
+
+        // 根据当前Tab刷新列表
+        if (state.activeTab === 'all') {
+          getList();
+        } else if (state.activeTab === 'my') {
+          getMyList();
+        }
+      } catch (error) {
+        console.error('撤回失败:', error);
+        ElMessage.error('撤回失败');
       }
-    } catch (error) {
-      console.error('撤回失败:', error);
-      ElMessage.error('撤回失败');
-    }
-  }).catch(() => {});
+    })
+    .catch(() => {});
 };
 
 // 重新提交
@@ -890,12 +944,12 @@ const handleResubmit = async (row: ItineraryChangeVO) => {
   try {
     const response = await getItineraryChange(row.changeId);
     Object.assign(state.form, response.data);
-    
+
     // 解析变更类型
     if (response.data.changeType) {
       state.changeTypes = response.data.changeType.split(',');
     }
-    
+
     state.dialog.title = '重新提交行程变更申请';
     state.dialog.visible = true;
   } catch (error) {
@@ -910,30 +964,32 @@ const handleDelete = (row: ItineraryChangeVO) => {
     confirmButtonText: '确定',
     cancelButtonText: '取消',
     type: 'warning'
-  }).then(async () => {
-    try {
-      await delItineraryChange(row.changeId);
-      ElMessage.success('删除成功');
-      
-      // 根据当前Tab刷新列表（如果删除的是当前页最后一条且不是第1页，返回上一页）
-      if (state.activeTab === 'all') {
-        // 如果删除的是当前页最后一条且不是第1页，返回上一页
-        if (state.changeList.length === 1 && state.queryParams.pageNum > 1) {
-          state.queryParams.pageNum--;
+  })
+    .then(async () => {
+      try {
+        await delItineraryChange(row.changeId);
+        ElMessage.success('删除成功');
+
+        // 根据当前Tab刷新列表（如果删除的是当前页最后一条且不是第1页，返回上一页）
+        if (state.activeTab === 'all') {
+          // 如果删除的是当前页最后一条且不是第1页，返回上一页
+          if (state.changeList.length === 1 && state.queryParams.pageNum > 1) {
+            state.queryParams.pageNum--;
+          }
+          getList();
+        } else if (state.activeTab === 'my') {
+          // 如果删除的是当前页最后一条且不是第1页，返回上一页
+          if (state.myChangeList.length === 1 && state.myQueryParams.pageNum > 1) {
+            state.myQueryParams.pageNum--;
+          }
+          getMyList();
         }
-        getList();
-      } else if (state.activeTab === 'my') {
-        // 如果删除的是当前页最后一条且不是第1页，返回上一页
-        if (state.myChangeList.length === 1 && state.myQueryParams.pageNum > 1) {
-          state.myQueryParams.pageNum--;
-        }
-        getMyList();
+      } catch (error) {
+        console.error('删除失败:', error);
+        ElMessage.error('删除失败');
       }
-    } catch (error) {
-      console.error('删除失败:', error);
-      ElMessage.error('删除失败');
-    }
-  }).catch(() => {});
+    })
+    .catch(() => {});
 };
 
 // 查看变更历史
@@ -963,15 +1019,14 @@ const submitForm = () => {
       if (state.form.newExitReason !== state.form.originalExitReason) {
         changeTypeList.push('出境事由变更');
       }
-      if (state.form.newStartDate !== state.form.originalStartDate || 
-          state.form.newEndDate !== state.form.originalEndDate) {
+      if (state.form.newStartDate !== state.form.originalStartDate || state.form.newEndDate !== state.form.originalEndDate) {
         changeTypeList.push('时间变更');
       }
       if (state.form.newItinerary && state.form.newItinerary !== state.form.originalItinerary) {
         changeTypeList.push('行程变更');
       }
       state.form.changeType = changeTypeList.length > 0 ? changeTypeList.join(',') : '其他变更';
-      
+
       state.submitLoading = true;
       try {
         if (state.form.changeId) {
@@ -982,7 +1037,7 @@ const submitForm = () => {
           ElMessage.success('提交成功！变更申请已进入审批流程。');
         }
         state.dialog.visible = false;
-        
+
         // 根据当前Tab刷新列表（重置到第1页）
         if (state.activeTab === 'all') {
           state.queryParams.pageNum = 1;
@@ -1056,11 +1111,11 @@ const getStatusTagType = (status: string): 'primary' | 'success' | 'info' | 'war
   const typeMap: Record<string, 'primary' | 'success' | 'info' | 'warning' | 'danger'> = {
     '0': 'warning', // 待审核
     '1': 'success', // 已通过
-    '2': 'danger'   // 已拒绝
+    '2': 'danger', // 已拒绝
+    '3': 'info' // 已撤回
   };
   return typeMap[status] || 'info';
 };
-
 </script>
 
 <style scoped>
@@ -1081,6 +1136,8 @@ const getStatusTagType = (status: string): 'primary' | 'success' | 'info' | 'war
 .table-card {
   margin-bottom: 10px;
 }
+
+:global(.app-container) {
+  padding: 0 !important;
+}
 </style>
-
-
diff --git a/web/src/views/rs/overseas/monitor/index.vue b/web/src/views/rs/overseas/monitor/index.vue
index 6dede570..7bcc83d5 100644
--- a/web/src/views/rs/overseas/monitor/index.vue
+++ b/web/src/views/rs/overseas/monitor/index.vue
@@ -49,24 +49,24 @@
               </el-card>
             </div>
 
-              <!-- 操作按钮区域 -->
-              <el-card shadow="never" class="button-card table-card">
-                <template #header>
-                  <el-row :gutter="10" class="mb8">
-                    <el-col :span="1.5">
-                      <el-button type="primary" plain icon="Refresh" @click="handleRefreshPending">刷新</el-button>
-                    </el-col>
-                    <el-col :span="1.5">
-                      <div class="info-text">
-                        <el-icon><InfoFilled /></el-icon>
-                        <span>这里显示所有待审批申请</span>
-                      </div>
-                    </el-col>
-                  </el-row>
-                </template>
+            <!-- 操作按钮区域 -->
+            <el-card shadow="never" class="button-card table-card">
+              <template #header>
+                <el-row :gutter="10" class="mb8">
+                  <el-col :span="1.5">
+                    <el-button type="primary" plain icon="Refresh" @click="handleRefreshPending">刷新</el-button>
+                  </el-col>
+                  <el-col :span="1.5">
+                    <div class="info-text">
+                      <el-icon><InfoFilled /></el-icon>
+                      <span>这里显示所有待审批申请</span>
+                    </div>
+                  </el-col>
+                </el-row>
+              </template>
 
-                <!-- 表格 -->
-                <el-table v-loading="pendingLoading" :data="pendingList" border>
+              <!-- 表格 -->
+              <el-table v-loading="pendingLoading" :data="pendingList" border>
                 <el-table-column label="申请人" prop="applicantName" min-width="100" align="center" :show-overflow-tooltip="true" />
                 <el-table-column label="所属部门" prop="department" min-width="140" align="center" :show-overflow-tooltip="true" />
                 <el-table-column label="前往国家" prop="destinationCountry" min-width="110" align="center" :show-overflow-tooltip="true" />
@@ -350,8 +350,16 @@
       <template #footer>
         <div style="display: flex; justify-content: space-between; width: 100%">
           <div>
-            <!-- 只有审批完成的申请才显示下载PDF按钮 -->
-            <el-button v-if="currentDetail && currentDetail.status === '1'" type="primary" icon="Download" @click="handleDownloadPdf" v-hasPermi="['rs:overseas:query']">下载审批表PDF</el-button>
+            <!-- 只有审批完成的申请才显示下载Word按钮 -->
+            <el-button
+              v-if="currentDetail && currentDetail.status === '1'"
+              type="primary"
+              icon="Download"
+              @click="handleDownloadApprovalWord"
+              v-hasPermi="['rs:overseas:query']"
+            >
+              下载审批表Word
+            </el-button>
           </div>
           <div>
             <el-button @click="detailDialogVisible = false">关闭</el-button>
@@ -362,14 +370,15 @@
   </div>
 </template>
 
-<script setup name="OverseasApprovalMonitor">
+<script setup lang="ts" name="OverseasApprovalMonitor">
 import { ref, reactive, onMounted, watch } from 'vue';
+import dayjs from 'dayjs';
 import { ElMessage, ElMessageBox } from 'element-plus';
 import { useRouter } from 'vue-router';
 import { Clock, Search, Refresh, View, EditPen, InfoFilled, Download } from '@element-plus/icons-vue';
 
 // API请求
-import { getPendingList as apiGetPendingList, getCompletedList as apiGetCompletedList, getDetail, downloadApprovalPdf } from '@/api/rs/overseas';
+import { getPendingList as apiGetPendingList, getCompletedList as apiGetCompletedList, getDetail } from '@/api/rs/overseas';
 
 // 导入变更历史API接口
 import { getItineraryChangeHistory } from '@/api/rs/overseas';
@@ -405,6 +414,8 @@ const completedQueryParams = reactive({
   department: undefined,
   destination: undefined,
   applyTimeRange: undefined,
+  applyTimeStart: undefined as string | undefined,
+  applyTimeEnd: undefined as string | undefined,
   status: '1'
 });
 
@@ -691,48 +702,180 @@ const getChangeStatusTagType = (status) => {
 };
 
 /**
- * 下载审批表PDF
+ * 下载审批表Word
  */
-const handleDownloadPdf = async () => {
-  if (!currentDetail.value || !currentDetail.value.applicationId) {
+const handleDownloadApprovalWord = async () => {
+  const detail = currentDetail.value;
+  if (!detail || !detail.applicationId) {
     ElMessage.error('无法获取申请ID');
     return;
   }
 
   try {
-    ElMessage.info('正在生成PDF，请稍候...');
-    
-    // 调用API获取blob数据
-    const response = await downloadApprovalPdf(currentDetail.value.applicationId);
-    
-    // 创建带MIME类型的Blob对象
-    const blob = response instanceof Blob 
-      ? new Blob([response], { type: 'application/pdf' })
-      : new Blob([response.data], { type: 'application/pdf' });
-    
-    // 创建下载链接
+    ElMessage.info('正在生成审批表，请稍候...');
+
+    const templateData = buildApprovalTemplateData(detail);
+    const [Docxtemplater, PizZip, ImageModule] = await Promise.all([
+      import('docxtemplater'),
+      import('pizzip'),
+      import('docxtemplater-image-module-free')
+    ]);
+    const templateResponse = await fetch('/chuguojingshenpibiao.docx', { cache: 'no-store' });
+
+    if (!templateResponse.ok) {
+      throw new Error('模板文件加载失败，请联系管理员');
+    }
+
+    const arrayBuffer = await templateResponse.arrayBuffer();
+    const zip = new PizZip.default(arrayBuffer);
+    const imageOpts = {
+      centered: false,
+      getImage: (base64: string) => {
+        if (!base64) {
+          return null;
+        }
+        const pure = base64.split(',')[1] || base64;
+        const bytes = Uint8Array.from(atob(pure), (char) => char.charCodeAt(0));
+        return bytes.buffer;
+      },
+      getSize: () => [60, 20]
+    };
+
+    const doc = new Docxtemplater.default(zip, {
+      modules: [new ImageModule.default(imageOpts)],
+      paragraphLoop: true,
+      linebreaks: true,
+      delimiters: { start: '{{', end: '}}' },
+      parser: (tag: string) => {
+        return {
+          get: (scope: Record<string, any>) => {
+            const cleanTag = tag.trim().replace(/^%+/, '');
+            return scope[cleanTag];
+          }
+        };
+      }
+    });
+
+    doc.render(templateData);
+
+    const blob = doc.getZip().generate({
+      type: 'blob',
+      mimeType: 'application/vnd.openxmlformats-officedocument.wordprocessingml.document'
+    });
+
+    const fileName = `出国申请审批表-${detail.applicantName || dayjs().format('YYYYMMDDHHmmss')}.docx`;
     const url = window.URL.createObjectURL(blob);
     const link = document.createElement('a');
     link.href = url;
-    
-    // 设置下载文件名（使用申请人姓名和时间戳）
-    const fileName = `出国申请审批表_${currentDetail.value.applicantName}_${currentDetail.value.applicationId}.pdf`;
     link.download = fileName;
-    
-    // 触发下载
+
     document.body.appendChild(link);
     link.click();
-    
-    // 清理资源
     document.body.removeChild(link);
     window.URL.revokeObjectURL(url);
-    
-    ElMessage.success('PDF下载成功');
-  } catch (error) {
-    console.error('下载PDF失败', error);
-    ElMessage.error('下载PDF失败，请稍后重试');
+
+    ElMessage.success('审批表下载成功');
+  } catch (error: any) {
+    console.error('下载审批表失败', error);
+    ElMessage.error(error?.message || '下载审批表失败，请稍后重试');
   }
 };
+
+/**
+ * 构建审批表模板数据
+ */
+const buildApprovalTemplateData = (detail) => {
+  const startParts = getDateParts(detail.startDate);
+  const endParts = getDateParts(detail.endDate);
+  const applyParts = getDateParts(detail.applyTime || detail.createTime);
+  const durationDays = detail.duration || calculateDuration(detail.startDate, detail.endDate);
+  const templateData: Record<string, any> = {
+    applicantName: detail.applicantName || '',
+    genderText: detail.genderText || '',
+    birthYear: getDateParts(detail.birthDate).year,
+    birthMonth: getDateParts(detail.birthDate).month,
+    birthDay: getDateParts(detail.birthDate).day,
+    politicalStatusText: detail.politicalStatusText || '-',
+    department: detail.department || '-',
+    professionalTitle: detail.professionalTitle || '-',
+    position: detail.position || '-',
+    documentName: detail.documentName || '-',
+    documentNumber: detail.documentNumber || '-',
+    destinationCountry: detail.destinationCountry || detail.destination || '-',
+    isTourismChecked: detail.exitReason === '旅游' ? '√' : '',
+    isVisitChecked: detail.exitReason === '探亲' ? '√' : '',
+    visitRelationship: detail.visitRelationship || '',
+    remarks: detail.remarks || '',
+    startYear: startParts.year,
+    startMonth: startParts.month,
+    startDay: startParts.day,
+    endYear: endParts.year,
+    endMonth: endParts.month,
+    endDay: endParts.day,
+    durationDays: durationDays || '',
+    applicantSignature: detail.signature || '',
+    mobilePhone: detail.mobilePhone || detail.contactPhone || '',
+    emergencyContact: detail.emergencyContact || '',
+    applicantSignYear: applyParts.year,
+    applicantSignMonth: applyParts.month,
+    applicantSignDay: applyParts.day
+  };
+
+  fillApprovalNodeData(templateData, detail.approvalHistory || []);
+  return templateData;
+};
+
+/**
+ * 计算出国天数
+ */
+const calculateDuration = (startDate, endDate) => {
+  if (!startDate || !endDate) return '';
+  const start = dayjs(startDate);
+  const end = dayjs(endDate);
+  if (!start.isValid() || !end.isValid()) return '';
+  return Math.max(end.diff(start, 'day') + 1, 1);
+};
+
+/**
+ * 获取日期拆分
+ */
+const getDateParts = (date) => {
+  if (!date) {
+    return { year: '', month: '', day: '' };
+  }
+  const parsed = dayjs(date);
+  if (!parsed.isValid()) {
+    return { year: '', month: '', day: '' };
+  }
+  return {
+    year: parsed.format('YYYY'),
+    month: parsed.format('MM'),
+    day: parsed.format('DD')
+  };
+};
+
+/**
+ * 填充审批节点数据
+ */
+const fillApprovalNodeData = (templateData, approvalHistory) => {
+  const approvalNodes = [
+    { level: '1', prefix: 'deptLeader' },
+    { level: '2', prefix: 'hr' },
+    { level: '3', prefix: 'discipline' },
+    { level: '4', prefix: 'viceDean' },
+    { level: '5', prefix: 'secretary' }
+  ];
+
+  approvalNodes.forEach((node) => {
+    const record = approvalHistory.find((item) => item.approvalLevel === node.level);
+    const dateParts = getDateParts(record?.approvalTime);
+    templateData[`${node.prefix}Signature`] = record?.approvalSignature || record?.signature || '';
+    templateData[`${node.prefix}Opinion`] = record?.approvalOpinion || '';
+    templateData[`${node.prefix}Year`] = dateParts.year;
+    templateData[`${node.prefix}Month`] = dateParts.month;
+    templateData[`${node.prefix}Day`] = dateParts.day;
+  });
+};
 </script>
 
 <style scoped lang="scss">
diff --git a/web/src/views/rs/overseas/monitor/修改总结-快速参考.md b/web/src/views/rs/overseas/monitor/修改总结-快速参考.md
deleted file mode 100644
index 41189f50..00000000
--- a/web/src/views/rs/overseas/monitor/修改总结-快速参考.md
+++ /dev/null
@@ -1,88 +0,0 @@
-# 出国申请进度查询功能修改总结 - 快速参考
-
-## ✅ 修改完成
-
-**修改时间**：2025-10-29  
-**修改范围**：仅修改monitor相关文件，未影响其他模块
-
----
-
-## 📋 核心修改
-
-### 1. 功能变化
-
-#### 修改前
-- ❌ 显示工作流迁移提示
-- ❌ 无实际查询功能
-- ❌ 表格被隐藏
-
-#### 修改后
-- ✅ 显示当前用户提交的待审批申请
-- ✅ 显示当前用户提交的已完成审批申请（抄送）
-- ✅ 支持搜索和查看审批历史
-
----
-
-## 🎯 核心逻辑
-
-### 数据过滤
-```java
-// 后端Service层添加过滤条件
-Long currentUserId = LoginHelper.getUserId();
-wrapper.eq("applicant_id", currentUserId); // 🔴 只查询当前用户提交的申请
-```
-
-### 功能说明
-- **待审批中**：用户提交申请后，在这里查看审批进度
-- **审批完成**：审批流程完成后，抄送一份到这里
-
----
-
-## 📄 修改文件
-
-| 文件 | 类型 | 修改内容 |
-|------|------|---------|
-| `RsOverseasApprovalMonitorServiceImpl.java` | 后端 | 添加当前用户过滤 |
-| `RsOverseasApprovalMonitorController.java` | 后端 | 恢复pending接口 |
-| `monitor/index.vue` | 前端 | 删除提示，恢复表格 |
-
----
-
-## 🧪 快速测试
-
-### 测试步骤
-1. 登录系统
-2. 访问"出国申请进度查询"
-3. 查看"待审批中"和"审批完成"选项卡
-
-### 预期结果
-- ✅ 只显示当前用户提交的申请
-- ✅ 不显示其他用户的申请
-- ✅ 可以查看审批历史
-
----
-
-## 🚀 部署命令
-
-```bash
-# 后端
-cd backend
-mvn clean package -pl ruoyi-admin -am -DskipTests
-./stop-main.sh && ./start-main.sh
-
-# 前端（如需要）
-cd web
-npm run build
-```
-
----
-
-## 📝 详细文档
-
-完整修改说明请参考：`出国申请进度查询功能修改说明.md`
-
----
-
-**状态**：✅ 已完成  
-**版本**：v1.0
-
diff --git a/web/src/views/rs/overseas/monitor/出国申请进度查询功能优化说明.md b/web/src/views/rs/overseas/monitor/出国申请进度查询功能优化说明.md
deleted file mode 100644
index 8c259199..00000000
--- a/web/src/views/rs/overseas/monitor/出国申请进度查询功能优化说明.md
+++ /dev/null
@@ -1,365 +0,0 @@
-# 出国申请进度查询功能优化说明
-
-**日期**: 2025-01-29  
-**模块**: 出国申请进度查询 (`/rs/overseas/monitor`)
-
-## 📋 功能需求
-
-### 1. 变更历史记录条件显示
-- **需求**: 变更历史记录字段只在有变更记录时显示，没有变更记录时不显示该区域
-- **实现位置**: `web/src/views/rs/overseas/monitor/index.vue`
-
-### 2. PDF下载功能
-- **需求**: 在审批完成选项卡的详情弹窗中新增PDF下载按钮
-- **PDF模板**: 杭州第一技师学院登记报备人员因私事出国(境)审批表
-- **显示条件**: 仅当申请状态为"已通过"(status='1')时显示下载按钮
-
-## 🎯 实现内容
-
-### 一、前端修改
-
-#### 1. 变更历史记录条件显示
-**文件**: `web/src/views/rs/overseas/monitor/index.vue`
-
-**修改内容**:
-- 原条件: `v-if="currentDetail.recordId"`
-- 新条件: `v-if="currentDetail.recordId && changeHistoryList.length > 0"`
-- 移除空状态提示组件 `<el-empty>`
-
-**代码位置**: 第287行
-
-```vue
-<!-- 变更历史记录（仅已完成且有变更记录时显示） -->
-<div v-if="currentDetail.recordId && changeHistoryList.length > 0" style="margin-top: 20px">
-  <el-divider content-position="left">
-    <span style="font-size: 16px; font-weight: bold; color: #409eff">
-      <el-icon style="vertical-align: middle; margin-right: 5px"><EditPen /></el-icon>
-      变更历史记录
-    </span>
-  </el-divider>
-
-  <!-- 变更历史列表 -->
-  <div v-loading="changeHistoryLoading">
-    <el-table :data="changeHistoryList" border style="width: 100%" max-height="400px">
-      <!-- 表格列定义 -->
-    </el-table>
-  </div>
-</div>
-```
-
-#### 2. PDF下载按钮
-**文件**: `web/src/views/rs/overseas/monitor/index.vue`
-
-**新增内容**:
-1. **导入图标**: 添加 `Download` 图标
-2. **导入API**: 添加 `downloadApprovalPdf` 方法
-3. **弹窗footer布局**: 改为左右布局，左侧显示下载按钮，右侧显示关闭按钮
-4. **下载方法**: 添加 `handleDownloadPdf` 方法
-
-**代码位置**: 第350-360行
-
-```vue
-<template #footer>
-  <div style="display: flex; justify-content: space-between; width: 100%">
-    <div>
-      <!-- 只有审批完成的申请才显示下载PDF按钮 -->
-      <el-button 
-        v-if="currentDetail && currentDetail.status === '1'" 
-        type="primary" 
-        icon="Download" 
-        @click="handleDownloadPdf" 
-        v-hasPermi="['rs:overseas:query']">
-        下载审批表PDF
-      </el-button>
-    </div>
-    <div>
-      <el-button @click="detailDialogVisible = false">关闭</el-button>
-    </div>
-  </div>
-</template>
-```
-
-**JavaScript方法** (第693-710行):
-```javascript
-/**
- * 下载审批表PDF
- */
-const handleDownloadPdf = async () => {
-  if (!currentDetail.value || !currentDetail.value.applicationId) {
-    ElMessage.error('无法获取申请ID');
-    return;
-  }
-
-  try {
-    ElMessage.info('正在生成PDF，请稍候...');
-    await downloadApprovalPdf(currentDetail.value.applicationId);
-    ElMessage.success('PDF下载成功');
-  } catch (error) {
-    console.error('下载PDF失败', error);
-    ElMessage.error('下载PDF失败，请稍后重试');
-  }
-};
-```
-
-#### 3. API接口定义
-**文件**: `web/src/api/rs/overseas.ts`
-
-**新增内容**: Monitor相关API接口（第1036-1085行）
-
-```typescript
-// ==================== 出国申请进度查询（监控）相关API ====================
-
-// 审批监控查询参数类型
-export interface OverseasMonitorQuery {
-  pageNum: number;
-  pageSize: number;
-  applicantName?: string;
-  department?: string;
-  destination?: string;
-  approvalLevel?: string;
-  currentApprover?: string;
-  status?: string;
-  applyTimeStart?: string;
-  applyTimeEnd?: string;
-}
-
-// 查询待审批列表（监控）
-export function getPendingList(query: OverseasMonitorQuery) {
-  return request({
-    url: '/rs/overseas/monitor/pending/list',
-    method: 'get',
-    params: query
-  });
-}
-
-// 查询已完成审批列表（监控）
-export function getCompletedList(query: OverseasMonitorQuery) {
-  return request({
-    url: '/rs/overseas/monitor/completed/list',
-    method: 'get',
-    params: query
-  });
-}
-
-// 查询申请详情（监控）
-export function getDetail(applicationId: string | number) {
-  return request({
-    url: `/rs/overseas/monitor/detail/${applicationId}`,
-    method: 'get'
-  });
-}
-
-// 下载审批表PDF
-export function downloadApprovalPdf(applicationId: string | number) {
-  return request({
-    url: `/rs/overseas/monitor/downloadApprovalPdf/${applicationId}`,
-    method: 'get',
-    responseType: 'blob'
-  });
-}
-```
-
-### 二、后端修改
-
-#### 1. Service接口
-**文件**: `backend/ruoyi-modules/ruoyi-rs/src/main/java/org/dromara/rs/service/IRsOverseasApprovalMonitorService.java`
-
-**新增方法**:
-```java
-/**
- * 下载出国申请审批表PDF
- *
- * @param applicationId 申请ID
- * @param response HTTP响应对象
- */
-void downloadApprovalPdf(Long applicationId, HttpServletResponse response);
-```
-
-#### 2. Controller接口
-**文件**: `backend/ruoyi-modules/ruoyi-rs/src/main/java/org/dromara/rs/controller/RsOverseasApprovalMonitorController.java`
-
-**新增接口** (第119-135行):
-```java
-/**
- * 下载出国申请审批表PDF
- * <p>
- * 生成并下载"杭州第一技师学院登记报备人员因私事出国(境)审批表"PDF文件
- * 
- * @param applicationId 申请ID
- * @param response HTTP响应对象
- */
-@SaCheckPermission("rs:overseas:query")
-@GetMapping("/downloadApprovalPdf/{applicationId}")
-public void downloadApprovalPdf(
-        @PathVariable @NotNull(message = "申请ID不能为空") Long applicationId,
-        HttpServletResponse response) {
-    log.info("下载出国申请审批表PDF，申请ID：{}", applicationId);
-    monitorService.downloadApprovalPdf(applicationId, response);
-}
-```
-
-#### 3. Service实现
-**文件**: `backend/ruoyi-modules/ruoyi-rs/src/main/java/org/dromara/rs/service/impl/RsOverseasApprovalMonitorServiceImpl.java`
-
-**新增依赖导入**:
-```java
-import com.itextpdf.text.*;
-import com.itextpdf.text.pdf.*;
-import jakarta.servlet.http.HttpServletResponse;
-import org.dromara.common.core.exception.ServiceException;
-import java.io.IOException;
-import java.io.OutputStream;
-import java.net.URLEncoder;
-import java.nio.charset.StandardCharsets;
-import java.text.SimpleDateFormat;
-```
-
-**新增方法** (第521-808行):
-
-1. **`downloadApprovalPdf`**: 主方法，负责查询数据和设置响应头
-2. **`generateApprovalPdf`**: PDF生成核心方法
-3. **`addCell`**: 添加表格单元格辅助方法
-4. **`addApprovalRow`**: 添加审批意见行辅助方法
-5. **`getApprovalOpinion`**: 获取指定级别审批意见
-6. **`formatDate`**: 格式化日期（yyyy-MM-dd）
-7. **`formatBirthDate`**: 格式化出生日期（yyyy年MM月）
-
-**PDF文档结构**:
-1. 标题：
-   - "杭州第一技师学院"
-   - "登记报备人员因私事出国（境）审批表"
-
-2. 个人信息表格（8列）:
-   - 姓名、性别、出生年月、政治面貌
-   - 现工作部门（教学系）、职称、职务
-   - 申领证件名称、证件号码
-   - 前往国家或地区、出境事由（旅游/探亲）
-   - 探望对象姓名及与申请者关系
-   - 出国时间、备注
-   - 承诺声明、联系电话、应急联系人
-
-3. 审批意见表格（2列）:
-   - 部门（教学系）意见
-   - 人事（组织）处审核意见
-   - 纪委意见
-   - 学院分管领导意见
-   - 学院党委书记意见
-
-4. 备注说明:
-   - 因私出境时间说明
-   - 证件号码填写说明
-
-## 🔧 技术实现细节
-
-### PDF生成技术
-- **库**: iText 5.5.13.3
-- **中文字体**: STSong-Light (UniGB-UCS2-H)
-- **页面尺寸**: A4
-- **页边距**: 40pt (上下左右)
-
-### 字体大小
-- **标题字体**: 16pt, 加粗
-- **副标题字体**: 14pt, 加粗
-- **正文字体**: 10pt, 常规
-- **小字体**: 9pt, 常规
-
-### 表格设计
-- **个人信息表**: 8列，列宽比例 [8:12:6:10:10:12:16:6]
-- **审批意见表**: 2列，列宽比例 [20:80]
-- **单元格最小高度**: 25-50pt
-- **表头背景**: 浅灰色 (BaseColor.LIGHT_GRAY)
-
-### 数据处理
-- **性别翻译**: 0→男, 1→女
-- **政治面貌翻译**: 支持多种编码格式(01-13, 1-13, 英文代码)
-- **出境事由**: 旅游/探亲，用√标记
-- **日期格式化**: yyyy-MM-dd / yyyy年MM月
-- **审批意见**: 优先显示审批意见，无意见时通过状态显示"同意"
-
-## 📝 权限要求
-
-- **查看权限**: `rs:overseas:query`
-- **列表权限**: `rs:overseas:list`
-
-## 🎨 UI/UX优化
-
-1. **按钮位置**: 弹窗footer左右布局，下载按钮在左侧，关闭按钮在右侧
-2. **按钮样式**: 主色调按钮（type="primary"）+ 下载图标
-3. **显示条件**: 仅审批完成状态显示下载按钮
-4. **用户提示**: 
-   - 开始下载："正在生成PDF，请稍候..."
-   - 下载成功："PDF下载成功"
-   - 下载失败："下载PDF失败，请稍后重试"
-
-## ✅ 测试要点
-
-### 前端测试
-1. ✅ 有变更记录时，变更历史区域正常显示
-2. ✅ 无变更记录时，变更历史区域不显示
-3. ✅ 审批完成状态显示下载PDF按钮
-4. ✅ 待审批状态不显示下载PDF按钮
-5. ✅ 点击下载按钮能触发PDF下载
-6. ✅ 下载过程中显示加载提示
-
-### 后端测试
-1. ✅ PDF文件名包含申请人姓名和时间戳
-2. ✅ PDF包含完整的个人信息
-3. ✅ PDF包含所有审批历史记录
-4. ✅ 中文字体正确显示
-5. ✅ 表格格式符合模板要求
-6. ✅ 审批意见正确填充
-7. ✅ 日期格式化正确
-
-## 📊 文件清单
-
-### 前端文件
-- ✅ `web/src/views/rs/overseas/monitor/index.vue` (修改)
-- ✅ `web/src/api/rs/overseas.ts` (修改，新增monitor相关API)
-
-### 后端文件
-- ✅ `backend/ruoyi-modules/ruoyi-rs/src/main/java/org/dromara/rs/service/IRsOverseasApprovalMonitorService.java` (修改)
-- ✅ `backend/ruoyi-modules/ruoyi-rs/src/main/java/org/dromara/rs/controller/RsOverseasApprovalMonitorController.java` (修改)
-- ✅ `backend/ruoyi-modules/ruoyi-rs/src/main/java/org/dromara/rs/service/impl/RsOverseasApprovalMonitorServiceImpl.java` (修改)
-
-### 文档文件
-- ✅ `web/src/views/rs/overseas/monitor/出国申请进度查询功能优化说明.md` (新增)
-
-## 🚀 部署说明
-
-### 前端部署
-```bash
-cd web
-npm run build
-# 部署dist目录到Nginx
-```
-
-### 后端部署
-```bash
-cd backend
-mvn clean package -DskipTests
-# 重启ruoyi-admin服务
-```
-
-### 依赖检查
-后端已包含iText PDF生成库依赖:
-- `com.itextpdf:itextpdf:5.5.13.3`
-- `com.itextpdf:itext-asian:5.2.0` (中文字体支持)
-
-## 📖 相关文档
-
-- **项目规范**: `.cursor/cursorrules.md`
-- **开发文档**: `docs/开发文档/API/`
-- **出国申请API**: `docs/开发文档/API/出国申请管理API.md`
-
-## 🔗 相关模块
-
-- **出国申请管理**: `/rs/overseas/application`
-- **出国记录管理**: `/rs/overseas/record`
-- **行程变更管理**: `/rs/itinerary/change`
-
----
-
-**实施人**: Cursor AI  
-**审核状态**: ✅ 已完成  
-**更新日期**: 2025-01-29
-
diff --git a/web/src/views/rs/overseas/monitor/出国申请进度查询功能修改说明.md b/web/src/views/rs/overseas/monitor/出国申请进度查询功能修改说明.md
deleted file mode 100644
index 82154e8d..00000000
--- a/web/src/views/rs/overseas/monitor/出国申请进度查询功能修改说明.md
+++ /dev/null
@@ -1,394 +0,0 @@
-# 出国申请进度查询功能修改说明
-
-## 📋 修改概述
-
-**修改时间**：2025-10-29  
-**修改目的**：按照审批流程要求，修改出国申请进度查询功能，实现申请人查看自己提交的申请进度
-
----
-
-## 🎯 功能需求
-
-### 1. 待审批选项卡
-- **功能**：用户提交申请后，在这里查看自己的待审批记录
-- **显示内容**：
-  - 当前用户提交的所有待审批申请
-  - 当前审批环节和审批人
-  - 审批历史记录
-
-### 2. 审批完成选项卡
-- **功能**：审批完成后，抄送一份到这里
-- **显示内容**：
-  - 当前用户提交的所有已完成审批申请
-  - 完整的审批历史记录
-  - 关联的出国记录信息
-
----
-
-## 📝 修改内容
-
-### 1. 后端Service修改
-
-**文件**：`backend/ruoyi-modules/ruoyi-rs/src/main/java/org/dromara/rs/service/impl/RsOverseasApprovalMonitorServiceImpl.java`
-
-#### 修改点1：待审批列表查询
-```java
-/**
- * 查询审批中的申请列表（待审核状态）
- * 🔴 只查询当前用户提交的待审批申请
- */
-@Override
-public TableDataInfo<RsOverseasApprovalMonitorVo> queryPendingList(RsOverseasApprovalMonitorQuery query) {
-    // 🔴 获取当前登录用户ID
-    Long currentUserId = LoginHelper.getUserId();
-    
-    // 构建查询条件
-    QueryWrapper<RsOverseasApplication> wrapper = buildQueryWrapper(query);
-    wrapper.eq("status", "0"); // 只查询待审核状态
-    wrapper.eq("applicant_id", currentUserId); // 🔴 只查询当前用户提交的申请
-    
-    // ... 分页查询和数据处理
-}
-```
-
-**修改说明**：
-- ✅ 添加当前用户ID过滤条件
-- ✅ 只查询申请人ID = 当前用户ID的记录
-- ✅ 添加日志记录便于排查问题
-
-#### 修改点2：已完成列表查询
-```java
-/**
- * 查询已完成审批的申请列表（已通过状态）
- * 🔴 只查询当前用户提交的已完成审批申请（抄送功能）
- */
-@Override
-public TableDataInfo<RsOverseasApprovalMonitorVo> queryCompletedList(RsOverseasApprovalMonitorQuery query) {
-    // 🔴 获取当前登录用户ID
-    Long currentUserId = LoginHelper.getUserId();
-    
-    // 构建查询条件
-    QueryWrapper<RsOverseasApplication> wrapper = buildQueryWrapper(query);
-    wrapper.eq("status", "1"); // 只查询已通过状态
-    wrapper.eq("applicant_id", currentUserId); // 🔴 只查询当前用户提交的申请
-    
-    // ... 分页查询和数据处理
-}
-```
-
-**修改说明**：
-- ✅ 实现抄送功能：审批完成后，申请人可以在这里查看
-- ✅ 添加当前用户ID过滤条件
-- ✅ 只显示当前用户提交且已完成审批的申请
-
----
-
-### 2. 后端Controller修改
-
-**文件**：`backend/ruoyi-modules/ruoyi-rs/src/main/java/org/dromara/rs/controller/RsOverseasApprovalMonitorController.java`
-
-#### 修改点：恢复pending接口功能
-```java
-/**
- * 查询待审批的申请列表（出国申请进度查询）
- * 🔴 功能说明：查询当前用户提交的待审批申请
- */
-@SaCheckPermission("rs:overseas:list")
-@GetMapping("/pending/list")
-public TableDataInfo<RsOverseasApprovalMonitorVo> pendingList(RsOverseasApprovalMonitorQuery query) {
-    log.info("查询当前用户的待审批申请列表");
-    query.setStatus("0");
-    return monitorService.queryPendingList(query);
-}
-```
-
-**修改说明**：
-- ❌ 删除了工作流迁移提示
-- ✅ 恢复正常的查询功能
-- ✅ 返回实际数据而不是错误提示
-
----
-
-### 3. 前端页面修改
-
-**文件**：`web/src/views/rs/overseas/monitor/index.vue`
-
-#### 修改点1：删除工作流迁移提示
-```vue
-<!-- 🔴 删除的内容 -->
-<el-alert
-  title="功能迁移通知"
-  description="出国申请监控功能已标准化..."
-  ...
->
-  <el-button @click="navigateToTaskWaiting">前往待办任务页面</el-button>
-</el-alert>
-```
-
-**修改说明**：
-- ❌ 删除整个Alert提示组件
-- ❌ 删除跳转到工作流页面的按钮
-
-#### 修改点2：恢复待审批表格显示
-```vue
-<!-- 表格 -->
-<el-table v-loading="pendingLoading" :data="pendingList" border>
-  <!-- 之前是 style="display: none" 隐藏的，现在恢复显示 -->
-  <el-table-column label="申请人" prop="applicantName" ... />
-  <el-table-column label="所属部门" prop="department" ... />
-  <!-- ... 其他列 -->
-</el-table>
-```
-
-**修改说明**：
-- ✅ 恢复表格正常显示
-- ✅ 删除 `style="display: none"`
-- ✅ 显示待审批申请数据
-
-#### 修改点3：恢复查询功能
-```javascript
-// 🔴 修改前：显示提示信息
-const getPendingList = async () => {
-  ElMessage.info('请使用标准工作流待办页面查看审批任务');
-  pendingList.value = [];
-};
-
-// ✅ 修改后：正常查询数据
-const getPendingList = async () => {
-  pendingLoading.value = true;
-  try {
-    const response = await apiGetPendingList(pendingQueryParams);
-    if (response.code === 200) {
-      pendingList.value = response.rows || [];
-      pendingTotal.value = response.total || 0;
-    } else {
-      ElMessage.error(response.msg || '获取数据失败');
-    }
-  } catch (error) {
-    console.error('获取待审批列表失败', error);
-    ElMessage.error('获取数据失败，请稍后重试');
-  } finally {
-    pendingLoading.value = false;
-  }
-};
-```
-
-**修改说明**：
-- ✅ 调用真实API接口
-- ✅ 处理loading状态
-- ✅ 显示查询结果或错误提示
-
-#### 修改点4：恢复查询和重置按钮功能
-```javascript
-// 查询按钮
-const handlePendingQuery = () => {
-  pendingQueryParams.pageNum = 1;
-  getPendingList();
-};
-
-// 重置按钮
-const resetPendingQuery = () => {
-  pendingQueryParams.pageNum = 1;
-  pendingQueryParams.applicantName = undefined;
-  pendingQueryParams.department = undefined;
-  pendingQueryParams.destination = undefined;
-  pendingQueryParams.approvalLevel = undefined;
-  getPendingList();
-};
-```
-
-**修改说明**：
-- ✅ 恢复正常的查询功能
-- ✅ 恢复正常的重置功能
-- ❌ 删除工作流跳转提示
-
-#### 修改点5：添加功能说明
-```vue
-<el-col :span="1.5">
-  <div class="info-text">
-    <el-icon><InfoFilled /></el-icon>
-    <span>这里显示您提交的待审批申请</span>
-  </div>
-</el-col>
-```
-
-**修改说明**：
-- ✅ 在操作按钮区域添加功能说明
-- ✅ 明确告知用户这里只显示自己提交的申请
-- ✅ 添加对应的CSS样式
-
----
-
-## 🎨 UI变化
-
-### 修改前
-```
-[Alert提示框：功能迁移通知]
-[前往待办任务页面按钮]
-[Empty: 请使用标准工作流待办页面]
-```
-
-### 修改后
-```
-[搜索条件]
-[刷新按钮] [ℹ️ 这里显示您提交的待审批申请]
-[数据表格：显示待审批申请列表]
-[分页组件]
-```
-
----
-
-## 🔍 数据过滤逻辑
-
-### 待审批选项卡
-```sql
-SELECT * FROM rs_overseas_application
-WHERE status = '0'                    -- 待审核状态
-  AND applicant_id = {当前用户ID}     -- 🔴 只查询当前用户提交的
-  AND deleted = '0'
-  AND tenant_id = {租户ID}
-ORDER BY apply_time DESC
-```
-
-### 审批完成选项卡
-```sql
-SELECT * FROM rs_overseas_application
-WHERE status = '1'                    -- 已通过状态
-  AND applicant_id = {当前用户ID}     -- 🔴 只查询当前用户提交的
-  AND deleted = '0'
-  AND tenant_id = {租户ID}
-ORDER BY apply_time DESC
-```
-
----
-
-## 🧪 测试验证
-
-### 测试场景1：待审批选项卡
-
-**测试步骤**：
-1. 使用用户A登录系统
-2. 提交一个出国申请
-3. 访问"出国申请进度查询"菜单
-4. 切换到"待审批中"选项卡
-
-**预期结果**：
-- ✅ 能看到刚才提交的申请记录
-- ✅ 显示当前审批环节和审批人
-- ✅ 点击"查看详情"能查看审批历史
-
-**测试步骤2**：
-1. 使用用户B登录系统
-2. 访问"出国申请进度查询"菜单
-3. 切换到"待审批中"选项卡
-
-**预期结果**：
-- ✅ 只能看到用户B提交的申请
-- ❌ 看不到用户A提交的申请
-
-### 测试场景2：审批完成选项卡
-
-**测试步骤**：
-1. 使用用户A登录系统
-2. 提交一个出国申请
-3. 完成全部审批流程
-4. 访问"出国申请进度查询"菜单
-5. 切换到"审批完成"选项卡
-
-**预期结果**：
-- ✅ 能看到刚才审批完成的申请（抄送）
-- ✅ 显示完整的审批历史记录
-- ✅ 能查看关联的出国记录信息
-
-### 测试场景3：搜索功能
-
-**测试步骤**：
-1. 在"待审批中"选项卡输入搜索条件
-2. 点击"搜索"按钮
-
-**预期结果**：
-- ✅ 能正常搜索并返回结果
-- ✅ 结果仍然只包含当前用户提交的申请
-
----
-
-## 📊 修改文件清单
-
-| 序号 | 文件类型 | 文件路径 | 修改内容 | 状态 |
-|------|---------|---------|---------|------|
-| 1 | 后端Service | `RsOverseasApprovalMonitorServiceImpl.java` | 添加当前用户过滤条件 | ✅ |
-| 2 | 后端Controller | `RsOverseasApprovalMonitorController.java` | 恢复pending接口功能 | ✅ |
-| 3 | 前端页面 | `monitor/index.vue` | 删除工作流提示，恢复表格显示 | ✅ |
-| 4 | 前端脚本 | `monitor/index.vue` | 恢复查询、重置功能 | ✅ |
-
----
-
-## ⚠️ 注意事项
-
-### 1. 权限要求
-- 用户需要有 `rs:overseas:list` 权限才能访问此菜单
-- 用户需要有 `rs:overseas:query` 权限才能查看详情
-
-### 2. 数据范围
-- **待审批选项卡**：只显示当前用户提交的待审核申请
-- **审批完成选项卡**：只显示当前用户提交的已完成申请
-- 不会显示其他用户提交的申请
-
-### 3. 与其他模块的关系
-- **出国申请**：用户在这里提交申请
-- **出国审批**：审批人在这里审批申请
-- **出国记录**：审批完成后，申请人在这里查看出国记录
-- **出国申请进度查询**：申请人在这里查看申请进度（当前模块）
-
----
-
-## 🚀 部署说明
-
-### 后端部署
-```bash
-cd backend
-mvn clean package -pl ruoyi-admin -am -DskipTests
-./stop-main.sh
-./start-main.sh
-```
-
-### 前端部署
-```bash
-cd web
-npm run build
-# 将dist目录部署到nginx
-```
-
-### 验证步骤
-1. 清除浏览器缓存
-2. 重新登录系统
-3. 访问"出国申请进度查询"菜单
-4. 确认功能正常
-
----
-
-## ✅ 验收标准
-
-- [ ] 待审批选项卡只显示当前用户提交的待审批申请
-- [ ] 审批完成选项卡只显示当前用户提交的已完成审批申请
-- [ ] 搜索功能正常工作
-- [ ] 重置功能正常工作
-- [ ] 查看详情能显示审批历史
-- [ ] 不会显示其他用户的申请
-- [ ] UI显示正常，无工作流迁移提示
-
----
-
-## 📞 问题反馈
-
-如有问题，请检查：
-1. 后端日志：`backend/logs/sys-info.log`
-2. 浏览器控制台：F12查看网络请求和错误
-3. 确认用户权限配置正确
-
----
-
-**文档版本**：v1.0  
-**最后更新**：2025-10-29  
-**修改人员**：Cursor AI
-
diff --git a/web/src/views/rs/overseas/monitor/审批环节命名标准分析报告.md b/web/src/views/rs/overseas/monitor/审批环节命名标准分析报告.md
deleted file mode 100644
index 7af41696..00000000
--- a/web/src/views/rs/overseas/monitor/审批环节命名标准分析报告.md
+++ /dev/null
@@ -1,411 +0,0 @@
-# 出国申请审批环节命名标准分析报告
-
-## 📋 问题发现
-
-在分析代码时，发现系统中**存在两套不同的审批级别命名标准**：
-
-1. **出国申请进度查询模块**：使用**3级审批**命名
-2. **出国申请审批模块**：使用**5级审批**命名
-
-这导致**命名不一致**的问题。
-
----
-
-## 🔍 详细分析
-
-### 一、出国申请进度查询模块（monitor）
-
-**文件位置**：`RsOverseasApprovalMonitorServiceImpl.java`
-
-**当前定义**（第390-404行）：
-```java
-private String getApprovalLevelText(String level) {
-    if (level == null) {
-        return "未开始";
-    }
-    switch (level) {
-        case "1":
-            return "部门主管审批";
-        case "2":
-            return "分管领导审批";
-        case "3":
-            return "校领导审批";
-        default:
-            return "未知";
-    }
-}
-```
-
-**问题**：
-- ❌ 只定义了3个级别
-- ❌ Level 4 和 Level 5 会显示为"未知"
-- ❌ 命名与实际审批流程不符
-
----
-
-### 二、出国申请审批模块（application）
-
-**文件位置**：`RsOverseasApplicationServiceImpl.java`
-
-**当前定义**（第1269-1283行）：
-```java
-private String getApprovalLevelDescription(String approvalLevel) {
-    switch (approvalLevel) {
-        case "1":
-            return "待部门负责人审批";
-        case "2":
-            return "待人事处审批";
-        case "3":
-            return "待纪委审批";
-        case "4":
-            return "待学院分管领导审批";
-        case "5":
-            return "待学院党委书记审批";
-        default:
-            return "待审批";
-    }
-}
-```
-
-**流转逻辑**（第683-698行）：
-```java
-/**
- * 获取下一级审批级别
- * 五级审批制度：1-部门负责人，2-人事处，3-纪委，4-学院分管领导，5-学院党委书记
- */
-private String getNextApprovalLevel(String currentLevel) {
-    switch (currentLevel) {
-        case "1":
-            return "2"; // 部门负责人 → 人事处
-        case "2":
-            return "3"; // 人事处 → 纪委
-        case "3":
-            return "4"; // 纪委 → 学院分管领导
-        case "4":
-            return "5"; // 学院分管领导 → 学院党委书记
-        case "5":
-            return null; // 学院党委书记 → 审批完成
-        default:
-            return null;
-    }
-}
-```
-
----
-
-## 📊 标准审批级别定义
-
-### 完整的五级审批制度
-
-| 审批级别 | 数据库值 | 权限标识 | 审批环节名称 | 当前审批人显示 | 说明 |
-|---------|---------|---------|------------|--------------|------|
-| **Level 1** | `"1"` | `rs:overseas:approve1` | **部门负责人审批** | 待部门负责人审批 | 只能看到本部门的申请 |
-| **Level 2** | `"2"` | `rs:overseas:approve2` | **人事处审批** | 待人事处审批 | 可以看到所有部门的申请 |
-| **Level 3** | `"3"` | `rs:overseas:approve3` | **纪委审批** | 待纪委审批 | 可以看到所有部门的申请 |
-| **Level 4** | `"4"` | `rs:overseas:approve4` | **学院分管领导审批** | 待学院分管领导审批 | 可以看到所有部门的申请 |
-| **Level 5** | `"5"` | `rs:overseas:approve5` | **学院党委书记审批** | 待学院党委书记审批 | 可以看到所有部门的申请 |
-
----
-
-## 🎯 审批流程完整流转
-
-### 流程图
-```
-申请提交
-    ↓
-┌─────────────────────────────────┐
-│ Level 1: 部门负责人审批          │
-│ - 审批人：各部门负责人            │
-│ - 权限：rs:overseas:approve1     │
-│ - 范围：仅本部门申请              │
-└─────────────────────────────────┘
-    ↓ (审批通过)
-┌─────────────────────────────────┐
-│ Level 2: 人事处审批              │
-│ - 审批人：人事处工作人员          │
-│ - 权限：rs:overseas:approve2     │
-│ - 范围：所有部门申请              │
-└─────────────────────────────────┘
-    ↓ (审批通过)
-┌─────────────────────────────────┐
-│ Level 3: 纪委审批                │
-│ - 审批人：纪委工作人员            │
-│ - 权限：rs:overseas:approve3     │
-│ - 范围：所有部门申请              │
-└─────────────────────────────────┘
-    ↓ (审批通过)
-┌─────────────────────────────────┐
-│ Level 4: 学院分管领导审批        │
-│ - 审批人：学院分管领导            │
-│ - 权限：rs:overseas:approve4     │
-│ - 范围：所有部门申请              │
-└─────────────────────────────────┘
-    ↓ (审批通过)
-┌─────────────────────────────────┐
-│ Level 5: 学院党委书记审批        │
-│ - 审批人：学院党委书记            │
-│ - 权限：rs:overseas:approve5     │
-│ - 范围：所有部门申请              │
-└─────────────────────────────────┘
-    ↓ (审批通过)
-申请完成 → 生成出国记录
-```
-
----
-
-## 📝 各字段的具体命名标准
-
-### 1. **当前审批环节**（approval_level字段）
-
-**数据库字段**：`approval_level VARCHAR(10)`
-
-**标准命名**（用于显示）：
-```java
-switch (approvalLevel) {
-    case "1": return "部门负责人审批";
-    case "2": return "人事处审批";
-    case "3": return "纪委审批";
-    case "4": return "学院分管领导审批";
-    case "5": return "学院党委书记审批";
-    default:  return "未知";
-}
-```
-
-### 2. **当前审批人**（current_approver字段）
-
-**数据库字段**：`current_approver VARCHAR(100)`
-
-**标准命名格式**：
-```java
-switch (approvalLevel) {
-    case "1": return "待部门负责人审批";
-    case "2": return "待人事处审批";
-    case "3": return "待纪委审批";
-    case "4": return "待学院分管领导审批";
-    case "5": return "待学院党委书记审批";
-    default:  return "待审批";
-}
-```
-
-**特殊情况**：
-- 如果是部门负责人级别，可能显示：`"待指定部门负责人"` 或 `"待{具体审批人姓名}审批"`
-- 其他级别通常显示：`"待{审批环节}审批"`
-
-### 3. **审批进度**（用于进度查询）
-
-**显示格式**：`"已审批级别数/总级别数"`
-
-**示例**：
-- `"0/5"` - 未开始审批
-- `"1/5"` - 部门负责人已审批
-- `"2/5"` - 人事处已审批
-- `"3/5"` - 纪委已审批
-- `"4/5"` - 学院分管领导已审批
-- `"5/5"` - 全部审批完成
-
----
-
-## 🔧 数据库定义
-
-### rs_overseas_application表字段
-
-```sql
--- 审批级别字段
-`approval_level` varchar(10) DEFAULT '1' 
-COMMENT '当前审批级别：1-部门负责人，2-人事处，3-纪委，4-学院分管领导，5-学院党委书记'
-
--- 当前审批人字段
-`current_approver` varchar(100) DEFAULT NULL 
-COMMENT '当前审批人姓名或环节描述'
-
--- 当前审批人ID字段（冗余字段，仅供参考）
-`current_approver_id` bigint DEFAULT NULL 
-COMMENT '当前审批人ID（冗余字段）'
-```
-
----
-
-## 🎨 前端显示示例
-
-### 待审批列表显示
-
-| 申请人 | 所属部门 | 当前审批环节 | 当前审批人 | 审批进度 |
-|--------|---------|-------------|-----------|---------|
-| 张三 | 教务处 | 部门负责人审批 | 待部门负责人审批 | 0% (0/5) |
-| 李四 | 人事处 | 人事处审批 | 待人事处审批 | 20% (1/5) |
-| 王五 | 学工处 | 纪委审批 | 待纪委审批 | 40% (2/5) |
-| 赵六 | 后勤处 | 学院分管领导审批 | 待学院分管领导审批 | 60% (3/5) |
-| 钱七 | 财务处 | 学院党委书记审批 | 待学院党委书记审批 | 80% (4/5) |
-
-### 审批历史记录显示
-
-```
-📋 审批历史
-
-✅ 第1级：部门负责人审批
-   审批人：张主任
-   审批时间：2025-10-27 10:30:25
-   审批结果：通过
-   审批意见：同意出国交流
-
-✅ 第2级：人事处审批
-   审批人：李处长
-   审批时间：2025-10-27 14:20:15
-   审批结果：通过
-   审批意见：人事档案无问题，同意
-
-⏳ 第3级：纪委审批
-   状态：待审批
-
-⏸️ 第4级：学院分管领导审批
-   状态：未到审批阶段
-
-⏸️ 第5级：学院党委书记审批
-   状态：未到审批阶段
-```
-
----
-
-## ⚠️ 当前存在的问题
-
-### 问题1：命名不统一
-
-**问题描述**：
-- `RsOverseasApprovalMonitorServiceImpl.java` 中只定义了3个级别
-- 与实际的5级审批流程不符
-
-**影响范围**：
-- 出国申请进度查询菜单的"当前审批环节"显示
-- Level 4 和 Level 5 会显示为"未知"
-
-**解决方案**：
-需要修改 `getApprovalLevelText()` 方法，添加完整的5级定义
-
-### 问题2：总审批级别数设置错误
-
-**问题位置**：`RsOverseasApprovalMonitorServiceImpl.java` 第345-346行
-
-```java
-// 总审批级别数（假设最多3级：部门主管、分管领导、校领导）
-vo.setTotalLevels(3);
-```
-
-**问题**：
-- 实际是5级审批，但这里设置为3级
-- 导致审批进度显示错误（如：2/3 而不是 2/5）
-
-**影响**：
-- 审批进度百分比计算错误
-- 进度条显示不准确
-
----
-
-## ✅ 建议的标准命名
-
-### 统一的命名标准
-
-| 级别 | 简称 | 完整名称 | 待审批显示 | 已审批显示 |
-|------|------|---------|-----------|-----------|
-| 1 | 部门负责人 | 部门负责人审批 | 待部门负责人审批 | 部门负责人已审批 |
-| 2 | 人事处 | 人事处审批 | 待人事处审批 | 人事处已审批 |
-| 3 | 纪委 | 纪委审批 | 待纪委审批 | 纪委已审批 |
-| 4 | 学院分管领导 | 学院分管领导审批 | 待学院分管领导审批 | 学院分管领导已审批 |
-| 5 | 学院党委书记 | 学院党委书记审批 | 待学院党委书记审批 | 学院党委书记已审批 |
-
-### 代码实现建议
-
-```java
-/**
- * 获取审批级别完整名称（用于"当前审批环节"列）
- */
-private String getApprovalLevelText(String level) {
-    if (level == null) {
-        return "未开始";
-    }
-    switch (level) {
-        case "1":
-            return "部门负责人审批";
-        case "2":
-            return "人事处审批";
-        case "3":
-            return "纪委审批";
-        case "4":
-            return "学院分管领导审批";
-        case "5":
-            return "学院党委书记审批";
-        default:
-            return "未知";
-    }
-}
-
-/**
- * 获取当前审批人显示文本（用于"当前审批人"列）
- */
-private String getCurrentApproverText(String level) {
-    if (level == null) {
-        return "未指定";
-    }
-    switch (level) {
-        case "1":
-            return "待部门负责人审批";
-        case "2":
-            return "待人事处审批";
-        case "3":
-            return "待纪委审批";
-        case "4":
-            return "待学院分管领导审批";
-        case "5":
-            return "待学院党委书记审批";
-        default:
-            return "待审批";
-    }
-}
-```
-
----
-
-## 📋 总结
-
-### 当前审批级别定义
-
-**完整的五级审批体系**：
-
-1. **Level 1 - 部门负责人审批**
-   - 权限：`rs:overseas:approve1`
-   - 范围：仅本部门申请
-   - 显示：部门负责人审批
-
-2. **Level 2 - 人事处审批**
-   - 权限：`rs:overseas:approve2`
-   - 范围：所有部门申请
-   - 显示：人事处审批
-
-3. **Level 3 - 纪委审批**
-   - 权限：`rs:overseas:approve3`
-   - 范围：所有部门申请
-   - 显示：纪委审批
-
-4. **Level 4 - 学院分管领导审批**
-   - 权限：`rs:overseas:approve4`
-   - 范围：所有部门申请
-   - 显示：学院分管领导审批
-
-5. **Level 5 - 学院党委书记审批**
-   - 权限：`rs:overseas:approve5`
-   - 范围：所有部门申请
-   - 显示：学院党委书记审批
-
-### 关键注意事项
-
-- ✅ 系统使用**5级审批制度**
-- ✅ 只有**部门负责人（Level 1）**需要部门过滤
-- ✅ **Level 2-5** 可以看到所有部门的申请
-- ⚠️ 出国申请进度查询模块存在命名不一致问题
-- ⚠️ 总审批级别数应该是5而不是3
-
----
-
-**分析完成时间**：2025-10-29  
-**分析人员**：Cursor AI  
-**文档版本**：v1.0
-
diff --git a/web/src/views/rs/overseas/monitor/审批级别修复说明.md b/web/src/views/rs/overseas/monitor/审批级别修复说明.md
deleted file mode 100644
index cb775903..00000000
--- a/web/src/views/rs/overseas/monitor/审批级别修复说明.md
+++ /dev/null
@@ -1,286 +0,0 @@
-# 出国申请进度查询 - 审批级别修复说明
-
-## 🔧 修复时间
-2025-10-29
-
-## 🎯 修复目标
-将出国申请进度查询模块从3级审批改为完整的5级审批，与实际审批流程保持一致。
-
----
-
-## 📝 修复内容
-
-### 修复1：更新审批级别文本定义
-
-**文件**：`RsOverseasApprovalMonitorServiceImpl.java`  
-**方法**：`getApprovalLevelText(String level)`
-
-#### 修复前
-```java
-switch (level) {
-    case "1":
-        return "部门主管审批";
-    case "2":
-        return "分管领导审批";
-    case "3":
-        return "校领导审批";
-    default:
-        return "未知";
-}
-```
-
-**问题**：
-- ❌ Level 4 和 Level 5 显示为"未知"
-- ❌ 命名与实际流程不符
-
-#### 修复后
-```java
-/**
- * 获取审批级别文本
- * 五级审批制度：1-部门负责人，2-人事处，3-纪委，4-学院分管领导，5-学院党委书记
- */
-switch (level) {
-    case "1":
-        return "部门负责人审批";
-    case "2":
-        return "人事处审批";
-    case "3":
-        return "纪委审批";
-    case "4":
-        return "学院分管领导审批";
-    case "5":
-        return "学院党委书记审批";
-    default:
-        return "未知";
-}
-```
-
-**改进**：
-- ✅ 支持完整的5级审批
-- ✅ 命名与实际流程一致
-- ✅ 添加了详细的注释说明
-
----
-
-### 修复2：更新总审批级别数
-
-**文件**：`RsOverseasApprovalMonitorServiceImpl.java`  
-**方法**：`fillApprovalProgress()`
-
-#### 修复前
-```java
-// 总审批级别数（假设最多3级：部门主管、分管领导、校领导）
-vo.setTotalLevels(3);
-
-// 未开始审批
-vo.setApprovedLevels(0);
-vo.setTotalLevels(3);
-vo.setApprovalProgress("0/3");
-```
-
-**问题**：
-- ❌ 总级别数设置为3
-- ❌ 审批进度显示错误（如：2/3 而不是 2/5）
-- ❌ 进度百分比计算错误
-
-#### 修复后
-```java
-// 总审批级别数（五级审批制度：部门负责人、人事处、纪委、学院分管领导、学院党委书记）
-vo.setTotalLevels(5);
-
-// 未开始审批
-vo.setApprovedLevels(0);
-vo.setTotalLevels(5);
-vo.setApprovalProgress("0/5");
-```
-
-**改进**：
-- ✅ 总级别数正确设置为5
-- ✅ 审批进度显示正确
-- ✅ 进度百分比计算准确
-
----
-
-### 修复3：更新统计信息定义
-
-**文件**：`RsOverseasApprovalMonitorServiceImpl.java`  
-**方法**：`getApprovalStatistics()`
-
-#### 修复前
-```java
-// 2. 各审批级别的待审批数量
-Map<String, Long> pendingByLevel = new HashMap<>();
-pendingByLevel.put("level1", countByStatusAndLevel("0", "1", tenantId)); // 部门主管
-pendingByLevel.put("level2", countByStatusAndLevel("0", "2", tenantId)); // 分管领导
-pendingByLevel.put("level3", countByStatusAndLevel("0", "3", tenantId)); // 校领导
-statistics.put("pendingByLevel", pendingByLevel);
-```
-
-**问题**：
-- ❌ 只统计3个级别
-- ❌ Level 4 和 Level 5 的统计缺失
-
-#### 修复后
-```java
-// 2. 各审批级别的待审批数量（五级审批制度）
-Map<String, Long> pendingByLevel = new HashMap<>();
-pendingByLevel.put("level1", countByStatusAndLevel("0", "1", tenantId)); // 部门负责人
-pendingByLevel.put("level2", countByStatusAndLevel("0", "2", tenantId)); // 人事处
-pendingByLevel.put("level3", countByStatusAndLevel("0", "3", tenantId)); // 纪委
-pendingByLevel.put("level4", countByStatusAndLevel("0", "4", tenantId)); // 学院分管领导
-pendingByLevel.put("level5", countByStatusAndLevel("0", "5", tenantId)); // 学院党委书记
-statistics.put("pendingByLevel", pendingByLevel);
-```
-
-**改进**：
-- ✅ 统计所有5个级别
-- ✅ 统计数据完整准确
-- ✅ 命名规范一致
-
----
-
-## 📊 修复效果对比
-
-### 1. 当前审批环节显示
-
-| 审批级别 | 修复前 | 修复后 | 状态 |
-|---------|--------|--------|------|
-| Level 1 | 部门主管审批 | 部门负责人审批 | ✅ 已修正 |
-| Level 2 | 分管领导审批 | 人事处审批 | ✅ 已修正 |
-| Level 3 | 校领导审批 | 纪委审批 | ✅ 已修正 |
-| Level 4 | **未知** ❌ | 学院分管领导审批 | ✅ 已修复 |
-| Level 5 | **未知** ❌ | 学院党委书记审批 | ✅ 已修复 |
-
-### 2. 审批进度显示
-
-| 已审批级别 | 修复前 | 修复后 | 进度百分比（修复前） | 进度百分比（修复后） |
-|-----------|--------|--------|-------------------|-------------------|
-| 0级 | 0/3 | 0/5 | 0% | 0% |
-| 1级 | 1/3 | 1/5 | 33% ❌ | 20% ✅ |
-| 2级 | 2/3 | 2/5 | 67% ❌ | 40% ✅ |
-| 3级 | 3/3 | 3/5 | 100% ❌ | 60% ✅ |
-| 4级 | - | 4/5 | - | 80% ✅ |
-| 5级 | - | 5/5 | - | 100% ✅ |
-
-### 3. 统计信息
-
-| 统计项 | 修复前 | 修复后 |
-|--------|--------|--------|
-| 统计级别数 | 3个 | 5个 ✅ |
-| Level 4统计 | ❌ 缺失 | ✅ 包含 |
-| Level 5统计 | ❌ 缺失 | ✅ 包含 |
-
----
-
-## 🎨 前端显示效果
-
-### 待审批列表示例
-
-#### 修复前
-| 申请人 | 当前审批环节 | 审批进度 |
-|--------|-------------|---------|
-| 张三 | 部门主管审批 | 0/3 (0%) |
-| 李四 | 分管领导审批 | 1/3 (33%) |
-| 王五 | 校领导审批 | 2/3 (67%) |
-| 赵六 | **未知** ❌ | 3/3 (100%) ❌ |
-| 钱七 | **未知** ❌ | - |
-
-#### 修复后
-| 申请人 | 当前审批环节 | 审批进度 |
-|--------|-------------|---------|
-| 张三 | 部门负责人审批 | 0/5 (0%) |
-| 李四 | 人事处审批 | 1/5 (20%) |
-| 王五 | 纪委审批 | 2/5 (40%) |
-| 赵六 | 学院分管领导审批 ✅ | 3/5 (60%) ✅ |
-| 钱七 | 学院党委书记审批 ✅ | 4/5 (80%) ✅ |
-
----
-
-## ✅ 修复验证
-
-### 验证步骤
-
-1. **重新编译后端**
-```bash
-cd backend
-mvn clean package -pl ruoyi-admin -am -DskipTests
-```
-
-2. **重启后端服务**
-```bash
-./stop-main.sh
-./start-main.sh
-```
-
-3. **登录系统测试**
-   - 访问"出国申请进度查询"菜单
-   - 查看待审批中和审批完成选项卡
-   - 验证以下内容：
-
-#### 验证项1：当前审批环节显示
-- [ ] Level 1 显示为"部门负责人审批"
-- [ ] Level 2 显示为"人事处审批"
-- [ ] Level 3 显示为"纪委审批"
-- [ ] Level 4 显示为"学院分管领导审批"（不再是"未知"）
-- [ ] Level 5 显示为"学院党委书记审批"（不再是"未知"）
-
-#### 验证项2：审批进度显示
-- [ ] 未审批显示：0/5 (0%)
-- [ ] 部门负责人已审批：1/5 (20%)
-- [ ] 人事处已审批：2/5 (40%)
-- [ ] 纪委已审批：3/5 (60%)
-- [ ] 学院分管领导已审批：4/5 (80%)
-- [ ] 学院党委书记已审批：5/5 (100%)
-
-#### 验证项3：统计信息
-- [ ] 统计信息包含所有5个级别
-- [ ] Level 4 和 Level 5 的统计数据正常显示
-
----
-
-## 📋 修改文件清单
-
-| 序号 | 文件 | 修改内容 | 行数 | 状态 |
-|------|------|---------|------|------|
-| 1 | `RsOverseasApprovalMonitorServiceImpl.java` | 更新审批级别文本定义 | 387-404 | ✅ |
-| 2 | `RsOverseasApprovalMonitorServiceImpl.java` | 更新总审批级别数（已审批） | 345-346 | ✅ |
-| 3 | `RsOverseasApprovalMonitorServiceImpl.java` | 更新总审批级别数（未审批） | 358-360 | ✅ |
-| 4 | `RsOverseasApprovalMonitorServiceImpl.java` | 更新统计信息定义 | 152-157 | ✅ |
-
----
-
-## 🎯 修复总结
-
-### 修复前的问题
-- ❌ 只支持3级审批，Level 4和5显示"未知"
-- ❌ 总审批级别数错误（3而不是5）
-- ❌ 审批进度百分比计算错误
-- ❌ 统计信息不完整
-
-### 修复后的改进
-- ✅ 完整支持5级审批流程
-- ✅ 所有审批级别正确显示
-- ✅ 审批进度计算准确
-- ✅ 统计信息完整
-- ✅ 与实际业务流程一致
-
-### 影响范围
-- ✅ 仅修改出国申请进度查询模块
-- ✅ 不影响其他模块
-- ✅ 向后兼容
-
----
-
-## 📞 相关文档
-
-- 详细分析报告：`审批环节命名标准分析报告.md`
-- 功能修改说明：`出国申请进度查询功能修改说明.md`
-- 权限修改说明：`权限修改说明.md`
-
----
-
-**修复状态**：✅ 已完成  
-**需要操作**：重新编译和重启后端服务  
-**版本**：v1.2  
-**最后更新**：2025-10-29
-
diff --git a/web/src/views/rs/overseas/monitor/权限修改说明.md b/web/src/views/rs/overseas/monitor/权限修改说明.md
deleted file mode 100644
index 1c6b0326..00000000
--- a/web/src/views/rs/overseas/monitor/权限修改说明.md
+++ /dev/null
@@ -1,183 +0,0 @@
-# 出国申请进度查询权限修改说明
-
-## 📋 修改时间
-2025-10-29
-
-## 🎯 修改目的
-将"出国申请进度查询"从"只能查看自己提交的申请"改为"拥有权限的用户可以查看所有申请"
-
----
-
-## 📝 修改内容
-
-### 1. 后端Service层修改
-
-**文件**：`RsOverseasApprovalMonitorServiceImpl.java`
-
-#### 修改前
-```java
-// 只查询当前用户提交的申请
-Long currentUserId = LoginHelper.getUserId();
-wrapper.eq("applicant_id", currentUserId);
-```
-
-#### 修改后
-```java
-// 不再限制申请人，拥有权限的用户可以看到所有数据
-// 已删除 applicant_id 过滤条件
-```
-
-**影响方法**：
-- ✅ `queryPendingList()` - 待审批列表
-- ✅ `queryCompletedList()` - 已完成列表
-
----
-
-### 2. 后端Controller层修改
-
-**文件**：`RsOverseasApprovalMonitorController.java`
-
-#### 修改点
-- 更新注释说明：从"当前用户提交的"改为"所有"
-- 更新日志输出：从"当前用户的"改为"所有"
-
----
-
-### 3. 前端页面修改
-
-**文件**：`monitor/index.vue`
-
-#### 修改点
-- 提示文字：从"这里显示您提交的"改为"这里显示所有"
-
----
-
-## 🔍 权限控制
-
-### 访问控制
-- **权限标识**：`rs:overseas:list`
-- **控制级别**：拥有此权限的用户可以查看所有数据
-- **数据范围**：不再限制申请人，显示所有待审批和已完成的申请
-
-### 查询逻辑
-```sql
--- 待审批列表
-SELECT * FROM rs_overseas_application
-WHERE status = '0'              -- 待审核状态
-  AND deleted = '0'
-  AND tenant_id = {租户ID}
-ORDER BY apply_time DESC
-
--- 已完成列表  
-SELECT * FROM rs_overseas_application
-WHERE status = '1'              -- 已通过状态
-  AND deleted = '0'
-  AND tenant_id = {租户ID}
-ORDER BY apply_time DESC
-```
-
----
-
-## ✅ 修改对比
-
-| 项目 | 修改前 | 修改后 |
-|------|--------|--------|
-| 数据范围 | 当前用户提交的申请 | 所有申请 |
-| 权限要求 | rs:overseas:list | rs:overseas:list（不变） |
-| 查询条件 | applicant_id = 当前用户ID | 无申请人限制 |
-| 用户体验 | 只能看到自己的 | 可以看到所有 |
-
----
-
-## 🧪 测试验证
-
-### 测试场景1：查看待审批列表
-
-**测试步骤**：
-1. 用户A登录系统（拥有 rs:overseas:list 权限）
-2. 访问"出国申请进度查询"菜单
-3. 切换到"待审批中"选项卡
-
-**预期结果**：
-- ✅ 能看到所有用户提交的待审批申请
-- ✅ 包括用户A自己提交的和其他用户提交的
-
-### 测试场景2：查看已完成列表
-
-**测试步骤**：
-1. 用户A登录系统（拥有 rs:overseas:list 权限）
-2. 访问"出国申请进度查询"菜单
-3. 切换到"审批完成"选项卡
-
-**预期结果**：
-- ✅ 能看到所有已完成审批的申请
-- ✅ 不限制申请人
-
-### 测试场景3：无权限用户
-
-**测试步骤**：
-1. 用户B登录系统（没有 rs:overseas:list 权限）
-2. 尝试访问"出国申请进度查询"菜单
-
-**预期结果**：
-- ❌ 无法访问该菜单（权限控制在菜单级别）
-
----
-
-## 📊 修改文件清单
-
-| 序号 | 文件类型 | 文件路径 | 修改内容 | 状态 |
-|------|---------|---------|---------|------|
-| 1 | 后端Service | `RsOverseasApprovalMonitorServiceImpl.java` | 删除申请人ID过滤 | ✅ |
-| 2 | 后端Controller | `RsOverseasApprovalMonitorController.java` | 更新注释和日志 | ✅ |
-| 3 | 前端页面 | `monitor/index.vue` | 更新提示文字 | ✅ |
-
----
-
-## ⚠️ 注意事项
-
-### 1. 权限配置
-- 确保只有需要查看所有数据的用户才有 `rs:overseas:list` 权限
-- 如果需要区分不同权限级别，建议创建新的权限标识
-
-### 2. 数据安全
-- 所有查询仍然受租户ID限制
-- 不会跨租户显示数据
-
-### 3. 性能考虑
-- 查询所有数据时，建议使用搜索条件过滤
-- 分页显示可以减轻服务器压力
-
----
-
-## 🚀 部署说明
-
-### 后端部署
-```bash
-cd backend
-mvn clean package -pl ruoyi-admin -am -DskipTests
-./stop-main.sh
-./start-main.sh
-```
-
-### 前端（如已运行无需重启）
-```bash
-# 前端代码修改后会自动热更新
-# 如需打包部署：
-cd web
-npm run build
-```
-
----
-
-## 📞 相关文档
-
-- 详细修改说明：`出国申请进度查询功能修改说明.md`
-- 快速参考：`修改总结-快速参考.md`
-
----
-
-**修改状态**：✅ 已完成  
-**生效方式**：需要重启后端服务  
-**版本**：v1.1
-