Index: ssts-web/src/main/webapp/disinfectsystem/touchScreen/recycle/recycleForTouchScreen.jsp =================================================================== diff -u -r36018 -r36043 --- ssts-web/src/main/webapp/disinfectsystem/touchScreen/recycle/recycleForTouchScreen.jsp (.../recycleForTouchScreen.jsp) (revision 36018) +++ ssts-web/src/main/webapp/disinfectsystem/touchScreen/recycle/recycleForTouchScreen.jsp (.../recycleForTouchScreen.jsp) (revision 36043) @@ -482,7 +482,7 @@ .add-form .add,.add-form .addQM,.add-form .add2 { margin: 0; bottom: 0; - position: initial; + position: static; float: right; margin-left: 10px; } @@ -526,7 +526,7 @@ left: 828px; } .departmentTemplate{ - position: initial !important; + position: static !important; float: right; margin-left: 10px; display: none; @@ -538,7 +538,7 @@ cursor: pointer; } .taskGroup { - position: initial !important; + position: static !important; float: right; margin-left: 10px; display: none; Index: ssts-web/src/main/webapp/disinfectsystem/touchScreen/recycle/recycleForTouchScreen.js =================================================================== diff -u -r36021 -r36043 --- ssts-web/src/main/webapp/disinfectsystem/touchScreen/recycle/recycleForTouchScreen.js (.../recycleForTouchScreen.js) (revision 36021) +++ ssts-web/src/main/webapp/disinfectsystem/touchScreen/recycle/recycleForTouchScreen.js (.../recycleForTouchScreen.js) (revision 36043) @@ -5629,7 +5629,7 @@ // 判断是否被删除,为0代表没有被删除 if ($('#deleted' + row).val() == '0') { var amount = parseInt($('#recycleAmount' + row).val(), 10) - parseInt($('#loadedAmount' + row).val(), 10); - if (amount > 0) { + if (amount > 0 && $('#tousseItemsTr' + row).css('display') !== 'none') { // 回收数量大于已装载(入筐)数量,则需要入筐 isPutTousseInTheBasket(row); }