diff --git a/src/main/java/com/nis/web/controller/basics/SysDictInfoController.java b/src/main/java/com/nis/web/controller/basics/SysDictInfoController.java index a5132ccfd..1a38e57a2 100644 --- a/src/main/java/com/nis/web/controller/basics/SysDictInfoController.java +++ b/src/main/java/com/nis/web/controller/basics/SysDictInfoController.java @@ -76,6 +76,9 @@ public class SysDictInfoController extends BaseController { for(int i=0;i map = Maps.newHashMap(); diff --git a/src/main/webapp/WEB-INF/views/basics/sysDictForm.jsp b/src/main/webapp/WEB-INF/views/basics/sysDictForm.jsp index 1ebeb0a8e..ebfd50c06 100644 --- a/src/main/webapp/WEB-INF/views/basics/sysDictForm.jsp +++ b/src/main/webapp/WEB-INF/views/basics/sysDictForm.jsp @@ -235,15 +235,19 @@ -
- -
- <%-- --%> - - - + + + + +
+ +
+ + + +
-
+
diff --git a/src/main/webapp/WEB-INF/views/basics/sysDictList.jsp b/src/main/webapp/WEB-INF/views/basics/sysDictList.jsp index 8c00f157c..add84e0b9 100644 --- a/src/main/webapp/WEB-INF/views/basics/sysDictList.jsp +++ b/src/main/webapp/WEB-INF/views/basics/sysDictList.jsp @@ -258,7 +258,9 @@ + + @@ -275,7 +277,9 @@ ${sysDictInfo.itemValue} ${fns:abbr(sysDictInfo.itemDesc,15)} ${fns:getDictLabel("SYS_DICT_ITM_TYPE",sysDictInfo.itemType,"0")} + ${fns:getDictLabel("SYS_YES_NO",sysDictInfo.isLeaf,"0")} + ${fns:getUserById(sysDictInfo.sysDictCreator.id).name} diff --git a/src/main/webapp/WEB-INF/views/specific/specificServiceCfgForm.jsp b/src/main/webapp/WEB-INF/views/specific/specificServiceCfgForm.jsp index f29342436..c434d1a18 100644 --- a/src/main/webapp/WEB-INF/views/specific/specificServiceCfgForm.jsp +++ b/src/main/webapp/WEB-INF/views/specific/specificServiceCfgForm.jsp @@ -43,45 +43,39 @@ $("#name").focus(); $("#inputForm").validate({ rules:{ - 'specServiceId':{ + specServiceId:{ required:true, digits:true, maxValue: true, remote:'${ctx}/specific/specificServiceCfg/isIdRepeat?oldId=${specificServiceCfg.specServiceId}' }, - 'specServiceName':{ + specServiceName:{ required:true }, - 'groupId':{ + groupId:{ digits:true, maxValue:true }, - 'specServiceDesc':{ - required:true - }, - 'isLeaf':{ + isLeaf:{ leafHasTree:true, leafChange:true } }, messages: { - 'specServiceId':{ + specServiceId:{ required:'请填写协议ID', digits:"请填写整数数字", maxValue: "请填写正确的协议ID(0~210000000)", remote:'该协议ID已存在' }, - 'specServiceName':{ + specServiceName:{ required:'请填写协议名称' }, - 'groupId':{ + groupId:{ digits:'请填写整数数值', maxValue:'请填写正确的分组Id(0~210000000)' }, - 'specServiceDesc':{ - required:'请填写协议描述' - }, - 'isLeaf':{ + isLeaf:{ leafHasTree:'该配置上级为根节点,不得设为叶子节点', leafChange:'该配置包含下级配置,不得改为叶子节点' } @@ -181,7 +175,7 @@
- +