Index: ssts-web/src/main/webapp/systemmanage/userExtView.jsp
===================================================================
diff -u -r29513 -r32299
--- ssts-web/src/main/webapp/systemmanage/userExtView.jsp	(.../userExtView.jsp)	(revision 29513)
+++ ssts-web/src/main/webapp/systemmanage/userExtView.jsp	(.../userExtView.jsp)	(revision 32299)
@@ -32,6 +32,17 @@
 <%@ include file="/common/include_Ext42_Js.jsp"%>
 <%@ include file="/disinfectsystem/print/print.jsp"%>
 <script type="text/javascript" src="${ctx }/js/common.js" ></script>
+<script>
+/**
+ * 《用户管理》菜单
+ */
+var System_User_Select = true; 
+<operation:authorize ifAnyGranted="System_User_Select">
+    if (!notInWhiteList(sstsConfig, 'userManage')) {
+        System_User_Select = false;
+    }
+</operation:authorize>
+</script>
 <script type="text/javascript" src="${ctx}/js/json3.min.js?version=${svnRevision}"></script>
 <script type="text/javascript" src="${ctx}/disinfectsystem/common/cssdUtils.js?version=${svnRevision}"></script>
 <script type="text/javascript" src="${ctx }/ext/grid/ForgonGrid.js?version=${svnRevision}"></script>
Index: ssts-web/src/main/webapp/systemmanage/userExtView.js
===================================================================
diff -u -r32115 -r32299
--- ssts-web/src/main/webapp/systemmanage/userExtView.js	(.../userExtView.js)	(revision 32115)
+++ ssts-web/src/main/webapp/systemmanage/userExtView.js	(.../userExtView.js)	(revision 32299)
@@ -3,7 +3,7 @@
 function addNewUser(){
 	var orgUnitId = document.getElementById("parm_s_orgUnitId").value;
 	if (orgUnitId == ""){
-	   alert("请选择组织机构");
+        showResult("请选择组织机构");
 	} else {
 	   location.href=WWWROOT + "/systemmanage/userFormExt.jsp?orgUnitId="+orgUnitId+"&editMode=true";
 	}
@@ -15,11 +15,11 @@
 	var idArr = ids.split(';');
 	var selAmount = idArr.length;
 	if(!ids || selAmount == 0 ){
-        alert("请选择要修改的用户！");
+        showResult("请选择要修改的用户！");
         return false;
     }
     if(selAmount > 1 ){
-        alert("只能选择一个用户！");
+        showResult("只能选择一个用户！");
         return false;
     }
 	openNewSizeWindow(WWWROOT + "/systemmanage/adminModifyPWDByExt.jsp?id=" + ids, "修改密码" , "400" , "200", "no");
@@ -31,18 +31,18 @@
 	var idArr = ids.split(';');
 	var selAmount = idArr.length;
 	if(!ids || selAmount == 0 ){
-        alert("请选择要重置密码的用户！");
+        showResult("请选择要重置密码的用户！");
         return false;
     }
 	if(userName.indexOf(";admin;") >= 0){
-		alert("不能重置系统管理员帐号密码！");
+		showResult("不能重置系统管理员帐号密码！");
 		return false;
 	}
 	UserTableManager.resetPassword(ids,function(isSuccess){
 		if(isSuccess){
-			alert("通知用户重置密码成功！");
+			showResult("通知用户重置密码成功！");
 		}else{
-			alert("通知用户重置密码失败，请稍候再试！");
+			showResult("通知用户重置密码失败，请稍候再试！");
 		}
 	});
 }
@@ -71,16 +71,16 @@
 						  oLastNode.fireEvent('click', oLastNode);
         				});
 					}else{
-						alert('没找到相关数据!');
+						showResult('没找到相关数据!');
 					}
 				}
 			},
 			failure: function(){
-				alert('没找到相关数据!');
+				showResult('没找到相关数据!');
 			}
 		});
 	}else{
-		alert('没找到相关数据!');
+		showResult('没找到相关数据!');
 	}
 }
 function deleteUser(){
@@ -89,15 +89,15 @@
 	var lockStatus = ";" + grid.getSelectedValues('user.lockStatus', ';') + ";";
 	
 	if(ids == ""){  //（陈家儒改）.trim()
-		alert("请选择要删除的用户！");
+		showResult("请选择要删除的用户！");
 		return false;
 	}
 	if(userName.indexOf(";admin;") >= 0){
-		alert("不能删除系统管理员帐号！");
+		showResult("不能删除系统管理员帐号！");
 		return false;
 	}
 	if(lockStatus.indexOf(";是;") >= 0){  //（陈家儒改）
-		alert("不能删除被锁定的用户！");
+		showResult("不能删除被锁定的用户！");
 		return false;
 	}
 	showWaitMsg("删除用户");
@@ -109,7 +109,7 @@
 	var idArr = ids.split(';');
 	var selAmount = idArr.length;
 	if(selAmount == 0 || idArr[0] == ""){
-        alert("请选择要修改的用户！");
+        showResult("请选择要修改的用户！");
         return false;
     }
 	var selectedRoleArray = openModalWindow(WWWROOT+'/common/selRoleByExt.jsp?', '选择角色', '800', '270');
@@ -499,9 +499,38 @@
         	    	printUserInfo(barcode,userFullName,department,name,0);
         	    }
         	   }else{
-        		   MsgTip.msg('提示','未选择打印的内容！',true,3);
+                showResult('未选择打印的内容！');
         	   }
         	}
+        }, '-', {
+            text:'解除登录锁定',
+            tooltip:'解除登录锁定',
+            iconCls:'icon_unlock',
+            hidden :System_User_Select,
+            handler:function (){
+                var sm = grid.getSelectionModel(); 
+                if(sm.getSelected()){
+                    var records = sm.getSelections();
+                    if(records.length > 1){
+                        showResult('只能选择一个用户！');
+                        return;
+                    }
+                    var userId = records[0].data.id;
+                    Ext.Ajax.request({
+                        url: WWWROOT + '/systemmanage/user/releaseLogonLock.do',
+                        params: {userId:userId},
+                        success: function(response ,options){
+                            var jsonObj = Ext.decode(response.responseText);
+                            showResult(jsonObj.msg);
+                        },
+                        failure: function(){
+                            showResult('没找到相关数据!');
+                        }
+                    });
+                }else {
+                    showResult('未选择用户！');
+                }
+            }
         }
         ];
     
Index: ssts-web/src/main/webapp/images/unlock.png
===================================================================
diff -u
Binary files differ