diff --git a/ruoyi-admin/src/main/java/com/ruoyi/web/controller/basic/BaseLocationInfoController.java b/ruoyi-admin/src/main/java/com/ruoyi/web/controller/basic/BaseLocationInfoController.java index 9804381..842e703 100644 --- a/ruoyi-admin/src/main/java/com/ruoyi/web/controller/basic/BaseLocationInfoController.java +++ b/ruoyi-admin/src/main/java/com/ruoyi/web/controller/basic/BaseLocationInfoController.java @@ -2,6 +2,8 @@ package com.ruoyi.web.controller.basic; import java.util.List; +import com.ruoyi.system.domain.BaseEfficiencyLevel; +import com.ruoyi.system.service.IBaseEfficiencyLevelService; import com.ruoyi.web.controller.tool.UUIDTool; import org.apache.shiro.authz.annotation.RequiresPermissions; import org.springframework.beans.factory.annotation.Autowired; @@ -36,6 +38,9 @@ public class BaseLocationInfoController extends BaseController @Autowired private IBaseLocationInfoService baseLocationInfoService; + @Autowired + private IBaseEfficiencyLevelService baseEfficiencyLevelService; + @RequiresPermissions("system:baselocationinfo:view") @GetMapping() public String baselocationinfo() @@ -74,8 +79,11 @@ public class BaseLocationInfoController extends BaseController * 新增库位信息 */ @GetMapping("/add") - public String add() + public String add(ModelMap modelMap) { + BaseEfficiencyLevel baseEfficiencyLevel = new BaseEfficiencyLevel(); + List baseEfficiencyLevels = baseEfficiencyLevelService.selectBaseEfficiencyLevelList(baseEfficiencyLevel); + modelMap.put("baseEfficiencyLevels",baseEfficiencyLevels); return prefix + "/add"; } diff --git a/ruoyi-admin/src/main/resources/static/ruoyi/js/ry-ui.js b/ruoyi-admin/src/main/resources/static/ruoyi/js/ry-ui.js index 90b4f5d..2250685 100644 --- a/ruoyi-admin/src/main/resources/static/ruoyi/js/ry-ui.js +++ b/ruoyi-admin/src/main/resources/static/ruoyi/js/ry-ui.js @@ -537,6 +537,20 @@ var table = { }); return actions.join(''); }, + selectDictLabelss: function(datas, value) { + if ($.common.isEmpty(datas) || $.common.isEmpty(value)) { + return ''; + } + var actions = []; + $.each(datas, function(index, dict) { + if (dict.dictValue == ('' + value)) { + var listClass = $.common.equals("default", dict.listClass) || $.common.isEmpty(dict.listClass) ? "" : "badge badge-" + dict.listClass; + actions.push($.common.sprintf("%s", listClass, dict.dictLabel)); + return false; + } + }); + return actions.join(''); + }, // 回显数据字典(字符串数组) selectDictLabels: function(datas, value, separator) { if ($.common.isEmpty(datas) || $.common.isEmpty(value)) { diff --git a/ruoyi-admin/src/main/resources/templates/system/baselocationinfo/add.html b/ruoyi-admin/src/main/resources/templates/system/baselocationinfo/add.html index c8ab47a..be588b9 100644 --- a/ruoyi-admin/src/main/resources/templates/system/baselocationinfo/add.html +++ b/ruoyi-admin/src/main/resources/templates/system/baselocationinfo/add.html @@ -63,10 +63,15 @@ + +
- + +
diff --git a/ruoyi-admin/src/main/resources/templates/system/baselocationinfo/baselocationinfo.html b/ruoyi-admin/src/main/resources/templates/system/baselocationinfo/baselocationinfo.html index 9307578..592bea1 100644 --- a/ruoyi-admin/src/main/resources/templates/system/baselocationinfo/baselocationinfo.html +++ b/ruoyi-admin/src/main/resources/templates/system/baselocationinfo/baselocationinfo.html @@ -57,6 +57,8 @@