diff --git a/ruoyi-admin/src/main/java/com/ruoyi/web/controller/pdf/controller/LeavePdfController.java b/ruoyi-admin/src/main/java/com/ruoyi/web/controller/pdf/controller/LeavePdfController.java
new file mode 100644
index 00000000..0d0dd110
--- /dev/null
+++ b/ruoyi-admin/src/main/java/com/ruoyi/web/controller/pdf/controller/LeavePdfController.java
@@ -0,0 +1,65 @@
+package com.ruoyi.web.controller.pdf.controller;
+
+
+import com.ruoyi.web.controller.pdf.service.LeavePdfService;
+import org.springframework.http.HttpHeaders;
+import org.springframework.http.MediaType;
+import org.springframework.http.ResponseEntity;
+import org.springframework.web.bind.annotation.PostMapping;
+import org.springframework.web.bind.annotation.RequestMapping;
+import org.springframework.web.bind.annotation.RequestParam;
+import org.springframework.web.bind.annotation.RestController;
+import org.springframework.web.multipart.MultipartFile;
+
+import java.io.ByteArrayOutputStream;
+import java.util.HashMap;
+import java.util.Map;
+
+@RestController
+@RequestMapping("/api/LeavePdf")
+public class LeavePdfController {
+
+    private final LeavePdfService LeavePdfService;
+
+    public LeavePdfController(LeavePdfService LeavePdfService) {
+        this.LeavePdfService = LeavePdfService;
+    }
+
+    @PostMapping(value = "/LeaveFill", consumes = MediaType.MULTIPART_FORM_DATA_VALUE)
+    public ResponseEntity<byte[]> fillPdfForm(
+            @RequestParam(required = false) String  name,
+            @RequestParam(required = false) String  political,
+            @RequestParam(required = false) String  phone,
+            @RequestParam(required = false) String  positionCapacity,
+            @RequestParam(required = false) String  smPost,
+            @RequestParam(required = false) String  smGrade,
+            @RequestParam(required = false) MultipartFile photo) throws Exception {
+
+        // 构建表单数据
+        Map<String, String> formData = new HashMap<>();
+        if (name != null) formData.put("姓名", name);
+        if (political != null) formData.put("政治面貌", political);
+        if (phone != null) formData.put("联系电话", phone);
+        if (positionCapacity != null) formData.put("职务职级", positionCapacity);
+        if (smPost != null) formData.put("涉密岗位", smPost);
+        if (smGrade != null) formData.put("涉密等级", smGrade);
+
+        // 构建图片数据
+        Map<String, MultipartFile> imageData = new HashMap<>();
+        if (photo != null && !photo.isEmpty()) {
+            imageData.put("照片", photo);
+        }
+
+        // 生成PDF
+        ByteArrayOutputStream outputStream = LeavePdfService.fillForm(formData, imageData);
+
+        // 返回PDF文件
+        HttpHeaders headers = new HttpHeaders();
+        headers.setContentType(MediaType.APPLICATION_PDF);
+        headers.setContentDispositionFormData("attachment", "output.pdf");
+
+        return ResponseEntity.ok()
+                .headers(headers)
+                .body(outputStream.toByteArray());
+    }
+}
\ No newline at end of file
diff --git a/ruoyi-admin/src/main/java/com/ruoyi/web/controller/pdf/dto/PdfFormRequest.java b/ruoyi-admin/src/main/java/com/ruoyi/web/controller/pdf/dto/PdfFormRequest.java
deleted file mode 100644
index 5b0457e7..00000000
--- a/ruoyi-admin/src/main/java/com/ruoyi/web/controller/pdf/dto/PdfFormRequest.java
+++ /dev/null
@@ -1,13 +0,0 @@
-package com.ruoyi.web.controller.pdf.dto;
-
-import lombok.Data;
-import org.springframework.web.multipart.MultipartFile;
-
-import java.util.HashMap;
-import java.util.Map;
-
-@Data
-public class PdfFormRequest {
-    private Map<String, String> formData = new HashMap<>();
-    private Map<String, MultipartFile> imageData = new HashMap<>();
-}
\ No newline at end of file
diff --git a/ruoyi-admin/src/main/java/com/ruoyi/web/controller/pdf/service/LeavePdfService.java b/ruoyi-admin/src/main/java/com/ruoyi/web/controller/pdf/service/LeavePdfService.java
new file mode 100644
index 00000000..0377c8b7
--- /dev/null
+++ b/ruoyi-admin/src/main/java/com/ruoyi/web/controller/pdf/service/LeavePdfService.java
@@ -0,0 +1,177 @@
+package com.ruoyi.web.controller.pdf.service;
+
+import org.apache.pdfbox.pdmodel.PDDocument;
+import org.apache.pdfbox.pdmodel.PDPage;
+import org.apache.pdfbox.pdmodel.PDPageContentStream;
+import org.apache.pdfbox.pdmodel.font.PDType0Font;
+import org.apache.pdfbox.pdmodel.graphics.image.PDImageXObject;
+import org.apache.pdfbox.pdmodel.interactive.form.PDAcroForm;
+import org.apache.pdfbox.pdmodel.interactive.form.PDField;
+import org.apache.pdfbox.pdmodel.interactive.form.PDTextField;
+import org.springframework.stereotype.Service;
+import org.springframework.web.multipart.MultipartFile;
+
+import java.io.ByteArrayOutputStream;
+import java.io.File;
+import java.io.IOException;
+import java.util.Map;
+
+@Service
+public class LeavePdfService {
+
+    // 定义最大和最小字体大小，用于动态调整
+    private static final float MAX_FONT_SIZE = 14;
+    private static final float MIN_FONT_SIZE = 8;
+    // 需要特殊处理的字段列表
+    private static final String[] AUTO_WRAP_FIELDS = {
+
+    };
+
+    public ByteArrayOutputStream fillForm(Map<String, String> formData,
+                                          Map<String, MultipartFile> imageData) throws IOException {
+        // 禁用系统字体扫描，只使用自定义字体
+        System.setProperty("org.apache.pdfbox.rendering.UseSystemFonts", "false");
+        // 提高字体解析警告的日志级别
+        System.setProperty("org.apache.commons.logging.Log", "org.apache.commons.logging.impl.SimpleLog");
+        System.setProperty("org.apache.commons.logging.simplelog.log.org.apache.fontbox", "ERROR");
+
+        PDDocument document = null;
+        ByteArrayOutputStream outputStream = new ByteArrayOutputStream();
+
+        try {
+            // 加载模板PDF
+            ClassLoader classLoader = getClass().getClassLoader();
+            File templateFile = new File(classLoader.getResource("static/file/pdf/smrylzlgspb.pdf").getFile());
+            document = PDDocument.load(templateFile);
+            PDAcroForm acroForm = document.getDocumentCatalog().getAcroForm();
+
+            if (acroForm == null) {
+                throw new IOException("PDF不包含表单域");
+            }
+
+            // 加载中文字体
+            PDType0Font font = PDType0Font.load(document,
+                    new File(classLoader.getResource("static/file/pdf/STSONG.TTF").getFile()));
+
+            // 设置需要更新表单外观
+            acroForm.setNeedAppearances(true);
+
+            // 填充文本表单
+            for (Map.Entry<String, String> entry : formData.entrySet()) {
+                String fieldName = entry.getKey();
+                String fieldValue = entry.getValue();
+                PDField field = acroForm.getField(fieldName);
+                if (field != null) {
+                    // 设置表单域为不可编辑
+                    field.setReadOnly(true);
+                    // 设置表单域不高亮显示
+//                    for (PDAnnotationWidget widget : field.getWidgets()) {
+//                        widget.setHighlightMode(PDAnnotationWidget.HIGHLIGHT_MODE_NONE);
+//                    }
+                    if (fieldValue != null &&!fieldValue.isEmpty()) {
+                        field.setValue(fieldValue);
+                        if (field instanceof PDTextField) {
+                            PDTextField textField = (PDTextField) field;
+                            if (isAutoWrapField(fieldName)) {
+                                textField.setMultiline(true);
+                                float fontSize = calculateFontSize(fieldValue);
+                                textField.setDefaultAppearance("/" + font.getName() + " " + fontSize + " Tf 0 g");
+                            } else {
+                                textField.setDefaultAppearance("/" + font.getName() + " 12 Tf 0 g");
+                            }
+                        }
+                    } else {
+                        // 无内容时，也设置默认外观
+                        if (field instanceof PDTextField) {
+                            ((PDTextField) field).setDefaultAppearance("/" + font.getName() + " 12 Tf 0 g");
+                        }
+                    }
+                }
+            }
+
+            // 插入图片
+            insertImages(document, acroForm, imageData);
+
+            // 保存到输出流
+            document.save(outputStream);
+
+        } catch (Exception e) {
+            e.printStackTrace(); // 打印异常信息，方便调试
+            throw new IOException("处理PDF时出错", e);
+        } finally {
+            if (document != null) {
+                document.close();
+            }
+        }
+
+        return outputStream;
+    }
+
+    private void insertImages(PDDocument document, PDAcroForm acroForm,
+                              Map<String, MultipartFile> imageData) throws IOException {
+        for (Map.Entry<String, MultipartFile> entry : imageData.entrySet()) {
+            String fieldName = entry.getKey();
+            MultipartFile file = entry.getValue();
+
+            PDField refField = acroForm.getField(fieldName);
+            // 设置表单域为不可编辑
+            if (refField != null) {
+                refField.setReadOnly(true);
+            }
+            if (refField != null &&!file.isEmpty()) {
+                // 假设图片插入到第一页，你可以根据实际情况修改
+                PDPage page = document.getPage(0);
+
+                // 手动指定图片插入位置
+                float x = 440; // 可以根据实际情况调整2
+                float y = 650; // 可以根据实际情况调整
+
+                PDImageXObject image = null;
+                PDPageContentStream contentStream = null;
+                try {
+                    // 从上传的文件创建图片对象
+                    image = PDImageXObject.createFromByteArray(document, file.getBytes(), file.getOriginalFilename());
+
+                    // 计算图片尺寸（按比例缩放）
+                    float imageWidth = image.getWidth();
+                    float imageHeight = image.getHeight();
+                    float maxWidth = 100;
+                    float maxHeight = 100;
+
+                    float scale = Math.min(maxWidth / imageWidth, maxHeight / imageHeight);
+                    imageWidth *= scale;
+                    imageHeight *= scale;
+
+                    // 在指定位置绘制图片
+                    contentStream = new PDPageContentStream(
+                            document, page, PDPageContentStream.AppendMode.APPEND, true);
+                    contentStream.drawImage(image, x, y, imageWidth, imageHeight);
+                } finally {
+                    if (contentStream != null) {
+                        contentStream.close();
+                    }
+                }
+            }
+        }
+    }
+
+    // 判断是否是需要自动换行的字段
+    private boolean isAutoWrapField(String fieldName) {
+        for (String autoWrapField : AUTO_WRAP_FIELDS) {
+            if (autoWrapField.equals(fieldName)) {
+                return true;
+            }
+        }
+        return false;
+    }
+
+    // 计算适应字段的字体大小（仅用于需要特殊处理的字段）
+    private float calculateFontSize(String fieldValue) {
+        int textLength = fieldValue.length();
+        float fontSize = 10;
+        if (textLength > 30) {
+            fontSize = Math.max(MIN_FONT_SIZE, 10 - ((textLength - 30) / 5));
+        }
+        return fontSize;
+    }
+}
\ No newline at end of file
diff --git a/ruoyi-admin/src/main/resources/static/file/pdf/smrylzlgspb.pdf b/ruoyi-admin/src/main/resources/static/file/pdf/smrylzlgspb.pdf
new file mode 100644
index 00000000..fa88de72
Binary files /dev/null and b/ruoyi-admin/src/main/resources/static/file/pdf/smrylzlgspb.pdf differ
diff --git a/ruoyi-admin/src/main/resources/templates/system/newdev/abroad/editAbroad.html b/ruoyi-admin/src/main/resources/templates/system/newdev/abroad/editAbroad.html
index 868c6a4a..3bfff693 100644
--- a/ruoyi-admin/src/main/resources/templates/system/newdev/abroad/editAbroad.html
+++ b/ruoyi-admin/src/main/resources/templates/system/newdev/abroad/editAbroad.html
@@ -571,10 +571,10 @@
                                 fileName: file.name,
                                 fileSize: file.size,
                                 fileType: file.type,
