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`, ) }, /** 刷新缓存按钮操作 */