Index: ssts-web/src/main/webapp/disinfectsystem/touchScreen/recycle/customIntoBasket.jsp =================================================================== diff -u -r13300 -r13308 --- ssts-web/src/main/webapp/disinfectsystem/touchScreen/recycle/customIntoBasket.jsp (.../customIntoBasket.jsp) (revision 13300) +++ ssts-web/src/main/webapp/disinfectsystem/touchScreen/recycle/customIntoBasket.jsp (.../customIntoBasket.jsp) (revision 13308) @@ -628,9 +628,7 @@ } function cancel() { - if (confirm("确认取消吗?")) { - location.href = 'awaitForRecycleList.jsp?resolution=${param.resolution}'; - } + window.close(); } function loadItem() { @@ -665,7 +663,7 @@ //如果用jquery的ready方法会报错,因为dwr的查询需要时间会造成页面的js方法认不到的问题 - + Index: ssts-web/src/main/webapp/disinfectsystem/touchScreen/recycle/recycleForTouchScreen.js =================================================================== diff -u -r13300 -r13308 --- ssts-web/src/main/webapp/disinfectsystem/touchScreen/recycle/recycleForTouchScreen.js (.../recycleForTouchScreen.js) (revision 13300) +++ ssts-web/src/main/webapp/disinfectsystem/touchScreen/recycle/recycleForTouchScreen.js (.../recycleForTouchScreen.js) (revision 13308) @@ -1742,12 +1742,13 @@ function getUnCleanedEntirelyTousseInfo(){ var result = new Array(); $('#tousseItemTable').children().first().children().each(function(i,element){ - if($('#isCleanedEntirely'+i).val() == '否' && parseInt($('#loadedAmount'+i).val(),10) == 0){ + var unLoadedAmount = parseInt($('#recycleAmount'+i).val(),10) - parseInt($('#loadedAmount'+i).val(),10); + if($('#isCleanedEntirely'+i).val() == '否' && unLoadedAmount > 0){ var obj = {}; var tousseId = $('#tousseDefinitionID'+i).val(); var recycleAmount = $('#recycleAmount'+i).val(); obj.tousseId = tousseId; - obj.recycleAmount = recycleAmount; + obj.recycleAmount = unLoadedAmount; var len = result.length; result[len] = obj; } @@ -1757,8 +1758,14 @@ function openCustomIntoBasketPage(){ var data = getUnCleanedEntirelyTousseInfo(); - var url = WWWROOT+'/disinfectsystem/touchScreen/recycle/customIntoBasket.jsp?data='+data+'&resolution=1980'; - openFullSizeWindowWithName(url,null,"customIntoBasket"); + if(data != "[]"){ + var url = WWWROOT+'/disinfectsystem/touchScreen/recycle/customIntoBasket.jsp?data='+data+'&resolution=1980'; + var style='menubar=no,location=no,directories=no,toolbar=no,statusbar=no,resizable=yes,top=100,left=100,width=1400,height=800,scrollbars=null'; + var popwin=window.open(url,"customIntoBasket",style); + }else{ + alertDiv("没有符合条件待装载的物品！"); + } + } //选择器械包 function openSelectTousse(){