diff --git a/src/main/webapp/WEB-INF/views/basics/sysDictList.jsp b/src/main/webapp/WEB-INF/views/basics/sysDictList.jsp
index f2d742c16..67ddf7527 100644
--- a/src/main/webapp/WEB-INF/views/basics/sysDictList.jsp
+++ b/src/main/webapp/WEB-INF/views/basics/sysDictList.jsp
@@ -97,6 +97,12 @@
//reset
$("#resetBtn").on("click",function(){
+ $("select.selectpicker").each(function(){
+ $(this).selectpicker('val',$(this).find('option:first').val());
+ $(this).find("option").attr("selected",false);
+ $(this).find("option:first").attr("selected",true);
+ });
+
$(".Wdate").attr("value",'');
$("#searchForm")[0].reset();
$("#itemType").val("");
@@ -111,7 +117,7 @@
$("#seltype").change(function(){
$("#intype").val("");
- $("#intype").attr("placeholder",""+$(this).find("option:selected").text());
+ $("#intype").attr("placeholder"," "+$(this).find("option:selected").text());
$("#intype").attr("name",$(this).find("option:selected").val());
});
$("#treeTable").treeTable({expandLevel : 3}).show();
@@ -190,7 +196,7 @@
-
+
diff --git a/src/main/webapp/WEB-INF/views/sys/userForm.jsp b/src/main/webapp/WEB-INF/views/sys/userForm.jsp
index 2f0a1011e..31db4a48c 100644
--- a/src/main/webapp/WEB-INF/views/sys/userForm.jsp
+++ b/src/main/webapp/WEB-INF/views/sys/userForm.jsp
@@ -202,7 +202,7 @@
diff --git a/src/main/webapp/static/global/scripts/common.js b/src/main/webapp/static/global/scripts/common.js
index fb6020f24..f76abcdd8 100644
--- a/src/main/webapp/static/global/scripts/common.js
+++ b/src/main/webapp/static/global/scripts/common.js
@@ -387,6 +387,11 @@ $(function(){
"doendDate": {
compareDate: "[name=dobeginDate]"
},
+ "editBeginDate": {
+ },
+ "editEndDate": {
+ compareDate: "[name=editBeginDate]"
+ },
"capIp":{
ipv4v6:true
},