Index: ssts-web/src/main/webapp/disinfectsystem/touchScreen/recycle/recycleForTouchScreen.js =================================================================== diff -u -r40443 -r40598 --- ssts-web/src/main/webapp/disinfectsystem/touchScreen/recycle/recycleForTouchScreen.js (.../recycleForTouchScreen.js) (revision 40443) +++ ssts-web/src/main/webapp/disinfectsystem/touchScreen/recycle/recycleForTouchScreen.js (.../recycleForTouchScreen.js) (revision 40598) @@ -8276,7 +8276,7 @@ DWREngine.setAsync(false); var tousseType = $('#appType').val(); var newTousseType = (tousseType == '消毒物品申请单') ? '消毒物品' : ''; - TousseDefinitionTableManager.getInsideTousseAndDiposableGoods('', 1, 0, '', newTousseType, function (result) { + TousseDefinitionTableManager.getInsideTousseAndDiposableGoods('', 1, 0, '', newTousseType, false, function (result) { if (result != null && result.length > 0) { var tousseArray = JSON.parse(result); if (tousseArray.length > 0) { Index: ssts-web/src/main/webapp/disinfectsystem/touchScreen/recycle/1980/images/tit_bg_04.png =================================================================== diff -u -r12331 -r40598 Binary files differ Index: ssts-web/src/main/webapp/disinfectsystem/touchScreen/recycle/addTousse.jsp =================================================================== diff -u -r39268 -r40598 --- ssts-web/src/main/webapp/disinfectsystem/touchScreen/recycle/addTousse.jsp (.../addTousse.jsp) (revision 39268) +++ ssts-web/src/main/webapp/disinfectsystem/touchScreen/recycle/addTousse.jsp (.../addTousse.jsp) (revision 40598) @@ -137,21 +137,29 @@ var appCode = '<%=request.getParameter("appCode") %>'; var tousseType = '<%=request.getParameter("tousseType") %>'; var newTousseType = (tousseType == '消毒物品申请单')?'消毒物品':''; + var queryAppCode = $("#onlyQueryAppCode:checked").val(); + var onlyQueryAppCode = false; + if(queryAppCode){ + onlyQueryAppCode = true; + } if(b) { return false; } var inputObj = document.getElementById('spellingCode'); var inputValue = inputObj.value; if(sign == ''){ isNewSearch = false; + if(pages == 1){ + isNewSearch = true; + } }else { isNewSearch = true; } b=true; inputObj.value = inputValue + sign; b=false; if(inputObj.value != null && inputObj.value != ''){ - TousseDefinitionTableManager.getInsideTousseAndDiposableGoods(inputObj.value,pages,amount,appCode,newTousseType,function(result){ + TousseDefinitionTableManager.getInsideTousseAndDiposableGoods(inputObj.value,pages,amount,appCode,newTousseType,onlyQueryAppCode,function(result){ if(result != null && result.length > 0){ var tousseArray = JSON.parse(result); var htmlResultCode = "