diff --git a/src/main/java/com/nis/web/controller/configuration/MultipleCfgController.java b/src/main/java/com/nis/web/controller/configuration/MultipleCfgController.java index 6ef86fd4c..3fc45f3f4 100644 --- a/src/main/java/com/nis/web/controller/configuration/MultipleCfgController.java +++ b/src/main/java/com/nis/web/controller/configuration/MultipleCfgController.java @@ -573,6 +573,8 @@ public class MultipleCfgController extends BaseController{ this.setPropertiesToMultipleCfg(resultCfg, resultComplexCfg,"update"); } } + List districts=sysDictInfoService.getDistrictDict(tableName); + model.addAttribute("districts", districts); } } model.addAttribute("_cfg", resultCfg); diff --git a/src/main/java/com/nis/web/service/configuration/MultipleCfgService.java b/src/main/java/com/nis/web/service/configuration/MultipleCfgService.java index b0c17840e..5dab64ead 100644 --- a/src/main/java/com/nis/web/service/configuration/MultipleCfgService.java +++ b/src/main/java/com/nis/web/service/configuration/MultipleCfgService.java @@ -158,7 +158,6 @@ public class MultipleCfgService extends CrudService cfgs=new ArrayList(); if(sendCfg.getIpCfg()!=null){ diff --git a/src/main/webapp/WEB-INF/include/form/basicInfo.jsp b/src/main/webapp/WEB-INF/include/form/basicInfo.jsp index a464d89c9..5531d927f 100644 --- a/src/main/webapp/WEB-INF/include/form/basicInfo.jsp +++ b/src/main/webapp/WEB-INF/include/form/basicInfo.jsp @@ -31,19 +31,13 @@ - + - - - diff --git a/src/main/webapp/WEB-INF/include/form/complexInfo.jsp b/src/main/webapp/WEB-INF/include/form/complexInfo.jsp index ba8b76628..1ccb46e35 100644 --- a/src/main/webapp/WEB-INF/include/form/complexInfo.jsp +++ b/src/main/webapp/WEB-INF/include/form/complexInfo.jsp @@ -87,14 +87,18 @@ - <%-- --%> + + +
diff --git a/src/main/webapp/WEB-INF/include/form/multiple/basicInfo.jsp b/src/main/webapp/WEB-INF/include/form/multiple/basicInfo.jsp index 21a3995d3..6ab3cf775 100644 --- a/src/main/webapp/WEB-INF/include/form/multiple/basicInfo.jsp +++ b/src/main/webapp/WEB-INF/include/form/multiple/basicInfo.jsp @@ -53,25 +53,18 @@
- + @@ -34,7 +49,9 @@ diff --git a/src/main/webapp/WEB-INF/views/cfg/multipleCfgForm.jsp b/src/main/webapp/WEB-INF/views/cfg/multipleCfgForm.jsp index 36990a4e8..9818bb0d8 100644 --- a/src/main/webapp/WEB-INF/views/cfg/multipleCfgForm.jsp +++ b/src/main/webapp/WEB-INF/views/cfg/multipleCfgForm.jsp @@ -153,11 +153,18 @@ $(function(){ } }); $(".district").on("change",function(){ - var val=$(this).val().toLowerCase(); - if("others"==val){ - $(this).parent("div").siblings(".otherValue").prop("type","text"); + var text=$(this).find("option:selected").text().toLowerCase(); + var other=$(this).parent("div").siblings(".otherValue"); + if("others"==text){ + other.prop("type","text"); + $(this).find("option").each(function(){ + if(other.val()==$(this).text()){ + other.val(""); + return false; + } + }); }else{ - $(this).parent("div").siblings(".otherValue").prop("type","hidden").attr("value",""); + other.prop("type","hidden"); } }); $(".otherValue").on("change",function(){