Index: ssts-web/src/main/webapp/disinfectsystem/touchScreen/recycle/updateAmount.jsp =================================================================== diff -u -r25924 -r27107 --- ssts-web/src/main/webapp/disinfectsystem/touchScreen/recycle/updateAmount.jsp (.../updateAmount.jsp) (revision 25924) +++ ssts-web/src/main/webapp/disinfectsystem/touchScreen/recycle/updateAmount.jsp (.../updateAmount.jsp) (revision 27107) @@ -19,6 +19,7 @@ var tousseName = '${param.tousseName}'; var recycleAmount = parseInt('${param.recycleAmount}'); var loadedAmount = parseInt('${param.loadedAmount}'); +var customAmountSubmit = '${param.customAmountSubmit}'; var parentrecycleAudioAmount = $(window.parent.document).find("#recycleAudioAmount"); var isOpenUpdateAmount = $(window.parent.document).find("#isOpenUpdateAmount").val(); var isDialogStatus = $(window.parent.document).find("#isDialogStatus").val(); @@ -32,6 +33,11 @@ }else{ isDialogStatus =isDialogStatus; } + +if(customAmountSubmit){ + var clickNum = 0; +} + //动态加载JS和CSS document.write(''); @@ -108,7 +114,14 @@ closeLayer(); return false; } - window.parent.putMaterialInBasketWithAmount(row,temp); + if(customAmountSubmit){ + if(clickNum == 0){ + window.parent.putMaterialInBasketWithAmount(row,temp); + } + clickNum = 1; + }else{ + window.parent.putMaterialInBasketWithAmount(row,temp); + } closeLayer(); }else{ alert('输入数量错误,只能是1到' + (recycleAmount - loadedAmount)) Index: ssts-web/src/main/webapp/disinfectsystem/touchScreen/recycle/customIntoBasket.js =================================================================== diff -u -r25392 -r27107 --- ssts-web/src/main/webapp/disinfectsystem/touchScreen/recycle/customIntoBasket.js (.../customIntoBasket.js) (revision 25392) +++ ssts-web/src/main/webapp/disinfectsystem/touchScreen/recycle/customIntoBasket.js (.../customIntoBasket.js) (revision 27107) @@ -672,7 +672,7 @@ type : 2, title : ['装载入筐',true], content : 'updateAmount.jsp?resolution='+resolution+'&row='+row + '&recycleAmount=' - + recycleAmount + '&loadedAmount=' + loadedAmount + '&from=customLoadedAmount', + + recycleAmount + '&loadedAmount=' + loadedAmount + '&from=customLoadedAmount&customAmountSubmit=true', area : [width + 'px' , height + 'px'], border : [5, 0.3, '#fff', true], closeBtn : [2 , true],