From a203a2e0031cf871721b2b8c81b8110d25ae2e3a Mon Sep 17 00:00:00 2001 From: liuxiaoxu <1793812695@qq.com> Date: Thu, 22 Aug 2024 19:14:48 +0800 Subject: [PATCH] =?UTF-8?q?[feat]=20=E9=94=80=E5=94=AE=E7=AE=A1=E7=90=86?= =?UTF-8?q?=20=E6=96=87=E4=BB=B6=E4=B8=8B=E8=BD=BD=E5=B7=A5=E5=85=B7?= =?UTF-8?q?=E7=B1=BB=EF=BC=8C=E6=96=B0=E5=A2=9E=E8=8E=B7=E5=8F=96=E6=96=87?= =?UTF-8?q?=E4=BB=B6=E7=9A=84=E7=9B=B8=E5=AF=B9=E8=B7=AF=E5=BE=84=E6=8E=A5?= =?UTF-8?q?=E5=8F=A3=20=E9=87=87=E8=B4=AD=E8=AE=A2=E5=8D=95=E4=BE=9B?= =?UTF-8?q?=E5=BA=94=E5=95=86=E5=90=88=E5=90=8C=E5=AF=BC=E5=87=BA=EF=BC=8C?= =?UTF-8?q?=E6=96=B0=E5=A2=9E=E5=AF=BC=E5=87=BA=E5=89=8D=E6=8F=90=E7=A4=BA?= =?UTF-8?q?=E6=A1=86?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../impl/PurchaseOrderServiceImpl.java | 4 +++- .../purchase/purchaseOrder/purchaseOrder.html | 13 ++++++++---- .../common/utils/file/FileDownloadUtils.java | 20 ++++++++++++++++++- 3 files changed, 31 insertions(+), 6 deletions(-) diff --git a/ruoyi-admin/src/main/java/com/ruoyi/purchase/service/impl/PurchaseOrderServiceImpl.java b/ruoyi-admin/src/main/java/com/ruoyi/purchase/service/impl/PurchaseOrderServiceImpl.java index 65259701..2ef1e95a 100644 --- a/ruoyi-admin/src/main/java/com/ruoyi/purchase/service/impl/PurchaseOrderServiceImpl.java +++ b/ruoyi-admin/src/main/java/com/ruoyi/purchase/service/impl/PurchaseOrderServiceImpl.java @@ -51,6 +51,7 @@ import org.activiti.engine.impl.persistence.entity.TaskEntityImpl; import org.activiti.engine.runtime.ProcessInstance; import org.activiti.engine.task.Task; import org.springframework.beans.factory.annotation.Autowired; +import org.springframework.beans.factory.annotation.Value; import org.springframework.stereotype.Service; import org.springframework.transaction.annotation.Transactional; import org.springframework.util.CollectionUtils; @@ -133,6 +134,7 @@ public class PurchaseOrderServiceImpl implements IPurchaseOrderService @Autowired private SysCompanyInformationMapper companyInformationMapper; + /** * 查询采购订单 * @@ -711,7 +713,7 @@ public class PurchaseOrderServiceImpl implements IPurchaseOrderService FileDownloadUtils fileDownloadUtils = new FileDownloadUtils(); try { - String fileAbsolutePath = fileDownloadUtils.getFileAbsolutePath(fileName); + String fileAbsolutePath = fileDownloadUtils.getFileRelativePath(fileName); //处理供应商 SysSupplier sysSupplier = sysSupplierService.selectSysSupplierByCode(supplierCode); diff --git a/ruoyi-admin/src/main/resources/templates/purchase/purchaseOrder/purchaseOrder.html b/ruoyi-admin/src/main/resources/templates/purchase/purchaseOrder/purchaseOrder.html index ccda143e..927e1e25 100644 --- a/ruoyi-admin/src/main/resources/templates/purchase/purchaseOrder/purchaseOrder.html +++ b/ruoyi-admin/src/main/resources/templates/purchase/purchaseOrder/purchaseOrder.html @@ -328,12 +328,17 @@ } const selectedChildRow = selectedChildRows[0]; - var supplierCode = selectedChildRow.supplierCode; + // 使用 $.modal.confirm 显示确认对话框 + $.modal.confirm("确定导出这条数据的合同吗？", function() { + // 如果用户点击确定，继续导出 + var supplierCode = selectedChildRow.supplierCode; + // 如果一切正常，继续导出 + var purchaseOrderCode = row.purchaseOrderCode; + window.location.href = prefix + "/exportContract/" + purchaseOrderCode + "?supplierCode=" + encodeURIComponent(supplierCode); + $('#bootstrap-table').bootstrapTable('refresh'); // 刷新表格 + }); - // 如果一切正常，继续导出 - var purchaseOrderCode = row.purchaseOrderCode; - window.location.href = prefix + "/exportContract/" + purchaseOrderCode + "?supplierCode=" + encodeURIComponent(supplierCode); } // 显示警告消息的通用函数 function showWarning(message) { diff --git a/ruoyi-common/src/main/java/com/ruoyi/common/utils/file/FileDownloadUtils.java b/ruoyi-common/src/main/java/com/ruoyi/common/utils/file/FileDownloadUtils.java index f480bec8..a3788b23 100644 --- a/ruoyi-common/src/main/java/com/ruoyi/common/utils/file/FileDownloadUtils.java +++ b/ruoyi-common/src/main/java/com/ruoyi/common/utils/file/FileDownloadUtils.java @@ -4,6 +4,9 @@ import org.springframework.core.io.ClassPathResource; import java.io.File; import java.io.IOException; +import java.net.URL; +import java.nio.file.Path; +import java.nio.file.Paths; /** * 文件下载类 @@ -11,10 +14,25 @@ import java.io.IOException; public class FileDownloadUtils { + // 获取文件绝对路径 public String getFileAbsolutePath(String fileName) throws IOException { ClassPathResource resource = new ClassPathResource("attachments/" + fileName); File file = resource.getFile(); - return file.getAbsolutePath(); + return file.getPath(); + } + + + + + + //获取文件的相对路径 + public String getFileRelativePath(String fileName) throws IOException { + ClassPathResource resource = new ClassPathResource("attachments/" + fileName); + Path path = Paths.get(resource.getURI()); + File file = path.toFile(); + return file.getPath(); } + + }