-                                fileUrl: file.filePath,
+                                fileUrl: response.data.data.filePath,
                                 uploadTime: new Date().toISOString()
                             };
-                            this.uploadedFiles[index].push(fileInfo);
+                            this.$set(this.uploadedFiles, index, [...this.uploadedFiles[index], fileInfo]);
 
                             // 重置选择框
                             document.getElementById(`fileUpload${index}`).value = '';
@@ -695,7 +695,12 @@
             previewFile(file) {
                 let extension = file.fileName.split('.').pop().toLowerCase();
                 if (extension === 'pdf') {
-                    window.open(file.fileUrl);
+                    // 使用preventDefault阻止默认行为，避免影响当前页面状态
+                    let event = window.event;
+                    if (event) {
+                        event.preventDefault();
+                    }
+                    window.open(file.fileUrl, '_blank');
                     return
                 }
                 this.previewingFile = file;
diff --git a/ruoyi-admin/src/main/resources/templates/system/newdev/apply/editFile.html b/ruoyi-admin/src/main/resources/templates/system/newdev/apply/editFile.html
index 2f325358..339999c2 100644
--- a/ruoyi-admin/src/main/resources/templates/system/newdev/apply/editFile.html
+++ b/ruoyi-admin/src/main/resources/templates/system/newdev/apply/editFile.html
@@ -609,7 +609,7 @@
                                 fileName: file.name,
                                 fileSize: file.size,
                                 fileType: file.type,
-                                fileUrl: file.filePath,
+                                fileUrl: response.data.data.filePath,
                                 uploadTime: new Date().toISOString()
                             };
                             this.uploadedFiles.push(fileInfo);
