Index: ssts-web/src/main/webapp/disinfectsystem/touchScreen/recycle/expressRecycleForTouchScreen.jsp =================================================================== diff -u -r27068 -r27446 --- ssts-web/src/main/webapp/disinfectsystem/touchScreen/recycle/expressRecycleForTouchScreen.jsp (.../expressRecycleForTouchScreen.jsp) (revision 27068) +++ ssts-web/src/main/webapp/disinfectsystem/touchScreen/recycle/expressRecycleForTouchScreen.jsp (.../expressRecycleForTouchScreen.jsp) (revision 27446) @@ -787,17 +787,34 @@ } //一键入筐 function allInputBasket(){ - $('#tousseItemTable .btn-a').each(function(row,element){ - var amount = parseInt($('#recycleAmount'+row).val(),10) - parseInt($('#loadedAmount'+row).val(),10); - if(amount > 0 && $(this).is(":visible")){ - $(this).click(); + var index = layer.load(0, { + content: '入筐中,请稍后...', + shade: [0.6,'#fff'], //0.1透明度的白色背景 + success: function (layero) { + layero.find('.layui-layer-content').css({ + 'padding-top': '39px', + 'width': '350px', + "font-weight":"bold", + "font-size":"30px" + }); } - }); + + setTimeout(function(){ + $('#tousseItemTable .btn-a').each(function(row,element){ + var amount = parseInt($('#recycleAmount'+row).val(),10) - parseInt($('#loadedAmount'+row).val(),10); + if(amount > 0 && $(this).is(":visible")){ + $(this).click(); + } + }); + layer.close(index); + },100); } + //将器械包放入篮筐中 function putTousseInTheBasket(row){ if($('#basketsUl').children().length > 0){ + var tousseName = $('#tousseName'+row).val(); var showTousseName = $('#showTousseName'+row).val(); var isCleanedEntirely = $('#isCleanedEntirely'+row).val(); @@ -1213,6 +1230,18 @@ $("#tousseItemTable").empty(); $("#basketsUl").empty(); document.onkeydown = showKeyDown; + var index = layer.load(0, { + content: '加载中,请稍后...', + shade: [0.5,'#fff'], //0.1透明度的白色背景 + success: function (layero) { + layero.find('.layui-layer-content').css({ + 'padding-top': '39px', + 'width': '350px', + "font-weight":"bold", + "font-size":"26px" + }); + } + }); $.ajax({ type : 'post', url : WWWROOT @@ -1224,11 +1253,13 @@ if(recycleAmount == null || recycleAmount == 0){ recycleAmount = msg[i].amount; } + addToussItem(i, '', msg[i].tousseName, msg[i].amount, recycleAmount, '',msg[i].isApplyEntireTousse, msg[i].isCleanedEntirely, msg[i].tousseType, '否', msg[i].depart, - msg[i].applicationId,msg[i].tousseDefinitionID,msg[i].departGroupId,msg[i].tousseGroupId,msg[i].invoicePlanVersion); - } + msg[i].applicationId,msg[i].tousseDefinitionID,msg[i].departGroupId,msg[i].tousseGroupId,msg[i].invoicePlanVersion); + } + layer.close(index); }, error : function() { }