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},