From 93732d2ed1f7778b87fad1260f66eae3f90c4d7d Mon Sep 17 00:00:00 2001 From: zhangsiqi <2825463979@qq.com> Date: Wed, 10 Jul 2024 20:34:38 +0800 Subject: [PATCH] =?UTF-8?q?=E4=BF=AE=E5=A4=8D=EF=BC=9A=E7=89=A9=E6=96=99?= =?UTF-8?q?=E6=9F=A5=E8=AF=A2=E6=B7=BB=E5=8A=A0=E5=AD=90=E9=A1=B5=E9=9D=A2?= =?UTF-8?q?=EF=BC=8C=E6=B7=BB=E5=8A=A0=E6=9F=A5=E8=AF=A2=E6=96=B9=E6=B3=95?= =?UTF-8?q?=E4=B8=BA=E9=80=9A=E8=BF=87=E5=90=8E=E7=9A=84=E7=89=A9=E6=96=99?= =?UTF-8?q?=E4=BF=A1=E6=81=AF=E3=80=82?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../erp/controller/ErpMaterialController.java | 15 ++++++++++++++- .../resources/templates/erp/material/select.html | 2 +- 2 files changed, 15 insertions(+), 2 deletions(-) diff --git a/ruoyi-admin/src/main/java/com/ruoyi/erp/controller/ErpMaterialController.java b/ruoyi-admin/src/main/java/com/ruoyi/erp/controller/ErpMaterialController.java index 29381023..f04db8c7 100644 --- a/ruoyi-admin/src/main/java/com/ruoyi/erp/controller/ErpMaterialController.java +++ b/ruoyi-admin/src/main/java/com/ruoyi/erp/controller/ErpMaterialController.java @@ -95,7 +95,20 @@ public class ErpMaterialController extends BaseController List list = erpMaterialService.selectErpMaterialList(erpMaterialVo); return getDataTable(list); } - + /** + * 物料信息审核，通过物料查询*/ + @RequiresPermissions("erp:material:list") + @PostMapping("/selectList") + @ResponseBody + public TableDataInfo selectList(ErpMaterialVo erpMaterialVo) + { + erpMaterialVo.setUseStatus("1"); + erpMaterialVo.setAuditStatus("1"); + // 工程文员角色只能看到自己创建的数据 + startPage(); + List list = erpMaterialService.selectErpMaterialList(erpMaterialVo); + return getDataTable(list); + } /** * 导出物料信息列表 */ diff --git a/ruoyi-admin/src/main/resources/templates/erp/material/select.html b/ruoyi-admin/src/main/resources/templates/erp/material/select.html index 88592cbd..f40e758b 100644 --- a/ruoyi-admin/src/main/resources/templates/erp/material/select.html +++ b/ruoyi-admin/src/main/resources/templates/erp/material/select.html @@ -52,7 +52,7 @@ id: 'bootstrap-select-table', clickToSelect: true, // 点击选中行 singleSelect: true, // 单选 - url: prefix + "/list", + url: prefix + "/selectList", modalName: "物料信息", columns: [ {checkbox: true},