From bc45f6bf07e46914e9dc17bb3b68db0ecbc59faa Mon Sep 17 00:00:00 2001 From: hayu <1604366271@qq.com> Date: Tue, 18 Jun 2024 17:42:02 +0800 Subject: [PATCH] =?UTF-8?q?=E7=BB=BC=E5=90=88=E6=9C=8D=E5=8A=A1=E4=B8=AD?= =?UTF-8?q?=E5=BF=83=E5=AF=BC=E5=87=BA=E5=8A=9F=E8=83=BD=E4=BF=AE=E6=94=B9?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../controller/PurchaseCheckServiceCenterController.java | 8 +++++++- .../warehouseManage/newPurchase/serviceCenter/index.vue | 4 ++-- 2 files changed, 9 insertions(+), 3 deletions(-) diff --git a/sgzb-modules/sgzb-material/src/main/java/com/bonus/sgzb/material/controller/PurchaseCheckServiceCenterController.java b/sgzb-modules/sgzb-material/src/main/java/com/bonus/sgzb/material/controller/PurchaseCheckServiceCenterController.java index 2a880590..3aa0a4ca 100644 --- a/sgzb-modules/sgzb-material/src/main/java/com/bonus/sgzb/material/controller/PurchaseCheckServiceCenterController.java +++ b/sgzb-modules/sgzb-material/src/main/java/com/bonus/sgzb/material/controller/PurchaseCheckServiceCenterController.java @@ -86,7 +86,13 @@ public class PurchaseCheckServiceCenterController extends BaseController @PostMapping("/putInExport") public void putInExport(HttpServletResponse response, PurchaseCheckInfo purchaseCheckInfo) { - List list = purchaseCheckServiceCenterService.putInExportList(purchaseCheckInfo); + List list = new ArrayList<>(); + //判断该组织是否开启综合服务中心审核 + Long companyId = SecurityUtils.getLoginUser().getSysUser().getCompanyId(); + int re =purchaseCheckServiceCenterService.selectExamineType(companyId); + if (re>0){ + list=purchaseCheckServiceCenterService.putInExportList(purchaseCheckInfo); + } ExcelUtil util = new ExcelUtil<>(PurchaseInput.class); util.exportExcel(response, list, "新购工机具入库"); } diff --git a/sgzb-ui/src/views/warehouseManage/newPurchase/serviceCenter/index.vue b/sgzb-ui/src/views/warehouseManage/newPurchase/serviceCenter/index.vue index 2d5c6190..a42b9648 100644 --- a/sgzb-ui/src/views/warehouseManage/newPurchase/serviceCenter/index.vue +++ b/sgzb-ui/src/views/warehouseManage/newPurchase/serviceCenter/index.vue @@ -872,11 +872,11 @@ export default { /** 导出按钮操作 */ handleExport() { this.download( - 'material/purchaseCheckInfo/putInExport', + 'material/purchaseCheckServiceCenter/putInExport', { ...this.queryParams, }, - `新购工机具入库_${new Date().getTime()}.xlsx`, + `综合服务中心_${new Date().getTime()}.xlsx`, ) }, /** 刷新缓存按钮操作 */