Index: ssts-basedata/src/main/java/com/forgon/disinfectsystem/basedatamanager/supplyroomconfig/service/SupplyRoomConfigManager.java =================================================================== diff -u -r13689 -r13744 --- ssts-basedata/src/main/java/com/forgon/disinfectsystem/basedatamanager/supplyroomconfig/service/SupplyRoomConfigManager.java (.../SupplyRoomConfigManager.java) (revision 13689) +++ ssts-basedata/src/main/java/com/forgon/disinfectsystem/basedatamanager/supplyroomconfig/service/SupplyRoomConfigManager.java (.../SupplyRoomConfigManager.java) (revision 13744) @@ -3,7 +3,9 @@ import java.util.Date; import java.util.List; import java.util.Map; + import net.sf.json.JSONArray; + import com.forgon.directory.model.OrgUnit; import com.forgon.directory.vo.LoginUserData; import com.forgon.disinfectsystem.entity.basedatamanager.supplyroomconfig.SupplyRoomConfig; @@ -80,7 +82,22 @@ public boolean isCssdTraceabilitySystemRelativeDepartment(String orgUnitCoding); public OrgUnit getOrgUnitByOrgName(String depart); - // 科室是否是一级供应室 + /** + * 科室是否是一级供应室 + * @param orgUnitCoding + * @return + */ public boolean isFirstSupplyRoomOrgUnit(String orgUnitCoding); public JSONArray getCssdList(); + /** + * 判断登录用户是否是供应室用户,包括一级供应室和二级供应室 + * @param user 登录用户信息 + * @return + */ + public boolean isSupplyRoomUser(LoginUserData user); + /** + * 判断当前登录用户是否是供应室用户,包括一级供应室和二级供应室 + * @return + */ + public boolean isSupplyRoomUser(); } Index: ssts-web/src/main/webapp/disinfectsystem/touchScreen/recycle/js/recycleRecordFilterManager.js =================================================================== diff -u -r13571 -r13744 --- ssts-web/src/main/webapp/disinfectsystem/touchScreen/recycle/js/recycleRecordFilterManager.js (.../recycleRecordFilterManager.js) (revision 13571) +++ ssts-web/src/main/webapp/disinfectsystem/touchScreen/recycle/js/recycleRecordFilterManager.js (.../recycleRecordFilterManager.js) (revision 13744) @@ -1,4 +1,4 @@ -//历史回收记录过滤处理 +//历史回收记录过滤处理。改为记录到Cookie中的方式，依赖于/js/CookieManager.js function RecycleRecordFilterManager(){ //科室名称 var departName = ''; @@ -19,88 +19,149 @@ //设置过滤的科室，返回条件表示是否有修改 this.selectDepart = function(name,code){ + departCode = CookieManager.getCookie('departCode'); if(name.length > 0 && code.length > 0 && departCode.indexOf(code) == -1){ - departCode = code; - departName = name; + CookieManager.setCookie('departCode',code); + CookieManager.setCookie('departName',name); return true; } return false; } + /** + * 判断科室的过滤是否启用。如果cookie中记录了科室的过滤条件，则返回true,否则返回false + */ + this.departEnabled = function(){ + departCode = CookieManager.getCookie('departCode'); + if(departCode && departCode.length > 0){ + return true; + } + return false; + } //设置过滤的操作员，返回条件表示是否有修改 this.selectUser = function(name,fullName){ + userName = CookieManager.getCookie('userName'); if(name.length > 0 && fullName.length > 0 && userName.indexOf(name) == -1){ - userName = name; - userFullName = fullName; + CookieManager.setCookie('userName',name); + CookieManager.setCookie('userFullName',fullName); return true; } return false; } + /** + * 判断操作员的过滤是否启用。如果cookie中记录了操作员的过滤条件，则返回true,否则返回false + */ + this.userEnabled = function(){ + userName = CookieManager.getCookie('userName'); + if(userName && userName.length > 0){ + return true; + } + return false; + } //设置过滤的状态，返回条件表示是否有修改 this.selectStatus = function(sts){ + status = CookieManager.getCookie('status'); if(sts && sts.length > 0 && status.indexOf(sts) == -1){ - status = sts; + CookieManager.setCookie('status',sts); return true; } return false; } + /** + * 判断申请单的状态过滤是否启用。如果cookie中记录了申请单状态的过滤条件，则返回true,否则返回false + */ + this.statusEnabled = function(){ + status = CookieManager.getCookie('status'); + if(status && status.length > 0){ + return true; + } + return false; + } //设置过滤的申请单类型，返回值表示是否有修改 this.selectApplicationType = function(type){ + applicationType = CookieManager.getCookie('applicationType'); if(type && type.length > 0 && applicationType.indexOf(type) == -1){ - applicationType = type; + CookieManager.setCookie('applicationType',type); return true; } return false; } + /** + * 判断申请单的状态过滤是否启用。如果cookie中记录了申请单状态的过滤条件，则返回true,否则返回false + */ + this.applicationTypeEnabled = function(){ + applicationType = CookieManager.getCookie('applicationType'); + if(applicationType && applicationType.length > 0){ + return true; + } + return false; + } this.selectRecyclingDateRange = function(dateRange){ + recyclingDateRange = CookieManager.getCookie('recyclingDateRange'); if(dateRange && dateRange.length > 0 && recyclingDateRange.indexOf(dateRange) == -1){ - recyclingDateRange = dateRange; + CookieManager.setCookie('recyclingDateRange',dateRange); return true; } return false; } - + /** + * 判断回收日期的过滤是否启用。如果cookie中记录的回收日期的过滤范围，则返回true,否则返回false + */ + this.recyclingDateEnabled = function(){ + recyclingDateRange = CookieManager.getCookie('recyclingDateRange'); + if(recyclingDateRange && recyclingDateRange.length > 0){ + return true; + } + return false; + } this.selectIDCardBarcode = function(barcode){ + idCardBarcode = CookieManager.getCookie('idCardBarcode'); if(barcode.length > 0 && idCardBarcode.indexOf(barcode) == -1){ - idCardBarcode = barcode; + CookieManager.setCookie('idCardBarcode',barcode); return true; } return false; } this.getFilter = function(){ var filter = '{'; + departCode = CookieManager.getCookie('departCode'); if(departCode.length > 0){ filter += '"departCode":'; filter += '"' + departCode + '"'; } + userFullName = CookieManager.getCookie('userFullName'); if(userFullName.length > 0){ if(filter.length > 1){ filter += ','; } filter += '"userName":'; filter += '"' + userFullName + '"'; } + status = CookieManager.getCookie('status'); if(status.length > 0){ if(filter.length > 1){ filter += ','; } filter += '"status":'; filter += '"' + status + '"'; } + applicationType = CookieManager.getCookie('applicationType'); if(applicationType.length > 0){ if(filter.length > 1){ filter += ','; } filter += '"applicationType":'; filter += '"' + applicationType + '"'; } + recyclingDateRange = CookieManager.getCookie('recyclingDateRange'); if(recyclingDateRange.length > 0){ if(filter.length > 1){ filter += ','; } filter += '"recyclingDateRange":'; filter += recyclingDateRange; } + idCardBarcode = CookieManager.getCookie('idCardBarcode'); if(idCardBarcode.length > 0){ if(filter.length > 1){ filter += ','; @@ -115,36 +176,44 @@ var ret = false; ret |= resetDepart(); ret |= resetUser(); + status = CookieManager.getCookie('status'); if(status.length > 0){ - status = ''; + CookieManager.deleteCookie('status'); ret = true; } + applicationType = CookieManager.getCookie('applicationType'); if(applicationType.length > 0){ - applicationType = ''; + CookieManager.deleteCookie('applicationType'); ret = true; } + recyclingDateRange = CookieManager.getCookie('recyclingDateRange'); if(recyclingDateRange.length > 0){ - recyclingDateRange = ''; + CookieManager.deleteCookie('recyclingDateRange'); ret = true; } + idCardBarcode = CookieManager.getCookie('idCardBarcode'); if(idCardBarcode.length > 0){ - idCardBarcode = ''; + CookieManager.deleteCookie('idCardBarcode'); ret = true; } return ret; } function resetUser(){ + userName = CookieManager.getCookie('userName'); + userFullName = CookieManager.getCookie('userFullName'); if(userName.length > 0 || userFullName.length > 0){ - userName = ''; - userFullName = ''; + CookieManager.deleteCookie('userName'); + CookieManager.deleteCookie('userFullName'); return true; } return false; } function resetDepart(){ + departCode = CookieManager.getCookie('departCode'); + departName = CookieManager.getCookie('departName'); if(departCode.length > 0 || departName.length > 0){ - departCode = ''; - departName = ''; + CookieManager.deleteCookie('departCode'); + CookieManager.deleteCookie('departName'); return true; } return false; Index: forgon-core/src/main/java/com/forgon/security/service/UserManagerImpl.java =================================================================== diff -u -r13630 -r13744 --- forgon-core/src/main/java/com/forgon/security/service/UserManagerImpl.java (.../UserManagerImpl.java) (revision 13630) +++ forgon-core/src/main/java/com/forgon/security/service/UserManagerImpl.java (.../UserManagerImpl.java) (revision 13744) @@ -36,6 +36,7 @@ import com.forgon.tools.Constants; import com.forgon.tools.GB2Alpha; import com.forgon.tools.GB2WB; +import com.forgon.tools.SqlBuilder; import com.forgon.tools.db.DatabaseUtil; import com.forgon.tools.hibernate.ObjectDao; import com.forgon.tools.string.StringTools; @@ -308,14 +309,16 @@ } return relations; } - - // 查找属于某个部门的用户 - public JSONArray searchUsers(String searchString, String orgUnitCoding){ + @Override + public JSONArray searchUsers(String searchString, String[] orgUnitCodes) { JSONArray array = new JSONArray(); - + String orgCodesFilter = " 1=1 "; + if(ArrayUtils.isNotEmpty(orgUnitCodes)){ + orgCodesFilter = SqlBuilder.build_IN_Statement("o.orgUnitCoding", SqlBuilder.IN, orgUnitCodes); + } String sql = "select u.id,u.fullName,u.name as name,o.name as orgUnitName,bd.barcode as barcode from SS_Users u inner join barcodeDevice bd on u.id=bd.id inner join OrgUserRelation ou" + - " on u.id = ou.userId inner join OrgUnit o on ou.orgUnitId = o.id where" + - " o.orgUnitCoding = '" + orgUnitCoding + "'"; + " on u.id = ou.userId inner join OrgUnit o on ou.orgUnitId = o.id where " + + orgCodesFilter; Matcher m = Constants.ChineseCharPattern.matcher(searchString); @@ -331,7 +334,6 @@ } } - ResultSet resultSet = objectDao.executeSql(sql); if (resultSet != null) { try { @@ -353,10 +355,12 @@ DatabaseUtil.closeResultSetAndStatement(resultSet); } } - - return array; } + @Override + public JSONArray searchUsers(String searchString, String orgUnitCoding){ + return searchUsers(searchString,new String[]{orgUnitCoding}); + } public int countUserBySql(String objectPOName, String sql, boolean searchUserOfNoOrg) { @@ -466,29 +470,5 @@ } return user; - } - - @SuppressWarnings("unchecked") - @Override - public List findUserBySpellOrWbCode(String spellOrWb) { - spellOrWb = spellOrWb.toUpperCase(); - String sql = " where 1=1 "; - Pattern pat = Pattern.compile("[\\u4E00-\\u9FA5]+"); // 匹配中文字符的正则表达式 - Matcher m = pat.matcher(spellOrWb); - String searchMode = AcegiHelper.getLoginUser().getSearchMode(); - if (spellOrWb.trim().length() > 0) { - if (m.find()) { - sql += " and po.fullName like '%" + spellOrWb + "%'"; - }else { - sql += SqlUtils.getSearchSQL(searchMode, spellOrWb); - } - } else { - sql += " and (po.spelling like '%" + spellOrWb - + "%' or po.wbCode like '%" + spellOrWb + "%') "; - } - sql += " and po.id != 0 "; - - return objectDao.findBySql(User.class.getSimpleName(), sql); - } - + } } Index: ssts-web/src/main/webapp/disinfectsystem/touchScreen/recycle/selectRecyclingDate.jsp =================================================================== diff -u -r13283 -r13744 --- ssts-web/src/main/webapp/disinfectsystem/touchScreen/recycle/selectRecyclingDate.jsp (.../selectRecyclingDate.jsp) (revision 13283) +++ ssts-web/src/main/webapp/disinfectsystem/touchScreen/recycle/selectRecyclingDate.jsp (.../selectRecyclingDate.jsp) (revision 13744) @@ -8,6 +8,7 @@ +
@@ -102,24 +103,46 @@ } function init(){ var myDate=new Date(); - var year = myDate.getFullYear(); - var month = myDate.getMonth()+1; - var day = myDate.getDate(); - var hour = myDate.getHours(); - var minute = myDate.getMinutes(); + var startYear = myDate.getFullYear(); + var startMonth = myDate.getMonth()+1; + var startDay = myDate.getDate(); + var startHour = myDate.getHours(); + var startMinite = myDate.getMinutes(); - id('startYear').value = year; - id('startMonth').value = month; - id('startDay').value = day; - id('startHour').value = hour; - id('startMinite').value = minute; + var endYear = myDate.getFullYear(); + var endMonth = myDate.getMonth()+1; + var endDay = myDate.getDate(); + var endHour = myDate.getHours(); + var endMinite = myDate.getMinutes(); - id('endYear').value = year; - id('endMonth').value = month; - id('endDay').value = day; - id('endHour').value = hour; - id('endMinite').value = minute; + var recyclingDateRange = CookieManager.getCookie('recyclingDateRange'); + if(recyclingDateRange.length > 0){ + var dateRange = eval('(' + recyclingDateRange + ')'); + startYear = dateRange.start.year; + startMonth = dateRange.start.month; + startDay = dateRange.start.day; + startHour = dateRange.start.hour; + startMinite = dateRange.start.minute; + + endYear = dateRange.end.year; + endMonth = dateRange.end.month; + endDay = dateRange.end.day; + endHour = dateRange.end.hour; + endMinite = dateRange.end.minute; + } + id('startYear').value = startYear; + id('startMonth').value = startMonth; + id('startDay').value = startDay; + id('startHour').value = startHour; + id('startMinite').value = startMinite; + + id('endYear').value = endYear; + id('endMonth').value = endMonth; + id('endDay').value = endDay; + id('endHour').value = endHour; + id('endMinite').value = endMinite; + } function selectDate(){ window.parent.selectDepart(departName,departCode); Index: forgon-core/src/main/java/com/forgon/security/service/UserManager.java =================================================================== diff -u -r12560 -r13744 --- forgon-core/src/main/java/com/forgon/security/service/UserManager.java (.../UserManager.java) (revision 12560) +++ forgon-core/src/main/java/com/forgon/security/service/UserManager.java (.../UserManager.java) (revision 13744) @@ -37,8 +37,20 @@ public User getUserByUserCode(String userCode); public List searchUsersWithNoOrgUnit(String selectSqlWhereCondition); - + /** + * 查找属于某个部门的用户 + * @param searchString 查找字符串 + * @param orgUnitCoding 要查找的部门编码 + * @return + */ public JSONArray searchUsers(String searchString, String orgUnitCoding); + /** + * 查找属于某些部门的用户 + * @param searchString 查找字符串 + * @param orgUnitCodes 要查找的部门编码集合 + * @return + */ + public JSONArray searchUsers(String searchString, String[] orgUnitCodes); public int countUserBySql(String objectPOName, String sql, boolean searchUserOfNoOrg); @@ -47,6 +59,5 @@ int firstIndex, int maxResults, String orderField,int totalPage, boolean searchUserOfNoOrg); public List findUserBySql(String sql); - public List findUserBySpellOrWbCode(String spellOrWb); long getMaxUserOrder(Long orgUnitId); } Index: ssts-basedata/src/main/java/com/forgon/disinfectsystem/basedatamanager/supplyroomconfig/service/SupplyRoomConfigManagerImpl.java =================================================================== diff -u -r13689 -r13744 --- ssts-basedata/src/main/java/com/forgon/disinfectsystem/basedatamanager/supplyroomconfig/service/SupplyRoomConfigManagerImpl.java (.../SupplyRoomConfigManagerImpl.java) (revision 13689) +++ ssts-basedata/src/main/java/com/forgon/disinfectsystem/basedatamanager/supplyroomconfig/service/SupplyRoomConfigManagerImpl.java (.../SupplyRoomConfigManagerImpl.java) (revision 13744) @@ -12,6 +12,7 @@ import org.apache.commons.lang.StringUtils; +import com.forgon.directory.acegi.tools.AcegiHelper; import com.forgon.directory.model.OrgUnit; import com.forgon.directory.service.OrgUnitManager; import com.forgon.directory.vo.LoginUserData; @@ -20,6 +21,7 @@ import com.forgon.tools.MathTools; import com.forgon.tools.cache.ForgonThreadLocalResourceManager; import com.forgon.tools.hibernate.ObjectDao; +import com.forgon.tools.string.StringTools; import com.forgon.treenode.model.THTreeNode; /** @@ -495,4 +497,30 @@ } return jsonArray; } + + @Override + public boolean isSupplyRoomUser(LoginUserData user) { + if(user != null){ + SupplyRoomConfig firstSupplyRoom = getFirstSupplyRoomConfig(); + if (firstSupplyRoom != null) { + if(StringTools.equals(firstSupplyRoom.getOrgUnitCoding(), user.getCurrentOrgUnitCode())){ + return true; + } + } + List secondSupplyRooms = getSecondSupplyRoomList(); + if (secondSupplyRooms != null) { + for (SupplyRoomConfig config : secondSupplyRooms) { + if(StringTools.equals(config.getOrgUnitCoding(), user.getCurrentOrgUnitCode())){ + return true; + } + } + } + } + return false; + } + + @Override + public boolean isSupplyRoomUser() { + return isSupplyRoomUser(AcegiHelper.getLoginUser()); + } } Index: ssts-web/src/main/java/com/forgon/disinfectsystem/directory/dwr/table/UserTableManager.java =================================================================== diff -u -r13725 -r13744 --- ssts-web/src/main/java/com/forgon/disinfectsystem/directory/dwr/table/UserTableManager.java (.../UserTableManager.java) (revision 13725) +++ ssts-web/src/main/java/com/forgon/disinfectsystem/directory/dwr/table/UserTableManager.java (.../UserTableManager.java) (revision 13744) @@ -28,6 +28,7 @@ import com.forgon.security.service.RoleManager; import com.forgon.security.service.UserManager; import com.forgon.systemsetting.service.SystemconfigureManager; +import com.forgon.tools.string.StringTools; /** * @author yuanbin @@ -399,21 +400,20 @@ return null; } public String searchUserBySpellOrWbCode(String simpleSpell) { - List userList = userManager. - findUserBySpellOrWbCode(simpleSpell); - StringBuffer buffer = new StringBuffer(); - int i = 0; - for (User user : userList) { + String orgUnitCodes = AcegiHelper.getLoginUser().getDirectOrgUnitCodesWhereUserBelong(); + String[] orgUnitCodesArray = null; + if(StringTools.isNotBlank(orgUnitCodes)){ + orgUnitCodesArray = orgUnitCodes.split(";"); + } + JSONArray allArray = userManager.searchUsers(simpleSpell, orgUnitCodesArray); + JSONArray array = new JSONArray(); + for (int i = 0; i < allArray.size();++i) { if (i == 12) { break; } - buffer.append(user.getName() + "," + user.getFullName() - + "," + user.getBarcode() + ";"); + array.add(allArray.getJSONObject(i)); i++; } - if (buffer.length() > 0) { - return buffer.toString().substring(0, buffer.length() - 1); - } - return ""; + return array.toString(); } } \ No newline at end of file Index: ssts-web/src/main/webapp/disinfectsystem/touchScreen/recycle/selectUser.jsp =================================================================== diff -u -r12560 -r13744 --- ssts-web/src/main/webapp/disinfectsystem/touchScreen/recycle/selectUser.jsp (.../selectUser.jsp) (revision 12560) +++ ssts-web/src/main/webapp/disinfectsystem/touchScreen/recycle/selectUser.jsp (.../selectUser.jsp) (revision 13744) @@ -99,14 +99,15 @@ inputObj.value = inputValue + sign; UserTableManager.searchUserBySpellOrWbCode(inputObj.value,function(result){ if(result != null && result.length > 0){ + var userArray = eval('(' + result + ')') var htmlResultCode = "
    "; - var tousseArray = result.split(";"); - for(var i = 0 ; i < tousseArray.length ; i++){ - var array = tousseArray[i].split(','); - htmlResultCode += "
  • " + array[1] + "
    • "; + //var tousseArray = result.split(";"); + for(var i = 0 ; i < userArray.length ; i++){ + var user = userArray[i]; + htmlResultCode += "
  • " + user.fullName + "
    • "; } - if(tousseArray.length < 12){ - for(var i = tousseArray.length ; i < 12 ; i++){ + if(userArray.length < 12){ + for(var i = userArray.length ; i < 12 ; i++){ htmlResultCode += "
    • "; } } Index: ssts-web/src/main/webapp/disinfectsystem/touchScreen/recycle/awaitForRecycleList.jsp =================================================================== diff -u -r13622 -r13744 --- ssts-web/src/main/webapp/disinfectsystem/touchScreen/recycle/awaitForRecycleList.jsp (.../awaitForRecycleList.jsp) (revision 13622) +++ ssts-web/src/main/webapp/disinfectsystem/touchScreen/recycle/awaitForRecycleList.jsp (.../awaitForRecycleList.jsp) (revision 13744) @@ -47,6 +47,7 @@ + @@ -376,7 +377,7 @@ }); firstPage(); document.onkeydown = showKeyDown; - + updateHeaderStatus(); }); function IEVersion(){ var userAgent = window.navigator.userAgent.toLowerCase(); @@ -842,16 +843,45 @@ function clearFilter(){ if(recycleRecordFilterManager.reset()){ firstPage(); //清除过滤后就进入到首页 - resetHeader(); + updateHeaderStatus(); + //resetHeader(); } } -function resetHeader(){ +//更新历史回收记录表头样式 +function updateHeaderStatus(){ + if(recycleRecordFilterManager.departEnabled()){ + setHeaderFilterStyle("depart"); + }else{ + resetHeaderFilterStyle("depart"); + } + if(recycleRecordFilterManager.userEnabled()){ + setHeaderFilterStyle("operator"); + }else{ + resetHeaderFilterStyle("operator"); + } + if(recycleRecordFilterManager.statusEnabled()){ + setHeaderFilterStyle("state"); + }else{ + resetHeaderFilterStyle("state"); + } + if(recycleRecordFilterManager.applicationTypeEnabled()){ + setHeaderFilterStyle("applicationType"); + }else{ + resetHeaderFilterStyle("applicationType"); + } + if(recycleRecordFilterManager.recyclingDateEnabled()){ + setHeaderFilterStyle("recyclingDate"); + }else{ + resetHeaderFilterStyle("recyclingDate"); + } +} +/*function resetHeader(){ resetHeaderFilterStyle("depart"); resetHeaderFilterStyle("operator"); resetHeaderFilterStyle("state"); resetHeaderFilterStyle("applicationType"); resetHeaderFilterStyle("recyclingDate"); -} +}*/ function setHeaderFilterStyle(id){ $("#" + id).css("font-weight","bold"); $("#" + id).css("font-style","italic"); @@ -866,7 +896,8 @@ function selectDepart(departName,departCode){ if(recycleRecordFilterManager.selectDepart(departName,departCode)){ firstPage(); //过滤后就进入到首页 - setHeaderFilterStyle("depart"); + updateHeaderStatus(); + //setHeaderFilterStyle("depart"); } } function filterUser(){ @@ -875,7 +906,8 @@ function selectUser(userName,userFullName){ if(recycleRecordFilterManager.selectUser(userName,userFullName)){ firstPage(); //过滤后就进入到首页 - setHeaderFilterStyle("operator"); + updateHeaderStatus(); + //setHeaderFilterStyle("operator"); } } function filterStatus(){ @@ -884,7 +916,8 @@ function selectStatus(status){ if(recycleRecordFilterManager.selectStatus(status)){ firstPage(); //过滤后就进入到首页 - setHeaderFilterStyle("state"); + updateHeaderStatus(); + //setHeaderFilterStyle("state"); } } function selectIdCardBarcode(barcode){ @@ -898,7 +931,8 @@ function selectApplicationType(type){ if(recycleRecordFilterManager.selectApplicationType(type)){ firstPage(); //过滤后就进入到首页 - setHeaderFilterStyle("applicationType"); + updateHeaderStatus(); + //setHeaderFilterStyle("applicationType"); } } function filterRecyclingDate(){ @@ -907,7 +941,8 @@ function selectRecyclingDate(dateRange){ if(recycleRecordFilterManager.selectRecyclingDateRange(dateRange)){ firstPage(); //过滤后就进入到首页 - setHeaderFilterStyle("recyclingDate"); + updateHeaderStatus(); + //setHeaderFilterStyle("recyclingDate"); } } Index: ssts-web/src/main/webapp/js/common.js =================================================================== diff -u -r13266 -r13744 --- ssts-web/src/main/webapp/js/common.js (.../common.js) (revision 13266) +++ ssts-web/src/main/webapp/js/common.js (.../common.js) (revision 13744) @@ -1556,19 +1556,6 @@ return tableTile; } -var CookieManager = new Object(); -CookieManager.getCookie = function (cookieName){ - var cookieValue = ''; - var posName = document.cookie.indexOf(escape(cookieName) + '='); - if (posName != -1) { - var posValue = posName + (escape(cookieName) + '=').length; - var endPos = document.cookie.indexOf(';', posValue); - if (endPos != -1) cookieValue = unescape(document.cookie.substring(posValue, endPos)); - else cookieValue = unescape(document.cookie.substring(posValue)); - } - return (cookieValue); -}; - function viewObject(o){ if(o!=null){ var alertStr = ''; Index: ssts-web/src/main/webapp/js/CookieManager.js =================================================================== diff -u --- ssts-web/src/main/webapp/js/CookieManager.js (revision 0) +++ ssts-web/src/main/webapp/js/CookieManager.js (revision 13744) @@ -0,0 +1,33 @@ +/** + * 操作Cookie的类，包括添加和获取及删除。纯js实现 + */ +var CookieManager = new Object(); +CookieManager.getCookie = function (cookieName){ + var cookieValue = ''; + var posName = document.cookie.indexOf(escape(cookieName) + '='); + if (posName != -1) { + var posValue = posName + (escape(cookieName) + '=').length; + var endPos = document.cookie.indexOf(';', posValue); + if (endPos != -1) cookieValue = unescape(document.cookie.substring(posValue, endPos)); + else cookieValue = unescape(document.cookie.substring(posValue)); + } + return (cookieValue); +}; + +CookieManager.setCookie = function(cookieName,value,expiredays){ + if(!expiredays){ + expiredays = 365; + } + var exdate=new Date(); + exdate.setDate(exdate.getDate()+expiredays); + document.cookie=cookieName+ "=" +escape(value)+";expires="+exdate.toGMTString(); +} + +CookieManager.deleteCookie = function (name){ + var exp = new Date(); + exp.setTime(exp.getTime() - 1); + var cval=getCookie(name); + if(cval!=null){ + document.cookie= name + "="+cval+";expires="+exp.toGMTString(); + } +} \ No newline at end of file