From 509963f45101f966518fa3c4ad7f2f0c521df727 Mon Sep 17 00:00:00 2001
From: zhanghongqing <zhanghongqing@intranet.com>
Date: Tue, 7 Aug 2018 19:48:19 +0800
Subject: [PATCH] =?UTF-8?q?1.=E6=96=B0=E5=A2=9E=E7=94=A8=E6=88=B7=E6=97=B6?=
 =?UTF-8?q?=E6=9D=83=E9=99=90=E9=9D=9E=E7=A9=BA=E9=AA=8C=E8=AF=812.?=
 =?UTF-8?q?=E5=8C=BA=E5=9F=9F=E7=BC=96=E8=BE=91=E6=97=B6=E9=97=B4=E6=B7=BB?=
 =?UTF-8?q?=E5=8A=A0=E5=BC=80=E5=A7=8B=E6=97=B6=E9=97=B4=E5=B0=8F=E4=BA=8E?=
 =?UTF-8?q?=E7=BB=93=E6=9D=9F=E6=97=B6=E9=97=B43.=E5=8C=BA=E5=9F=9F?=
 =?UTF-8?q?=E6=90=9C=E7=B4=A2=E6=A1=86=E6=8F=90=E7=A4=BA=E4=BF=A1=E6=81=AF?=
 =?UTF-8?q?=E4=BF=AE=E6=94=B9?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/main/webapp/WEB-INF/views/basics/sysDictList.jsp | 10 ++++++++--
 src/main/webapp/WEB-INF/views/sys/userForm.jsp       |  2 +-
 src/main/webapp/static/global/scripts/common.js      |  5 +++++
 3 files changed, 14 insertions(+), 3 deletions(-)

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","<spring:message code='input'/>"+$(this).find("option:selected").text());
+				$("#intype").attr("placeholder","<spring:message code='input'/> "+$(this).find("option:selected").text());
 				$("#intype").attr("name",$(this).find("option:selected").val());
 			});
 			$("#treeTable").treeTable({expandLevel : 3}).show();	
@@ -190,7 +196,7 @@
 												</select>
                                             </div>
                                             
-                                            <input id="intype" class="form-control input-medium" placeholder="<spring:message code='item_code'></spring:message>" type="text" maxlength="60">
+                                            <input id="intype" class="form-control input-medium" placeholder="<spring:message code='input'/> <spring:message code='item_code'></spring:message>" type="text" maxlength="60">
                                      
                                         </div>
 	                               </div>
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 @@
 			
 					 <c:forEach items="${allRoles}" var="role">
 					 	 <label class="mt-checkbox">
-						 	<form:checkbox path="roleIdList" value="${role.id }"  /> ${role.name }
+						 	<form:checkbox path="roleIdList" value="${role.id }" class="required" /> ${role.name }
 						 	<span></span>
 					 	 </label>
 					 </c:forEach>
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
            },