Index: ssts-web/src/main/webapp/systemmanage/userExtView.jsp =================================================================== diff -u -r32299 -r35306 --- ssts-web/src/main/webapp/systemmanage/userExtView.jsp (.../userExtView.jsp) (revision 32299) +++ ssts-web/src/main/webapp/systemmanage/userExtView.jsp (.../userExtView.jsp) (revision 35306) @@ -42,6 +42,10 @@ System_User_Select = false; } +var enableUserAccountDeactivationFunction = false; +if(System_User_Select && sstsConfig.enableUserAccountDeactivationFunction){ + enableUserAccountDeactivationFunction = true; +} @@ -53,7 +57,7 @@
- +
Index: ssts-web/src/main/webapp/homepage/menuconfigure.js =================================================================== diff -u -r35265 -r35306 --- ssts-web/src/main/webapp/homepage/menuconfigure.js (.../menuconfigure.js) (revision 35265) +++ ssts-web/src/main/webapp/homepage/menuconfigure.js (.../menuconfigure.js) (revision 35306) @@ -975,6 +975,7 @@ {hidden :System_Orgunit_Select,text:"组织机构",href:WWWROOT+'/systemmanage/orgUnitExtView.jsp',hrefTarget:linkTarget,leaf:true,icon:WWWROOT+'/images/icon_org.gif'}, {hidden :System_Orgunit_Select,text:"停用的组织机构",href:WWWROOT+'/systemmanage/disabledOrgUnitExtView.jsp',hrefTarget:linkTarget,leaf:true,icon:WWWROOT+'/images/icon_org.gif'}, {hidden :System_User_Select,text:"用户管理",href:WWWROOT+'/systemmanage/userExtView.jsp',hrefTarget:linkTarget,leaf:true,icon:WWWROOT+'/images/icon_user.gif'}, + {hidden :System_User_Select,text:"停用的用户管理",href:WWWROOT+'/systemmanage/userExtViewForDisable.jsp',hrefTarget:linkTarget,leaf:true,icon:WWWROOT+'/images/icon_user.gif'}, {hidden :System_Role_Select,text:"权限管理",href:WWWROOT+'/systemmanage/roleList.jsp',hrefTarget:linkTarget,leaf:true,icon:WWWROOT+'/images/icon_role.gif'}, {hidden :System_Log_Menu,text:"日志管理",href:WWWROOT+'/log/loggrid.jsp',hrefTarget:linkTarget,leaf:true}, {hidden :System_DBManage,text:"初始化演示数据",href:WWWROOT+'/systemmanage/initData.jsp',hrefTarget:linkTarget,leaf:true}, Index: ssts-web/src/main/webapp/systemmanage/userExtViewForDisable.jsp =================================================================== diff -u --- ssts-web/src/main/webapp/systemmanage/userExtViewForDisable.jsp (revision 0) +++ ssts-web/src/main/webapp/systemmanage/userExtViewForDisable.jsp (revision 35306) @@ -0,0 +1,64 @@ +<%@ page language="java" contentType="text/html; charset=UTF-8" %> +<%@ include file="/common/taglibs.jsp"%> + +<% + LoginUserData loginUser = AcegiHelper.getLoginUser(); + request.setAttribute("userLoginName",loginUser.getUserName()); + request.setAttribute("currentOrgUnitName",loginUser.getCurrentOrgUnitName()); +%> + + + +用户列表 + + + + + + + + + + + + + + + +<%@ include file="/common/includeExtJsAndCss.jsp"%> +<%@ include file="/common/include_Ext42_Js.jsp"%> +<%@ include file="/disinfectsystem/print/print.jsp"%> + + + + + + + + + + +
+ + + +
+ + \ No newline at end of file Index: ssts-web/src/main/webapp/systemmanage/userExtViewForDisable.js =================================================================== diff -u --- ssts-web/src/main/webapp/systemmanage/userExtViewForDisable.js (revision 0) +++ ssts-web/src/main/webapp/systemmanage/userExtViewForDisable.js (revision 35306) @@ -0,0 +1,170 @@ +// 停用/启用用户 +function disableOrEnableDefinition(isDisabled, grid) { + var ids = grid.getSelectedValues('id', ';'); + if (ids == '') { + showResult('请至少选择一个用户！'); + return; + } + Ext.Ajax.request({ + url: WWWROOT + '/systemmanage/user/userAction!disableOrEnableUser.do', + params: { + ids: ids, + isDisabled: isDisabled + }, + success: function (response, options) { + var result = Ext.decode(response.responseText); + if (result != null && result.length != 0) { + if (result.success) { + showResult(isDisabled + '成功！'); + $Id("parm_s_status").value = 0; + grid.dwrReload(); + } else { + showResult(isDisabled + '失败！'); + } + } + }, + failure: function () { + showResult(isDisabled + '失败！'); + } + }); +} + +function exportCurrent() { + var sql = encodeURIComponent($Id('selectSqlWhereCondition').value.Trim()); + sql = ' where 1=1 and (status = 0 or status is null) '; + location.href = WWWROOT + "/systemmanage/userExport.jsp?sql=" + sql; +} + + +function moveUp(id) { + UserTableManager.moveUpUserInOrgUnit(id, function () { grid.dwrReload(); }); +} + +function moveDown(id) { + UserTableManager.moveDownUserInOrgUnit(id, function () { grid.dwrReload(); }); +} + +//********* 0、全局变量 *********** +var entityName = "用户"; +var viewport; +var grid; + +Ext.onReady(function () { + Ext.QuickTips.init(); + $Id("parm_s_status").value = 0; + + //********* 2、ForgonGrid *********** + function gotoPage(v, p, record) { + ///userForm.mhtml + return "" + v + ""; + } + + function returnEmptyValueIfNull(v) { + if (v == "null") { + return ""; + } + return v; + } + + function moveUpDown(v, p, record) { + var html = ''; + html += '向上移动   '; + html += ''; + html += '向下移动'; + return html; + } + + //Ext.state.Manager.setProvider(new Ext.state.CookieProvider()); + var columns = [ + /*{header: "user.id", width: 50, hidden:true,sortable: true,resizable: true, menuDisabled: false, dataIndex: 'user.id'},*/ + { header: "姓名", width: 100, dataIndex: 'user.fullName', renderer: gotoPage, sortable: false, menuDisabled: true }, + { header: "登录名", width: 100, dataIndex: 'user.name', sortable: false, menuDisabled: true }, + { header: "所属科室", width: 200, dataIndex: 'user.orgUnitNames', sortable: false, menuDisabled: true, renderer: returnEmptyValueIfNull }, + { header: '条码', width: 150, dataIndex: 'user.barcode', sortable: false }, + { header: '数据来源', width: 100, dataIndex: 'user.source', sortable: false }, + { header: '锁定', width: 100, dataIndex: 'user.lockStatus', sortable: false }, + { id: 'operationDescription', header: "拥有角色", width: 150, dataIndex: 'user.roleNames', sortable: false, menuDisabled: true, renderer: returnEmptyValueIfNull }, + { header: "排序操作", width: 100, dataIndex: 'orgUserRelationID', renderer: moveUpDown, sortable: false, menuDisabled: true, hidden: false }, + {header: "拼音码", width: 100, dataIndex: 'user.spelling', hidden: true, sortable: false, menuDisabled: true}, + {header: "五笔码", width: 100, dataIndex: 'user.wbCode', hidden: true, sortable: false, menuDisabled: true} + ]; + + + var readerDetail = [ + { name: 'id' }, + { name: 'orgUserRelationID' }, + { name: 'user.id' }, + { name: 'user.fullName' }, + { name: 'user.barcode' }, + { name: 'user.name' }, + { name: 'user.orgUnitNames' }, + { name: 'user.source' }, + { name: 'user.lockStatus' }, + { name: 'user.roleNames' } + ]; + + var filters = new Ext.grid.GridFilters({ + filters: [ + { type: 'string', dataIndex: 'user.name' }, + { type: 'string', dataIndex: 'user.fullName' } + ] + }); + + var tbar = [{ + text: '启用', + //hidden : !enableUserAccountDeactivationFunction, + iconCls: 'btn_ext_application_add', + handler: function () { + top.Ext.MessageBox.confirm("请确认", "是否启用选中的用户？", function (btn) { + if (btn == "yes") { + disableOrEnableDefinition("启用", grid); + } + }); + } + }, '-', { + text: '导出', + tooltip: '导出' + entityName + '信息', + iconCls: 'btn_ext_download', + hidden: false, + handler: function () { + exportCurrent(); + } + }]; + + var dwrCallParams = null; + + //所有grid之外的参数用这个方法传入,返回的是Map> + Ext.ux.ForgonPageGrid.prototype.getGridParameterMap = function () { + + }; + grid = new Ext.ux.ForgonPageGrid({ + tbar: tbar, + pageSize: 30, + defaultSortField: 'userOrder', + defaultSortDirection: 'ASC', + isCheckboxSelectionModel: true, + rememberSelected: false, + plugins: filters, + columns: columns, + autoExpandColumn: 'operationDescription', + isShowSearchField: true, + searchDisableIndexes: ['id', 'user.barcode', 'user.orgUnitNames', 'user.source', 'user.roleNames', 'orgUserRelationID'], + frame: false + }, + readerDetail, + UserTableManager.findOrgUserTableList, + dwrCallParams //这个参数只是占位作用 + ); + + viewport = new Ext.Viewport({ + layout: 'border', + items: [{ + region: 'center', + margins: '0 5 5 0', + xtype: 'panel', + autoScroll: true, + layout: 'fit', + items: grid + }] + }); +}); \ No newline at end of file Index: ssts-web/src/main/webapp/systemmanage/userExtView.js =================================================================== diff -u -r33137 -r35306 --- ssts-web/src/main/webapp/systemmanage/userExtView.js (.../userExtView.js) (revision 33137) +++ ssts-web/src/main/webapp/systemmanage/userExtView.js (.../userExtView.js) (revision 35306) @@ -47,6 +47,37 @@ }); } +// 停用/启用用户 +function disableOrEnableDefinition (isDisabled,grid) { + var ids = grid.getSelectedValues('id', ';'); + if(ids == ''){ + showResult('请至少选择一个用户！'); + return; + } + Ext.Ajax.request({ + url: WWWROOT + '/systemmanage/user/userAction!disableOrEnableUser.do', + params: { + ids : ids, + isDisabled : isDisabled + }, + success: function(response ,options){ + var result = Ext.decode(response.responseText); + if(result!=null && result.length!=0){ + if(result.success){ + showResult(isDisabled + '成功！'); + $Id("parm_s_status").value = 1; + grid.dwrReload(); + }else{ + showResult(isDisabled + '失败！'); + } + } + }, + failure: function(){ + showResult(isDisabled + '失败！'); + } + }); +} + function updateAllUserSmsSendAmount(){ openNewSizeWindow(WWWROOT + '/systemmanage/setSmsSendAmount.jsp', '修改所有用户短信数量', '400', '160',"no"); } @@ -135,7 +166,7 @@ function exportCurrent(){ var sql = encodeURIComponent($Id('selectSqlWhereCondition').value.Trim()); - sql = ' where 1=1 '; + sql = ' where 1=1 and (status = 1 or status is null) '; location.href=WWWROOT + "/systemmanage/userExport.jsp?sql="+sql; } @@ -534,8 +565,18 @@ showResult('未选择用户！'); } } - } - ]; + }, '-', { + text:'停用', + //hidden : !enableUserAccountDeactivationFunction, + iconCls : 'btn_ext_application_add', + handler : function() { + top.Ext.MessageBox.confirm("请确认", "是否停用选中的用户？", function (btn) { + if (btn == "yes") { + disableOrEnableDefinition("停用",grid); + } + }); + } + }]; var dwrCallParams = null;