From dc3b8a2dea210f3d6ccfe4d7c36835bba138846f Mon Sep 17 00:00:00 2001
From: chiguangxu <chigx@intranet.com>
Date: Fri, 23 Mar 2018 11:40:06 +0800
Subject: [PATCH] =?UTF-8?q?=E5=8E=BB=E9=99=A4=E6=96=B0=E5=A2=9E=E7=95=8C?=
 =?UTF-8?q?=E9=9D=A2=E7=BA=A2=E8=89=B2=E5=AD=97=E4=BD=93=E6=A0=B7=E5=BC=8F?=
 =?UTF-8?q?=EF=BC=8C=E7=94=A8=E6=88=B7=E6=96=B0=E5=A2=9E=E7=95=8C=E9=9D=A2?=
 =?UTF-8?q?checkbox=E5=B0=8F=E8=B0=83=E6=95=B4=EF=BC=8Ctreeselect=E8=BE=93?=
 =?UTF-8?q?=E5=85=A5=E6=A1=86=E7=BB=84=E4=BF=AE=E6=94=B9?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../webapp/WEB-INF/tags/sys/treeselect.tag    | 10 +++++--
 .../webapp/WEB-INF/views/sys/userForm.jsp     | 28 +++++++++++++++----
 .../webapp/static/global/css/components.css   |  5 ++--
 3 files changed, 33 insertions(+), 10 deletions(-)

diff --git a/src/main/webapp/WEB-INF/tags/sys/treeselect.tag b/src/main/webapp/WEB-INF/tags/sys/treeselect.tag
index 7b58533d6..d13c06435 100644
--- a/src/main/webapp/WEB-INF/tags/sys/treeselect.tag
+++ b/src/main/webapp/WEB-INF/tags/sys/treeselect.tag
@@ -24,12 +24,18 @@
 <%@ attribute name="dataMsgRequired" type="java.lang.String" required="false" description=""%>
 <%@ attribute name="selectDepartment" type="java.lang.String" required="false" description="不允许选择部门,自办部门,转办部门"%>
 <%@ attribute name="showParentName" type="java.lang.String" required="false" description="显示父类名称"%>
-<div class="input-append">
+<div class="input-group">
 	<input id="${id}Id" name="${name}" class="${cssClass} singleClass" type="hidden" value="${value}" />
 	<input id="${id}Name" name="${labelName}" ${allowInput?'':'readonly="readonly"'} type="text" value="${labelValue}" data-msg-required="${dataMsgRequired}" placeholder="${value}"
 		class="${cssClass}" style="${cssStyle} background-color:transparent"/>
-		<%-- <a id="${id}Button" href="javascript:" class="btn ${disabled} ${hideBtn ? 'hide' : ''}" style="${smallBtn?'padding:4px 2px;':''}">&nbsp;<i class="icon-search"></i>&nbsp;</a>&nbsp;&nbsp; --%>
+		
+		<div class="input-group-btn">
+             <a id="${id}Button" class="btn btn-default btn-search" href="javascript:" class="btn ${disabled} ${hideBtn ? 'hide' : ''}" style="${smallBtn?'padding:4px 2px;':''}"><i class="fa fa-search"></i></a>
+        </div>
+	
 </div>
+
+
 <script type="text/javascript">
 	$("#${id}Button, #${id}Name").click(function(){
 		// 是否限制选择，如果限制，设置为disablegetQueryString d
diff --git a/src/main/webapp/WEB-INF/views/sys/userForm.jsp b/src/main/webapp/WEB-INF/views/sys/userForm.jsp
index e4482a8e3..3f44e64ab 100644
--- a/src/main/webapp/WEB-INF/views/sys/userForm.jsp
+++ b/src/main/webapp/WEB-INF/views/sys/userForm.jsp
@@ -5,6 +5,8 @@
 	<title>用户管理</title>
 	<script type="text/javascript">
 		$(document).ready(function() {
+			
+			
 			$("#no").focus();
 			
 			$("#inputForm").validate({
@@ -117,7 +119,7 @@
 					<form:input path="loginId" htmlEscape="false" maxlength="50" class="required userName form-control"/>
 				</c:if>
 			</div>
-				<span class="help-inline"><font color="red">*</font> </span>
+			<span class="help-inline"><font color="red">*</font> </span>
 		</div>
 		<div class="form-group">
 			<label class="col-md-3 control-label">归属公司:</label>
@@ -175,8 +177,9 @@
 					<form:option value="0">普通人员</form:option>
 					<form:option value="1">管理人员</form:option>
 				</form:select>
-			</div>
 				<span class="help-inline"><font>管理人员需指定身份标识为“管理人员”，否则影响审核流程！</font></span>
+			</div>
+				
 		</div>
 		
 		<div class="form-group">
@@ -191,11 +194,24 @@
 		<div class="form-group">
 			<label class="col-md-3 control-label">用户角色:</label>
 			<div class="col-md-8">
-				<form:checkboxes path="roleIdList" items="${allRoles}" itemLabel="name" itemValue="id" htmlEscape="false" class="required" style="vertical-align:middle;display:inline-block;margin-bottom:4px"/>
-				<span class="help-inline "><font color="red">*</font> </span>
+				
+				<div class="mt-checkbox-inline">
+			
+					 <c:forEach items="${allRoles}" var="role">
+					 	 <label class="mt-checkbox">
+						 	<form:checkbox path="roleIdList" value="${role.id }"  /> ${role.name }
+						 	<span></span>
+					 	 </label>
+					 </c:forEach>
+					
+					 <span class="help-inline "><font color="red">*</font> </span>
+				 </div> 
+				
 			</div>
 		</div>
 		
+                                
+		
 		<c:if test="${not empty user.id}">
 			<div class="form-group">
 				<label class="col-md-3 control-label">创建时间:</label>
@@ -210,8 +226,8 @@
 		<div class="row">
 		<div class="col-md-offset-3 col-md-9">
 			<shiro:hasPermission name="sys:user:edit"></shiro:hasPermission>
-			<button type="submit" class="btn btn-circle green"><spring:message code="submit"></spring:message></button>
-			<button type="button" class="btn btn-circle grey-salsa btn-outline" onclick="history.go(-1)"><spring:message code="cancel"></spring:message></button>
+			<button type="submit" class="btn blue"><spring:message code="submit"></spring:message></button>
+			<button type="button" class="btn blue btn-outline" onclick="history.go(-1)"><spring:message code="cancel"></spring:message></button>
 		</div>
 		</div>
 		</div>
diff --git a/src/main/webapp/static/global/css/components.css b/src/main/webapp/static/global/css/components.css
index 1b7f78bfb..344a19c6d 100644
--- a/src/main/webapp/static/global/css/components.css
+++ b/src/main/webapp/static/global/css/components.css
@@ -5065,9 +5065,10 @@ Form Layouts
 
 .control-label .required,
 .form-group .required {
-  color: #e02222;
+/*   color: #e02222;
   font-size: 12px;
-  padding-left: 2px; }
+  padding-left: 2px;  */
+}
 
 .form {
   padding: 0 !important; }