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 index 815fa4a6..4eff5b6d 100644 --- 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 @@ -20,7 +20,7 @@ import java.util.Map; public class LeavePdfService { // 定义最大和最小字体大小,用于动态调整 - private static final float MAX_FONT_SIZE = 14; + private static final float MAX_FONT_SIZE = 12; private static final float MIN_FONT_SIZE = 8; // 预估的字段宽度(根据实际PDF调整) private static final float ESTIMATED_FIELD_WIDTH = 100f; 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 index fb4de920..58f5f403 100644 --- a/ruoyi-admin/src/main/resources/templates/system/newdev/leave/leaveFile.html +++ b/ruoyi-admin/src/main/resources/templates/system/newdev/leave/leaveFile.html @@ -275,13 +275,16 @@ -
+
+ + 下载PDF +

材料上传

@@ -351,26 +354,6 @@
- -
-
-
- -
-
-

PDF生成成功

-

您的PDF表单已成功填写,可以点击下方按钮下载。

-
- - 下载PDF - - -
-
-
-
@@ -629,7 +612,7 @@ // 创建下载URL let blob = new Blob([response.data], { type: 'application/pdf' }); this.pdfUrl = window.URL.createObjectURL(blob); - + this.$message.success('生成pdf成功,请点击下载!'); // 隐藏加载状态,显示结果 this.isLoading = false; this.showResult = true; @@ -696,11 +679,10 @@ }); }, submitHandler() { - if (this.uploadedFiles.length == 0) { + if (this.uploadedFiles[0].length == 0) { this.$message.warning('请上传所需材料'); return; } - this.$confirm('确认提交吗?', '提示', { confirmButtonText: '确定', cancelButtonText: '取消',