Index: ssts-web/src/main/webapp/disinfectsystem/config/gdsy/config.js =================================================================== diff -u -r15838 -r15970 --- ssts-web/src/main/webapp/disinfectsystem/config/gdsy/config.js (.../config.js) (revision 15838) +++ ssts-web/src/main/webapp/disinfectsystem/config/gdsy/config.js (.../config.js) (revision 15970) @@ -118,6 +118,8 @@ isShowNoPrintList : true, //是否显示按照时间查询 showTimeSearch : true, + //待回收列表显示记住回收人按钮 + showRememberRecycleUserButton : true, //发货计划按申请单类型查询model appFormModel : [ ['全部申请单', ''] Index: ssts-web/src/main/webapp/disinfectsystem/touchScreen/recycle/recycleForTouchScreen.jsp =================================================================== diff -u -r15561 -r15970 --- ssts-web/src/main/webapp/disinfectsystem/touchScreen/recycle/recycleForTouchScreen.jsp (.../recycleForTouchScreen.jsp) (revision 15561) +++ ssts-web/src/main/webapp/disinfectsystem/touchScreen/recycle/recycleForTouchScreen.jsp (.../recycleForTouchScreen.jsp) (revision 15970) @@ -83,8 +83,19 @@ var errorTypeReduce = "<%= RecyclingError.ERRORTYPE_REDUCE%>"; var sessionRecyclingUser = "<%= session.getAttribute("recyclingUser")%>"; +if(sessionRecyclingUser == null || sessionRecyclingUser == 'null'){ + sessionRecyclingUser = ""; +} var sessionOperator = "<%= session.getAttribute("sessionOperator")%>"; +if(sessionOperator == null || sessionOperator == 'null'){ + sessionOperator = ""; +} +var userType_recycling = 'recyclingUser'; +var userType_operator = 'operator'; +var currentUserType = userType_recycling; + +var rememberRecycleUser = '${param.rememberRecycleUser}'; var today = '<%=request.getAttribute("today")%>'; var userName = '<%=request.getAttribute("userName")%>'; var secondOrgUnitCoding = '<%=request.getAttribute("orgUnitCoding")%>'; Index: ssts-web/src/main/webapp/disinfectsystem/touchScreen/recycle/awaitForRecycleList.jsp =================================================================== diff -u -r15639 -r15970 --- ssts-web/src/main/webapp/disinfectsystem/touchScreen/recycle/awaitForRecycleList.jsp (.../awaitForRecycleList.jsp) (revision 15639) +++ ssts-web/src/main/webapp/disinfectsystem/touchScreen/recycle/awaitForRecycleList.jsp (.../awaitForRecycleList.jsp) (revision 15970) @@ -84,6 +84,13 @@ #divselect ul li a{display:block;font-size:30px; height:60px; color:#333333; text-decoration:none; padding-left:10px; padding-right:10px;} #divselect ul li a:hover{background-color:#CCC;} +#rememberRecycleUser{width:300px; margin:-50px 540px auto; position:relative; z-index:10000;} +#rememberCheckBox{ + width: 60px; + height: 35px; + padding: 0 5px 0 0; +} + .mask { position: absolute; top: 0px; filter: alpha(opacity=60); background-color: #777; z-index: 1002; left: 0px; @@ -231,7 +238,8 @@ } function newRecyclingRecord(){ - location.href = "recycleForTouchScreen.jsp?resolution=${param.resolution}"; + var rememberRecycleUser= CookieManager.getCookie("rememberRecycleUser"); + location.href = "recycleForTouchScreen.jsp?resolution=${param.resolution}&rememberRecycleUser=" + rememberRecycleUser; } function cancel(){ @@ -389,6 +397,11 @@ getRecyclingRecordList(parseInt(page,10)); } $(document).ready(function() { + + if(sstsConfig.showRememberRecycleUserButton == true){ + $("#rememberRecycleUser").show(); + } + $.divselect("#divselect","#inputselect"); var groupid = CookieManager.getCookie("groupId"); var groupText = CookieManager.getCookie("groupText"); @@ -403,6 +416,25 @@ refreshPage(); firstPage(); updateHeaderStatus(); + + var rememberRecycleUser = CookieManager.getCookie("rememberRecycleUser"); + if(rememberRecycleUser == null){ + rememberRecycleUser = false; + } + if(rememberRecycleUser == 'true'){ + $("#rememberCheckBox").attr("checked",true); + } + + //点击checkBox事件 + $("#rememberCheckBox").click(function(){ + var isChecked= $("#rememberCheckBox").attr("checked"); + if(isChecked == "checked"){ + CookieManager.setCookie("rememberRecycleUser",true); + }else{ + CookieManager.setCookie("rememberRecycleUser",false); + } + }); + }); function IEVersion(){ var userAgent = window.navigator.userAgent.toLowerCase(); @@ -1030,6 +1062,11 @@ + + +
添加
Index: ssts-web/src/main/webapp/disinfectsystem/touchScreen/recycle/recycleForTouchScreen.js =================================================================== diff -u -r15763 -r15970 --- ssts-web/src/main/webapp/disinfectsystem/touchScreen/recycle/recycleForTouchScreen.js (.../recycleForTouchScreen.js) (revision 15763) +++ ssts-web/src/main/webapp/disinfectsystem/touchScreen/recycle/recycleForTouchScreen.js (.../recycleForTouchScreen.js) (revision 15970) @@ -154,6 +154,7 @@ function add(row){ increaseAmount(row); + setTousseItemLoadedAmountCss(row); } function reduce(row){ @@ -162,6 +163,7 @@ $('#recycleAmount'+row).val(recycleAmount); } changeRecycleAmount(row); + setTousseItemLoadedAmountCss(row); } function cleanDeleteTousseItem(tousseDefinitionID){ @@ -690,7 +692,7 @@ if(isBasketLoaded){ //将篮筐放置在最前面 $("#basketsUl").prepend(currentNode); - toggleItems(currentNode.find('span')[0]); +// toggleItems(currentNode.find('span')[1]); }else{ createBasketUiElement(basketItem.containerBarcode,basketItem.id,basketItem.containerName,basketItem.washClassifyType); } @@ -884,12 +886,12 @@ }else if(msg.user != null){ userNameByBarcode = msg.user.fullName; //点击选中回收人员或是清点人员 - if(currentUserType == 'recyclingUser'){ + if(currentUserType == userType_recycling){ $('#recyclingUser').val(userNameByBarcode); - }else if(currentUserType == 'operator'){ + currentUserType = userType_operator; + }else if(currentUserType == userType_operator){ $('#operator').val(userNameByBarcode); - }else{ - alertDiv('请选择条码对应的人员类型!' , true , true); + currentUserType = userType_recycling; } }else{ alertDiv('没有找到该条码所对应的信息。'); @@ -1428,8 +1430,8 @@ if(isIDCard == '是'){ setIdCardErrorIntoBasketAmount(row,loadedAmount); } - //相关器械包样式变更以区分是否已入筐 - $("#loadedAmount" + row).css("background","#b7d9a5"); + + setTousseItemLoadedAmountCss(row); inputSuccess = true; } @@ -1440,9 +1442,18 @@ $('#depart').focus(); return inputSuccess; - } +function setTousseItemLoadedAmountCss(row){ + var recycleAmount = parseInt($('#recycleAmount'+row).val(),10); + var loadedAmount = parseInt($('#loadedAmount'+row).val(),10); + if(loadedAmount > 0 && recycleAmount > loadedAmount){ + $("#loadedAmount" + row).css("background","#FFE66F");//黄色 + }else if(recycleAmount == loadedAmount){ + $("#loadedAmount" + row).css("background","#b7d9a5");//绿色 + } +} + //添加回收记录明细，tousseName为器械包名称，applicationAmount为申请数量，recycleAmount为回收数量，loadedAmount为装载数量 function addToussItem(toussItem){ var row = toussItem.row; @@ -2028,14 +2039,13 @@ } } -var currentUserType;//当前用户类型 //点击选中回收人员或是清点人员 function selectUserType(currentElementId){ currentUserType = currentElementId; $("#" + currentElementId).css("background","#DDDDDD"); - if(currentElementId == 'recyclingUser'){ + if(currentElementId == userType_recycling){ $("#operator").css("background","white"); - }else if(currentElementId == 'operator'){ + }else if(currentElementId == userType_operator){ $("#recyclingUser").css("background","white"); } } @@ -2162,14 +2172,19 @@ $("#operator").val(userName); } - //回收人使用上一次回收时选的回收人 - if(sstsConfig.recyclePageRecyclingUserDefaultLastRecyclingUser == true && sessionRecyclingUser != null && sessionRecyclingUser != 'null'){ + if(rememberRecycleUser == 'true'){ $("#recyclingUser").val(sessionRecyclingUser); - } - - //清点人使用上一次回收时选的清点人 - if(sstsConfig.recyclePageOperatorDefaultLastOperator == true && sessionOperator != null && sessionOperator != 'null'){ $("#operator").val(sessionOperator); + }else{ + //回收人使用上一次回收时选的回收人 + if(sstsConfig.recyclePageRecyclingUserDefaultLastRecyclingUser == true){ + $("#recyclingUser").val(sessionRecyclingUser); + } + + //清点人使用上一次回收时选的清点人 + if(sstsConfig.recyclePageOperatorDefaultLastOperator == true){ + $("#operator").val(sessionOperator); + } } }