@@ -737,7 +737,12 @@
             previewFile(file) {
                 let extension = file.fileName.split('.').pop().toLowerCase();
                 if (extension === 'pdf') {
-                    window.open(file.fileUrl);
+                    // 使用preventDefault阻止默认行为，避免影响当前页面状态
+                    let event = window.event;
+                    if (event) {
+                        event.preventDefault();
+                    }
+                    window.open(file.fileUrl, '_blank');
                     return
                 }
                 this.previewingFile = file;
diff --git a/ruoyi-admin/src/main/resources/templates/system/newdev/audit/editAudit.html b/ruoyi-admin/src/main/resources/templates/system/newdev/audit/editAudit.html
index a1b70445..0cfb05a1 100644
--- a/ruoyi-admin/src/main/resources/templates/system/newdev/audit/editAudit.html
+++ b/ruoyi-admin/src/main/resources/templates/system/newdev/audit/editAudit.html
@@ -512,7 +512,12 @@
             previewFile(file) {
                 let extension = file.fileName.split('.').pop().toLowerCase();
                 if (extension === 'pdf') {
-                    window.open(file.fileUrl);
+                    // 使用preventDefault阻止默认行为，避免影响当前页面状态
+                    let event = window.event;
+                    if (event) {
+                        event.preventDefault();
+                    }
+                    window.open(file.fileUrl, '_blank');
                     return
                 }
                 this.previewingFile = file;
diff --git a/ruoyi-admin/src/main/resources/templates/system/newdev/leave/leaveFile.html b/ruoyi-admin/src/main/resources/templates/system/newdev/leave/leaveFile.html
new file mode 100644
index 00000000..fb4de920
--- /dev/null
+++ b/ruoyi-admin/src/main/resources/templates/system/newdev/leave/leaveFile.html
@@ -0,0 +1,818 @@
+<!DOCTYPE html>
+<html lang="zh" xmlns:th="http://www.thymeleaf.org">
+<head>
+    <th:block th:include="include :: header('材料上传')"/>
+    <th:block th:include="include :: select2-css"/>
+    <th:block th:include="include :: jasny-bootstrap-css"/>
+    <th:block th:include="include :: element-css"/>
+    <link href="/file/pdf/test.css" rel="stylesheet">
+    <script src="/file/pdf/tailwindcss.js"></script>
+    <!-- Tailwind配置 -->
+    <script>
+        tailwind.config = {
+            theme: {
+                extend: {
+                    colors: {
+                        primary: '#3b82f6',
+                        secondary: '#64748b',
+                        accent: '#0ea5e9',
+                        neutral: '#f1f5f9',
+                        'neutral-dark': '#334155',
+                    },
+                    fontFamily: {
+                        sans: ['Inter', 'system-ui', 'sans-serif'],
+                    },
+                }
+            }
+        }
+    </script>
+
+    <style type="text/tailwindcss">
+        @layer utilities {
+            .content-auto {
+                content-visibility: auto;
+            }
+            .shadow-soft {
+                box-shadow: 0 4px 20px rgba(0, 0, 0, 0.08);
+            }
+            .transition-custom {
+                transition: all 0.3s cubic-bezier(0.4, 0, 0.2, 1);
+            }
+        }
+        .text-sm {
+            font-size: 1.4rem;
+        }
+        .text-base {
+            font-size: 1.4rem;
+        }
+        .text-xs {
+            font-size: 0.85rem;
+        }
+        .py-2 {
+            padding-top: 0.8rem;
+            padding-bottom: 0.8rem;
+        }
+        .space-y-3{
+            margin-bottom: 1.5rem;
+        }
+    </style>
+</head>
+<body class="bg-gray-50 font-sans">
+<div class="main-content min-h-screen flex flex-col" id="app">
+    <main class="flex-grow container mx-auto px-4 py-8" style="max-width: 100%;">
+        <div class="max-w-10xl mx-auto" style="width: 100%;">
+            <div  class="bg-white rounded-xl shadow-soft p-6 mb-8 scale-hover">
+                <form class="form-horizontal space-y-6" id="form-apply-edit" th:object="${applyInfoList}"  @submit.prevent="submitForm">
+                    <input name="applyId" type="hidden" th:field="*{applyId}"/>
+                    <h4 class="form-header h4">基本信息</h4>
+                    <!-- 文本字段 -->
+                    <div class="grid md:grid-cols-3 gap-6">
+                        <!-- 第一行前两列：姓名、性别 -->
+                        <div class="md:col-span-1 space-y-3">
+                            <!-- 姓名 -->
+                            <div class="space-y-3">
+                                <label for="name" class="block text-sm font-medium text-gray-700">姓名</label>
+                                <div class="relative">
+                                <span class="absolute inset-y-0 left-0 flex items-center pl-3 text-gray-500">
+                                    <i class="fa-solid fa-user"></i>
+                                </span>
+                                    <input disabled type="text" id="name" v-model="formData.name" class="w-full pl-10 pr-4 py-2 border border-gray-300 rounded-lg" placeholder="请输入姓名">
+                                </div>
+                            </div>
+
+                            <!-- 性别 -->
+                            <div class="space-y-3">
+                                <label for="sex" class="block text-sm font-medium text-gray-700">性别</label>
+                                <div class="relative">
+                                <span class="absolute inset-y-0 left-0 flex items-center pl-3 text-gray-500">
+                                    <i class="fa-solid fa-venus-mars"></i>
+                                </span>
+                                    <input disabled type="text" id="sex" v-model="formData.sex" class="w-full pl-10 pr-4 py-2 border border-gray-300 rounded-lg" placeholder="请输入性别">
+                                </div>
+                            </div>
+                        </div>
+                        <!-- 第二行前两列：国籍、曾用名 -->
+                        <div class="md:col-span-1 space-y-3">
+                            <!-- 国籍 -->
+                            <div class="space-y-3">
+                                <label for="nationa" class="block text-sm font-medium text-gray-700">国籍</label>
+                                <div class="relative">
+                                <span class="absolute inset-y-0 left-0 flex items-center pl-3 text-gray-500">
+                                    <i class="fa-solid fa-globe"></i>
+                                </span>
+                                    <input disabled type="text" id="nationa" v-model="formData.nationa" class="w-full pl-10 pr-4 py-2 border border-gray-300 rounded-lg" placeholder="请输入国籍">
+                                </div>
+                            </div>
+
+                            <!-- 曾用名 -->
+                            <div class="space-y-3">
+                                <label for="formerName" class="block text-sm font-medium text-gray-700">曾用名</label>
+                                <div class="relative">
+                                <span class="absolute inset-y-0 left-0 flex items-center pl-3 text-gray-500">
+                                    <i class="fa-solid fa-user-tag"></i>
+                                </span>
+                                    <input disabled type="text" id="formerName" v-model="formData.formerName" class="w-full pl-10 pr-4 py-2 border border-gray-300 rounded-lg" placeholder="请输入曾用名">
+                                </div>
+                            </div>
+                        </div>
+                        <!-- 第一行第三列：图片上传区域（固定位置，跨两行） -->
+                        <div class="md:col-span-1 md:row-span-2 space-y-3 relative">
+                            <label class="block text-sm font-medium text-gray-700">一寸照片</label>
+                            <div class="mt-1 h-64 border-2 border-gray-300 rounded-lg shadow-soft transition-all duration-200" style="width: 141px;height: 195px">
+                                <!-- 上传区域（未选中时显示） -->
+                                <div v-if="!selectedFile" class="h-full flex justify-center items-center border-dashed cursor-pointer hover:border-primary">
+                                    <div class="text-center">
+                                        <i class="fa-solid fa-cloud-upload text-4xl text-gray-400 mb-2"></i>
+                                        <label for="photo" class="cursor-pointer bg-white rounded-md font-medium text-primary hover:text-primary/80">
+                                            <span>上传照片</span>
+                                            <input disabled id="photo" name="photo" type="file" accept="image/jpeg,image/png" class="sr-only" @change="handleFileUpload">
+                                        </label>
+                                        <p class="text-xs text-gray-500">
+                                            JPG, PNG (最大 2MB)
+                                        </p>
+                                    </div>
+                                </div>
+                                <!-- 预览区域（选中后显示） -->
+                                <div v-else class="h-full flex flex-col items-center justify-center p-3">
+                                    <img :src="previewUrl" alt="预览图" class="max-h-full max-w-full object-cover rounded-lg mb-2" style="max-height: 200px;">
+                                    <!--                                    <button type="button" @click="clearFile" class="text-xs text-red-500 hover:text-red-700">-->
+                                    <!--                                        <i class="fa-solid fa-times-circle mr-1"></i> 移除-->
+                                    <!--                                    </button>-->
+                                </div>
+                            </div>
+                        </div>
+                        <div class="space-y-3">
+                            <label for="nationality" class="block text-sm font-medium text-gray-700">民族</label>
+                            <div class="relative">
+                                    <span class="absolute inset-y-0 left-0 flex items-center pl-3 text-gray-500">
+                                        <i class="fa-solid fa-people-group"></i>
+                                    </span>
+                                <input disabled type="text" id="nationality" v-model="formData.nationality"
+                                       class="w-full pl-10 pr-4 py-2 border border-gray-300 rounded-lg focus:ring-2 focus:ring-primary/50 focus:border-primary transition-colors duration-200"
+                                       placeholder="请输入民族">
+                            </div>
+                        </div>
+                        <div class="space-y-3">
+                            <label for="maritalStatus" class="block text-sm font-medium text-gray-700">婚姻状况</label>
+                            <div class="relative">
+                                    <span class="absolute inset-y-0 left-0 flex items-center pl-3 text-gray-500">
+                                        <i class="fa-solid fa-ring"></i>
+                                    </span>
+                                <input disabled type="text" id="maritalStatus" v-model="formData.maritalStatus"
+                                       class="w-full pl-10 pr-4 py-2 border border-gray-300 rounded-lg focus:ring-2 focus:ring-primary/50 focus:border-primary transition-colors duration-200"
+                                       placeholder="请输入婚姻状况">
+
+                            </div>
+                        </div>
+                        <div class="space-y-3">
+                            <label for="political" class="block text-sm font-medium text-gray-700">政治面貌</label>
+                            <div class="relative">
+                                    <span class="absolute inset-y-0 left-0 flex items-center pl-3 text-gray-500">
+                                        <i class="fa-solid fa-user-tie"></i>
+                                    </span>
+                                <input disabled type="text" id="political" v-model="formData.political"
+                                       class="w-full pl-10 pr-4 py-2 border border-gray-300 rounded-lg focus:ring-2 focus:ring-primary/50 focus:border-primary transition-colors duration-200"
+                                       placeholder="请输入政治面貌">
+                            </div>
+                        </div>
+                        <div class="space-y-3">
+                            <label for="phone" class="block text-sm font-medium text-gray-700">联系方式</label>
+                            <div class="relative">
+                                    <span class="absolute inset-y-0 left-0 flex items-center pl-3 text-gray-500">
+                                        <i class="fa-solid fa-phone"></i>
+                                    </span>
+                                <input disabled type="text" id="phone" v-model="formData.phone"
+                                       class="w-full pl-10 pr-4 py-2 border border-gray-300 rounded-lg focus:ring-2 focus:ring-primary/50 focus:border-primary transition-colors duration-200"
+                                       placeholder="请输入联系方式">
+                            </div>
+                        </div>
+                        <div class="space-y-3">
+                            <label for="cerno" class="block text-sm font-medium text-gray-700">身份证号</label>
+                            <div class="relative">
+                                    <span class="absolute inset-y-0 left-0 flex items-center pl-3 text-gray-500">
+                                        <i class="fa-solid fa-id-card"></i>
+                                    </span>
+                                <input disabled type="text" id="cerno" v-model="formData.cerno"
+                                       class="w-full pl-10 pr-4 py-2 border border-gray-300 rounded-lg focus:ring-2 focus:ring-primary/50 focus:border-primary transition-colors duration-200"
+                                       placeholder="请输入身份证号">
+                            </div>
+                        </div>
+                        <div class="space-y-3">
+                            <label for="address" class="block text-sm font-medium text-gray-700">户籍地址</label>
+                            <div class="relative">
+                                    <span class="absolute inset-y-0 left-0 flex items-center pl-3 text-gray-500">
+                                        <i class="fa-solid fa-house-chimney"></i>
+                                    </span>
+                                <input disabled type="text" id="address" v-model="formData.address"
+                                       class="w-full pl-10 pr-4 py-2 border border-gray-300 rounded-lg focus:ring-2 focus:ring-primary/50 focus:border-primary transition-colors duration-200"
+                                       placeholder="请输入户籍地址">
+                            </div>
+                        </div>
+                        <div class="space-y-3">
+                            <label for="registeredAuthority" class="block text-sm font-medium text-gray-700">户籍地公安机关</label>
+                            <div class="relative">
+                                    <span class="absolute inset-y-0 left-0 flex items-center pl-3 text-gray-500">
+                                        <i class="fa-solid fa-badge-shield"></i>
+                                    </span>
+                                <input disabled type="text" id="registeredAuthority" v-model="formData.registeredAuthority"
+                                       class="w-full pl-10 pr-4 py-2 border border-gray-300 rounded-lg focus:ring-2 focus:ring-primary/50 focus:border-primary transition-colors duration-200"
+                                       placeholder="请输入户籍地公安机关">
+                            </div>
+                        </div>
+                        <div class="space-y-3">
+                            <label for="permanentAddress" class="block text-sm font-medium text-gray-700">常住地址</label>
+                            <div class="relative">
+                                    <span class="absolute inset-y-0 left-0 flex items-center pl-3 text-gray-500">
+                                        <i class="fa-solid fa-house"></i>
+                                    </span>
+                                <input disabled type="text" id="permanentAddress" v-model="formData.permanentAddress"
+                                       class="w-full pl-10 pr-4 py-2 border border-gray-300 rounded-lg focus:ring-2 focus:ring-primary/50 focus:border-primary transition-colors duration-200"
+                                       placeholder="请输入常住地址">
+                            </div>
+                        </div>
+                        <div class="space-y-3">
+                            <label for="residentBureau" class="block text-sm font-medium text-gray-700">常住地公安机关</label>
+                            <div class="relative">
+                                    <span class="absolute inset-y-0 left-0 flex items-center pl-3 text-gray-500">
+                                        <i class="fa-solid fa-badge-shield"></i>
+                                    </span>
+                                <input disabled type="text" id="residentBureau" v-model="formData.residentBureau"
+                                       class="w-full pl-10 pr-4 py-2 border border-gray-300 rounded-lg focus:ring-2 focus:ring-primary/50 focus:border-primary transition-colors duration-200"
+                                       placeholder="请输入常住地公安机关">
+                            </div>
+                        </div>
+                        <div class="space-y-3">
+                            <label for="positionCapacity" class="block text-sm font-medium text-gray-700">单位及职务职称</label>
+                            <div class="relative">
+                                    <span class="absolute inset-y-0 left-0 flex items-center pl-3 text-gray-500">
+                                        <i class="fa-solid fa-building-user"></i>
+                                    </span>
+                                <input disabled type="text" id="positionCapacity" v-model="formData.positionCapacity"
+                                       class="w-full pl-10 pr-4 py-2 border border-gray-300 rounded-lg focus:ring-2 focus:ring-primary/50 focus:border-primary transition-colors duration-200"
+                                       placeholder="请输入单位及职务职称">
+                            </div>
+                        </div>
+                        <div class="space-y-3">
+                            <label for="smPost" class="block text-sm font-medium text-gray-700">已（拟）任涉密岗位</label>
+                            <div class="relative">
+                                    <span class="absolute inset-y-0 left-0 flex items-center pl-3 text-gray-500">
+                                        <i class="fa-solid fa-shield-halved"></i>
+                                    </span>
+                                <input disabled type="text" id="smPost" v-model="formData.smPost"
+                                       class="w-full pl-10 pr-4 py-2 border border-gray-300 rounded-lg focus:ring-2 focus:ring-primary/50 focus:border-primary transition-colors duration-200"
+                                       placeholder="请输入已（拟）任涉密岗位">
+                            </div>
+                        </div>
+                        <div class="space-y-3">
+                            <label for="smGrade" class="block text-sm font-medium text-gray-700">涉密等级</label>
+                            <div class="relative">
+                                    <span class="absolute inset-y-0 left-0 flex items-center pl-3 text-gray-500">
+                                        <i class="fa-solid fa-lock"></i>
+                                    </span>
+                                <input disabled type="text" id="smGrade" v-model="formData.smGrade"
+                                       class="w-full pl-10 pr-4 py-2 border border-gray-300 rounded-lg focus:ring-2 focus:ring-primary/50 focus:border-primary transition-colors duration-200"
+                                       placeholder="请输入涉密等级">
+                            </div>
+                        </div>
+                    </div>
+                    <div class="flex items-center justify-between mb-4">
+                        <button type="submit" class="group relative w-full max-w-xs flex justify-center py-3 px-6 border border-transparent text-base font-medium rounded-lg text-white bg-primary hover:bg-primary/90 focus:outline-none focus:ring-2 focus:ring-offset-2 focus:ring-primary transition-all duration-200">
+                                <span class="absolute left-0 inset-y-0 flex items-center pl-3" style="margin-right: 5px;">
+                                    <i class="fa-solid fa-file-pdf text-white transform group-hover:translate-x-0.5 transition-transform duration-200"></i>
+                                </span>
+                            生成离职离岗审批表
+                        </button>
+                    </div>
+                    <h4 class="form-header h4">材料上传</h4>
+                    <!-- 材料上传区域 - 使用循环生成 -->
+                    <div class="mt-6" style=" display: flex;flex-wrap: wrap;justify-content: space-around;">
+                        <div v-for="(material, index) in materials" :key="index" class="border border-gray-200 rounded-lg p-4 mb-6" style="width: 50%;">
+                            <div class="flex items-center justify-between mb-3">
+                                <span class="text-sm text-gray-600">{{ material.description }}</span>
+                                <div class="relative">
+                                    <label :for="'fileUpload' + index" class="inline-flex items-center px-3 py-1.5 border border-transparent text-sm font-medium rounded-md shadow-sm text-white bg-primary hover:bg-primary/90 focus:outline-none focus:ring-2 focus:ring-offset-2 focus:ring-primary cursor-pointer transition-colors duration-200">
+                                        <i class="fa-solid fa-upload mr-2"></i> 选择文件
+                                        <input :id="'fileUpload' + index" type="file" class="sr-only" :accept="material.accept" @change="handleFileSelection(index)">
+                                    </label>
+                                    <a v-if="material.code ==='bm_user_lpromise_012'" :href="material.templateUrl" :download="material.downloadName" class="inline-flex items-center px-3 py-1.5 border border-transparent text-sm font-medium rounded-md shadow-sm text-white bg-primary hover:bg-primary/90 focus:outline-none focus:ring-2 focus:ring-offset-2 focus:ring-primary transition-colors duration-200">
+                                        <i class="fa-solid fa-download mr-1"></i> 下载模版
+                                    </a>
+                                </div>
+                            </div>
+
+                            <!-- 上传进度条 -->
+                            <div v-if="uploadProgress[index] > 0 && uploadProgress[index] < 100" class="mb-3">
+                                <div class="flex justify-between text-sm mb-1">
+                                    <span class="text-gray-700">上传中: {{ currentFileName[index] }}</span>
+                                    <span class="text-gray-500">{{ uploadProgress[index] }}%</span>
+                                </div>
+                                <div class="w-full bg-gray-200 rounded-full h-2">
+                                    <div class="bg-primary h-2 rounded-full" :style="{ width: uploadProgress[index] + '%' }"></div>
+                                </div>
+                            </div>
+
+                            <!-- 文件列表 -->
+                            <div class="mt-3">
+                                <div v-if="uploadedFiles[index].length === 0" class="py-6 text-center border-2 border-dashed border-gray-300 rounded-lg">
+                                    <i class="fa-solid fa-cloud-upload-alt text-3xl text-gray-400 mb-2"></i>
+                                    <p class="text-gray-500">未上传文件</p>
+                                </div>
+                                <div v-else class="space-y-2">
+                                    <div v-for="(file, fileIndex) in uploadedFiles[index]" :key="fileIndex" class="flex items-center p-2 bg-gray-50 rounded-lg hover:bg-gray-100 transition-colors duration-200">
+                                        <div class="flex-shrink-0 mr-3">
+                                            <i :class="getFileIcon(file.fileName)" class="text-xl"></i>
+                                        </div>
+                                        <div class="flex-grow min-w-0">
+                                            <p class="text-sm font-medium text-gray-900 truncate">{{ file.fileName }}</p>
+                                        </div>
+                                        <div class="flex-shrink-0 ml-3">
+                                            <button v-if="isImageFile(file.fileName)" @click="previewFile(file)" class="text-primary hover:text-primary/80 mr-2">
+                                                <i class="fa-solid fa-eye"></i>
+                                            </button>
+                                            <button @click="downloadFile(file, index)" class="text-primary hover:text-primary/80 mr-2">
+                                                <i class="fa-solid fa-download"></i>
+                                            </button>
+                                            <button @click.stop="deleteFile(file, index, fileIndex)" class="text-red-500 hover:text-red-700">
+                                                <i class="fa-solid fa-trash"></i>
+                                            </button>
+                                        </div>
+                                    </div>
+                                </div>
+                            </div>
+                        </div>
+                    </div>
+                </form>
+
+                <div class="row mt-6">
+                    <div class="col-sm-offset-5 col-sm-10" style="display: flex;">
+                        <button type="button" class="btn btn-sm btn-primary" @click="submitHandler()"><i class="fa fa-check"></i>提 交</button>&nbsp;
+                        <button type="button" class="btn btn-sm btn-danger" onclick="closeItem()"><i class="fa fa-reply-all"></i>关 闭
+                        </button>
+                    </div>
+                </div>
+            </div>
+            <!-- 结果区域 -->
+            <div v-if="showResult" class="bg-white rounded-xl shadow-soft p-6 mb-8 transform hover:shadow-lg transition-all duration-300">
+                <div class="flex items-start">
+                    <div class="flex-shrink-0 bg-green-100 p-3 rounded-lg">
+                        <i class="fa-solid fa-check text-green-500 text-xl"></i>
+                    </div>
+                    <div class="ml-4">
+                        <h3 class="text-lg font-medium text-gray-800">PDF生成成功</h3>
+                        <p class="mt-1 text-sm text-gray-600">您的PDF表单已成功填写，可以点击下方按钮下载。</p>
+                        <div class="mt-4 flex flex-wrap gap-3">
+                            <a :href="pdfUrl" download="涉密人员离职离岗审批表.pdf" class="inline-flex items-center px-4 py-2 border border-transparent text-sm font-medium rounded-md shadow-sm text-white bg-primary hover:bg-primary/90 focus:outline-none focus:ring-2 focus:ring-offset-2 focus:ring-primary transition-colors duration-200">
+                                <i class="fa-solid fa-download mr-2"></i> 下载PDF
+                            </a>
+                            <button @click="showResult = false" class="inline-flex items-center px-4 py-2 border border-gray-300 text-sm font-medium rounded-md shadow-sm text-gray-700 bg-white hover:bg-gray-50 focus:outline-none focus:ring-2 focus:ring-offset-2 focus:ring-primary transition-colors duration-200">
+                                <i class="fa-solid fa-times mr-2"></i> 关闭
+                            </button>
+                        </div>
+                    </div>
+                </div>
+            </div>
+            <!-- 加载中 -->
+            <div v-if="isLoading" class="fixed inset-0 bg-black bg-opacity-50 flex items-center justify-center z-50">
+                <div class="bg-white rounded-xl p-6 shadow-lg max-w-md w-full">
+                    <div class="flex items-center">
+                        <div class="animate-spin rounded-full h-12 w-12 border-t-2 border-b-2 border-primary mr-4"></div>
+                        <div>
+                            <h3 class="text-lg font-medium text-gray-800">正在处理</h3>
+                            <p class="text-sm text-gray-500 mt-1">请稍候，系统正在生成您的PDF文件...</p>
+                        </div>
+                    </div>
+                </div>
+            </div>
+            <!-- 上传成功提示 -->
+            <div v-if="uploadSuccess" class="fixed bottom-4 right-4 bg-green-500 text-white px-6 py-3 rounded-lg shadow-lg transform transition-all duration-500 translate-y-0 opacity-100">
+                <div class="flex items-center">
+                    <i class="fa-solid fa-check-circle mr-2"></i>
+                    <span>{{ uploadSuccessMessage }}</span>
+                </div>
+            </div>
+            <!-- 图片预览模态框 -->
+            <div v-if="previewModalVisible" class="fixed inset-0 bg-black bg-opacity-90 flex items-center justify-center z-50">
+                <div class="bg-white rounded-lg max-w-4xl w-full max-h-[90vh] overflow-auto">
+                    <div class="p-4 flex justify-between items-center border-b">
+                        <h3 class="text-lg font-medium text-gray-900">{{ previewingFile.fileName }}</h3>
+                        <button @click="closePreviewModal" class="text-gray-500 hover:text-gray-700">
+                            <i class="fa-solid fa-times"></i>
+                        </button>
+                    </div>
+                    <div class="p-4 flex justify-center">
+                        <img :src="getPreviewUrl(previewingFile)" alt="预览图" class="max-w-full max-h-[70vh] object-contain">
+                    </div>
+                    <div class="p-4 border-t flex justify-end">
+                        <button @click="closePreviewModal" class="inline-flex items-center px-4 py-2 border border-gray-300 text-sm font-medium rounded-md shadow-sm text-gray-700 bg-white hover:bg-gray-50 focus:outline-none focus:ring-2 focus:ring-offset-2 focus:ring-primary transition-colors duration-200">
+                            <i class="fa-solid fa-times mr-2"></i> 关闭
+                        </button>
+                    </div>
+                </div>
+            </div>
+        </div>
+    </main>
+</div>
+<th:block th:include="include :: footer"/>
+<th:block th:include="include :: select2-js"/>
+<th:block th:include="include :: jasny-bootstrap-js"/>
+<th:block th:include="include :: element-js"/>
+<script type="text/javascript" th:inline="javascript">
+    var prefix = ctx + "system/leaveList";
+    new Vue({
+        el: '#app',
+        data: {
+            formData: {
+                name: '',
+                sex: '',
+                nationa: '',
+                formerName: '',
+                nationality: '',
+                maritalStatus: '',
+                political: '',
+                phone: '',
+                cerno: '',
+                address: '',
+                registeredAuthority: '',
+                permanentAddress: '',
+                residentBureau: '',
+                positionCapacity: '',
+                smPost: '',
+                smGrade: '',
+                photoUrl: '',
+                applyId: '',
+            },
+            selectedFile: null,
+            // 材料配置 - 定义六个材料的信息
+            materials: [
+                {
+                    name: '涉密人员离职离岗保密审批表',
+                    code: 'bm_user_userleav_011',
+                    templateUrl: '/file/pdfFiles/涉密人员离职离岗保密审批表.pdf',
+                    downloadName: '涉密人员离职离岗保密审批表.pdf',
+                    description: '涉密人员离职离岗保密审批表',
+                    accept: '.pdf, .doc, .docx, .jpg, .jpeg, .png, .gif, .bmp'
+                },
+                {
+                    name: '涉密人员离职离岗保密承诺书',
+                    code: 'bm_user_lpromise_012',
+                    templateUrl: '/file/pdfFiles/涉密人员离职离岗保密承诺书.pdf',
+                    downloadName: '涉密人员离职离岗保密承诺书.pdf',
+                    description: '涉密人员离职离岗保密承诺书',
+                    accept: '.pdf, .doc, .docx, .jpg, .jpeg, .png, .gif, .bmp'
+                },
+            ],
+            // 文件上传相关数据
+            selectedFiles: Array(2).fill(null),
+            currentFileName: Array(2).fill(''),
+            uploadProgress: Array(2).fill(0),
+            uploadedFiles: Array(2).fill([]).map(() => []),
+            previewModalVisible: false,
+            previewingFile: {},
+            uploadSuccess: false,
+            uploadSuccessMessage: '',
+            prefix: ctx + "system/leaveList",
+            isLoading: false,
+            showResult: false,
+            pdfUrl:''
+        },
+        computed: {
+            previewUrl() {
+                return this.selectedFile ? window.URL.createObjectURL(this.selectedFile) : '';
+            }
+        },
+        methods: {
+            handleFileUpload(event) {
+                let file = event.target.files[0];
+                if (file) {
+                    // 检查文件类型和大小
+                    let fileSize = file.size / 1024 / 1024; // MB
+                    if (fileSize > 2) {
+                        this.$message.error('文件大小不能超过2MB');
+                        return;
+                    }
+                    let fileType = file.type;
+                    if (!fileType.startsWith('image/')) {
+                        this.$message.error('请上传图片文件');
+                        return;
+                    }
+                    // 验证图片格式
+                    let validFormats = ['image/jpeg', 'image/png'];
+                    if (!validFormats.includes(fileType)) {
+                        this.$message.error('请上传JPG或PNG格式的图片');
+                        return;
+                    }
+                    // 验证图片尺寸是否接近一寸照片 (2.5cm x 3.5cm, 约295x413像素)
+                    let img = new Image();
+                    img.src = window.URL.createObjectURL(file);
+                    img.onload = () => {
+                        let width = img.naturalWidth;
+                        let height = img.naturalHeight;
+                        let ratio = width / height;
+                        // 检查宽高比是否接近一寸照片的比例 (约0.714)
+                        if (Math.abs(ratio - 0.714) > 0.1) {
+                            this.$message({
+                                message: '建议上传一寸照片尺寸 (约295x413像素)',
+                                type: 'warning'
+                            });
+                        }
+                        this.selectedFile = file;
+                    };
+                    img.onerror = () => {
+                        this.$message.error('无法加载图片，请重新选择');
+                    };
+                }
+            },
+            clearFile() {
+                this.selectedFile = null;
+                document.getElementById('photo').value = '';
+            },
+            // 文件上传处理
+            handleFileSelection(index) {
+                this.selectedFiles[index] = event.target.files[0];
+                if (this.selectedFiles[index]) {
+                    let file = this.selectedFiles[index];
+                    let fileExtension = file.name.split('.').pop().toLowerCase();
+
+                    // 根据材料类型验证文件格式
+                    let validExtensions = this.materials[index].accept.split(',').map(ext => ext.trim().replace('.', ''));
+
+                    if (!validExtensions.includes(fileExtension)) {
+                        this.$message.error(`请上传${this.materials[index].description.split('：')[1]}`);
+                        document.getElementById(`fileUpload${index}`).value = ''; // 清空选择
+                        return;
+                    }
+
+                    this.uploadFile(file, index);
+                }
+            },
+
+            uploadFile(file, index) {
+                this.currentFileName[index] = file.name;
+                this.uploadProgress[index] = 0;
+
+                let formData = new FormData();
+                formData.append('applyId', this.formData.applyId || '');
+                formData.append('filename', file.name);
+                formData.append('fileCode', this.materials[index].code);
+                formData.append('file', file);
+
+                axios.post(ctx + 'system/file/upload', formData, {
+                    onUploadProgress: (progressEvent) => {
+                        this.uploadProgress[index] = Math.round((progressEvent.loaded * 100) / progressEvent.total);
+                    }
+                })
+                    .then(response => {
+                        if (response.data.code === web_status.SUCCESS) {
+                            // 显示上传成功提示
+                            this.uploadSuccess = true;
+                            this.uploadSuccessMessage = `文件 "${file.name}" 上传成功`;
+
+                            // 3秒后隐藏提示
+                            setTimeout(() => {
+                                this.uploadSuccess = false;
+                            }, 3000);
+
+                            // 更新文件列表
+                            let fileInfo = {
+                                id: response.data.data.fileId,
+                                fileName: file.name,
+                                fileSize: file.size,
+                                fileType: file.type,
+                                fileUrl: response.data.data.filePath,
+                                uploadTime: new Date().toISOString()
+                            };
+                            this.$set(this.uploadedFiles, index, [...this.uploadedFiles[index], fileInfo]);
+                            // 重置选择框
+                            document.getElementById(`fileUpload${index}`).value = '';
+                        } else {
+                            this.$message.error(`上传失败: ${response.data.msg}`);
+                        }
+                    })
+                    .catch(error => {
+                        console.error('上传错误:', error);
+                        this.$message.error('上传过程中发生错误');
+                    });
+            },
+            submitForm() {
+                // 简单验证
+                if (!this.formData.name || !this.formData.sex || !this.formData.nationa ||  !this.formData.nationality || !this.formData.maritalStatus || !this.formData.political || !this.formData.phone || !this.formData.cerno || !this.formData.address || !this.formData.registeredAuthority || !this.formData.permanentAddress || !this.formData.residentBureau || !this.formData.positionCapacity || !this.formData.smPost || !this.formData.smGrade) {
+                    this.$message({
+                        message: '请填写所有必填字段',
+                        type: 'warning'
+                    });
+                    return;
+                }
+                // 检查是否上传了照片
+                if (!this.selectedFile) {
+                    this.$message({
+                        message: '请上传一寸照片',
+                        type: 'warning'
+                    });
+                    return;
+                }
+                // 准备表单数据
+                let formData = new FormData();
+                if (this.formData.name) formData.append("name", this.formData.name);
+                if (this.formData.political) formData.append("political", this.formData.political);
+                if (this.formData.phone) formData.append("phone", this.formData.phone);
+                if (this.formData.positionCapacity) formData.append("positionCapacity", this.formData.positionCapacity);
+                if (this.formData.smPost) formData.append("smPost", this.formData.smPost);
+                if (this.formData.smGrade) formData.append("smGrade", this.formData.smGrade);
+                formData.append('photo', this.selectedFile);
+                // 显示加载状态
+                this.isLoading = true;
+                // 发送请求
+                axios.post('/api/LeavePdf/LeaveFill', formData, {
+                    responseType: 'blob'
+                })
+                    .then(response => {
+                        // 创建下载URL
+                        let blob = new Blob([response.data], { type: 'application/pdf' });
+                        this.pdfUrl = window.URL.createObjectURL(blob);
+
+                        // 隐藏加载状态，显示结果
+                        this.isLoading = false;
+                        this.showResult = true;
+                    })
+                    .catch(error => {
+                        console.error('Error:', error);
+                        this.isLoading = false;
+                        this.$message.error('生成PDF时出错，请重试');
+                    });
+            },
+            downloadFile(file, index) {
+                // 直接通过接口下载
+                axios.get(ctx + 'system/file/download',{
+                    params: { fileId: file.id },
+                    responseType: 'blob', // 重要：指定响应类型为blob
+                    headers: {
+                        'Content-Type': 'application/json',
+                    }
+                })
+                    .then(response => {
+                        let url = window.URL.createObjectURL(new Blob([response.data]));
+                        let link = document.createElement('a');
+                        link.href = url;
+                        link.setAttribute('download', file.fileName);
+                        document.body.appendChild(link);
+                        link.click();
+                        document.body.removeChild(link);
+                    })
+                    .catch(error => {
+                        console.error('下载错误:', error);
+                        this.$message.error('下载文件时出错');
+                    });
+            },
+
+
+            deleteFile(file, materialIndex, fileIndex) {
+                let event = window.event;
+                if (event) {
+                    event.preventDefault();
+                }
+                this.$confirm(`确定要删除文件 "${file.fileName}" 吗？`, '提示', {
+                    confirmButtonText: '确定',
+                    cancelButtonText: '取消',
+                    type: 'warning'
+                }).then(() => {
+                    axios.get(ctx + 'system/file/delFile/' + file.id)
+                        .then(response => {
+                            if (response.data.code === web_status.SUCCESS) {
+                                this.uploadedFiles[materialIndex].splice(fileIndex, 1);
+                                this.$message.success('文件已成功删除');
+                            } else {
+                                this.$message.error(`删除失败: ${response.data.msg}`);
+                            }
+                        })
+                        .catch(error => {
+                            console.error('删除错误:', error);
+                            this.$message.error('删除文件时出错');
+                        });
+                }).catch(() => {
+                    this.$message({
+                        type: 'info',
+                        message: '已取消删除'
+                    });
+                });
+            },
+            submitHandler() {
+                if (this.uploadedFiles.length == 0) {
+                    this.$message.warning('请上传所需材料');
+                    return;
+                }
+
+                this.$confirm('确认提交吗？', '提示', {
+                    confirmButtonText: '确定',
+                    cancelButtonText: '取消',
+                    type: 'warning'
+                }).then(() => {
+                    $.operate.saveTab(`${this.prefix}/submitLeave?applyId=${this.formData.applyId}`);
+                }).catch(() => {
+                    this.$message({
+                        type: 'info',
+                        message: '已取消'
+                    });
+                });
+            },
+            // 获取已上传文件
+            getUploadedFiles() {
+                if (!this.formData.applyId) return;
+
+                // 使用forEach确保每个请求有自己的作用域
+                this.materials.forEach((material, index) => {
+                    axios.get(ctx + 'system/file/getFileInfo', {
+                        params: {
+                            applyId: this.formData.applyId,
+                            fileCode: material.code,
+                        }
+                    })
+                        .then(response => {
+                            if (response.data.code === web_status.SUCCESS) {
+                                // 使用Vue.set确保响应式更新
+                                this.$set(this.uploadedFiles, index, response.data.data.map((file) => {
+                                    return {
+                                        id: file.fileId,
+                                        fileName: file.fileName,
+                                        fileSize: file.fileSize,
+                                        fileType: file.fileType,
+                                        fileUrl: file.filePath,
+                                        uploadTime: file.createTime
+                                    }
+                                }));
+                            } else {
+                                console.error(`获取${material.name}文件列表失败:`, response.data.msg);
+                                this.$message.error(`获取${material.name}已上传文件失败: ${response.data.msg}`);
+                            }
+                        })
+                        .catch(error => {
+                            console.error(`获取${material.name}文件列表错误:`, error);
+                            this.$message.error(`获取${material.name}已上传文件时出错`);
+                        });
+                });
+            },
+
+            // 图片预览相关方法
+            isImageFile(fileName) {
+                const imageExtensions = ['jpg', 'jpeg', 'png', 'gif', 'bmp','pdf'];
+                const extension = fileName.split('.').pop().toLowerCase();
+                return imageExtensions.includes(extension);
+            },
+
+            getFileIcon(fileName) {
+                const extension = fileName.split('.').pop().toLowerCase();
+                if (extension === 'pdf') return 'fa-solid fa-file-pdf text-red-500';
+                if (['doc', 'docx'].includes(extension)) return 'fa-solid fa-file-word text-blue-500';
+                if (['jpg', 'jpeg', 'png', 'gif', 'bmp'].includes(extension)) return 'fa-solid fa-file-image text-green-500';
+                return 'fa-solid fa-file text-gray-500';
+            },
+
+            previewFile(file) {
+                let extension = file.fileName.split('.').pop().toLowerCase();
+                if (extension === 'pdf') {
+                    // 使用preventDefault阻止默认行为，避免影响当前页面状态
+                    let event = window.event;
+                    if (event) {
+                        event.preventDefault();
+                    }
+                    window.open(file.fileUrl, '_blank');
+                    return
+                }
+                this.previewingFile = file;
+                this.previewModalVisible = true;
+            },
+
+            closePreviewModal() {
+                this.previewModalVisible = false;
+                this.previewingFile = {};
+            },
+
+            getPreviewUrl(file) {
+                // 如果是图片，直接返回URL
+                if (this.isImageFile(file.fileName)) {
+                    return ctx + 'system/file/download?fileId=' + file.id;
+                }
+                return '';
+            }
+        },
+        mounted() {
+            // 从后端获取转义后的 JSON 字符串
+            if ([[${applyInfoList}]]){
+                this.formData = {...[[${applyInfoList}]]}
+                // 获取图片并转换为 Blob
+                if (this.formData.photoUrl) {
+                    fetch(this.formData.photoUrl)
+                        .then(response => response.blob())
+                        .then(blob => {
+                            this.selectedFile = blob;
+                        })
+                        .catch(error => console.error('处理图片时出错:', error));
+                }
+            }
+            // 获取已上传文件
+            this.getUploadedFiles();
+        }
+    });
+
+</script>
+</body>
+</html>
\ No newline at end of file
diff --git a/ruoyi-admin/src/main/resources/templates/system/newdev/leaveAudit/leaveAudit.html b/ruoyi-admin/src/main/resources/templates/system/newdev/leaveAudit/leaveAudit.html
new file mode 100644
index 00000000..566549bd
--- /dev/null
+++ b/ruoyi-admin/src/main/resources/templates/system/newdev/leaveAudit/leaveAudit.html
@@ -0,0 +1,10 @@
+<!DOCTYPE html>
+<html lang="en">
+<head>
+    <meta charset="UTF-8">
+    <title>Title</title>
+</head>
+<body>
+
+</body>
+</html>
\ No newline at end of file
diff --git a/ruoyi-admin/src/main/resources/templates/system/newdev/onduty/editDuty.html b/ruoyi-admin/src/main/resources/templates/system/newdev/onduty/editDuty.html
index ad91a5a6..71a05967 100644
--- a/ruoyi-admin/src/main/resources/templates/system/newdev/onduty/editDuty.html
+++ b/ruoyi-admin/src/main/resources/templates/system/newdev/onduty/editDuty.html
@@ -514,7 +514,7 @@
                                 fileName: file.name,
                                 fileSize: file.size,
                                 fileType: file.type,
-                                fileUrl: file.filePath,
+                                fileUrl: response.data.data.filePath,
                                 uploadTime: new Date().toISOString()
                             };
                             this.uploadedFiles.push(fileInfo);
@@ -642,7 +642,12 @@
             previewFile(file) {
                 let extension = file.fileName.split('.').pop().toLowerCase();
                 if (extension === 'pdf') {
-                    window.open(file.fileUrl);
+                    // 使用preventDefault阻止默认行为，避免影响当前页面状态
+                    let event = window.event;
+                    if (event) {
+                        event.preventDefault();
+                    }
+                    window.open(file.fileUrl, '_blank');
                     return
                 }
                 this.previewingFile = file;
diff --git a/ruoyi-admin/src/main/resources/templates/system/newdev/person/detail.html b/ruoyi-admin/src/main/resources/templates/system/newdev/person/detail.html
index d654e6b2..6ceaba9a 100644
--- a/ruoyi-admin/src/main/resources/templates/system/newdev/person/detail.html
+++ b/ruoyi-admin/src/main/resources/templates/system/newdev/person/detail.html
@@ -444,7 +444,12 @@
             previewFile(file) {
                 let extension = file.fileName.split('.').pop().toLowerCase();
                 if (extension === 'pdf') {
-                    window.open(file.fileUrl);
+                    // 使用preventDefault阻止默认行为，避免影响当前页面状态
+                    let event = window.event;
+                    if (event) {
+                        event.preventDefault();
+                    }
+                    window.open(file.fileUrl, '_blank');
                     return
                 }
                 this.previewingFile = file;
diff --git a/ruoyi-admin/src/main/resources/templates/system/newdev/promise/editPromise.html b/ruoyi-admin/src/main/resources/templates/system/newdev/promise/editPromise.html
index 8f6c57d9..f39570a6 100644
--- a/ruoyi-admin/src/main/resources/templates/system/newdev/promise/editPromise.html
+++ b/ruoyi-admin/src/main/resources/templates/system/newdev/promise/editPromise.html
@@ -248,7 +248,7 @@
                                 fileName: file.name,
                                 fileSize: file.size,
                                 fileType: file.type,
-                                fileUrl: file.filePath,
+                                fileUrl: response.data.data.filePath,
                                 uploadTime: new Date().toISOString()
                             };
                             this.uploadedFiles.push(fileInfo);
@@ -376,7 +376,12 @@
             previewFile(file) {
                 let extension = file.fileName.split('.').pop().toLowerCase();
                 if (extension === 'pdf') {
-                    window.open(file.fileUrl);
+                    // 使用preventDefault阻止默认行为，避免影响当前页面状态
+                    let event = window.event;
+                    if (event) {
+                        event.preventDefault();
+                    }
+                    window.open(file.fileUrl, '_blank');
                     return
                 }
                 this.previewingFile = file;
diff --git a/ruoyi-admin/src/main/resources/templates/system/newdev/train/training.html b/ruoyi-admin/src/main/resources/templates/system/newdev/train/training.html
index 753876ea..973cf8be 100644
--- a/ruoyi-admin/src/main/resources/templates/system/newdev/train/training.html
+++ b/ruoyi-admin/src/main/resources/templates/system/newdev/train/training.html
@@ -375,7 +375,7 @@
                                 fileName: file.name,
                                 fileSize: file.size,
                                 fileType: file.type,
-                                fileUrl: file.filePath,
+                                fileUrl: response.data.data.filePath,
                                 uploadTime: new Date().toISOString()
                             };
                             this.uploadedFiles.push(fileInfo);
@@ -514,7 +514,12 @@
             previewFile(file) {
                 let extension = file.fileName.split('.').pop().toLowerCase();
                 if (extension === 'pdf') {
-                    window.open(file.fileUrl);
+                    // 使用preventDefault阻止默认行为，避免影响当前页面状态
+                    let event = window.event;
+                    if (event) {
+                        event.preventDefault();
+                    }
+                    window.open(file.fileUrl, '_blank');
                     return
                 }
                 this.previewingFile = file;