Index: ssts-web/src/main/webapp/disinfectsystem/touchScreen/recycle/recycleForTouchScreen.js =================================================================== diff -u -r25507 -r25512 --- ssts-web/src/main/webapp/disinfectsystem/touchScreen/recycle/recycleForTouchScreen.js (.../recycleForTouchScreen.js) (revision 25507) +++ ssts-web/src/main/webapp/disinfectsystem/touchScreen/recycle/recycleForTouchScreen.js (.../recycleForTouchScreen.js) (revision 25512) @@ -117,6 +117,9 @@ if(sstsConfig.enbaleCheckToConfirm){ $('#isCheckIntoTheBox').show(); } + if(sstsConfig.enbaleRecoveryCheckLeftKeyboard){ + $('#btnBoxGoods').show(); + } }); /** * 刷新当前页面 @@ -3839,7 +3842,8 @@ addToussItem(boxkeyGood[i],false); } }else{ - alertDiv('没有匹配到更多数据'); + alertDiv('没有包含该拼音码的物品'); + // $('#tousseItemTable').empty(); } } } Index: ssts-web/src/main/webapp/disinfectsystem/touchScreen/recycle/1980/images/style.css =================================================================== diff -u -r25503 -r25512 --- ssts-web/src/main/webapp/disinfectsystem/touchScreen/recycle/1980/images/style.css (.../style.css) (revision 25503) +++ ssts-web/src/main/webapp/disinfectsystem/touchScreen/recycle/1980/images/style.css (.../style.css) (revision 25512) @@ -383,15 +383,18 @@ .serialNum-table .btn-box .btn-g{ background:url(btn_stop.png) no-repeat; background-position:0 0; width:137px; height:64px; border:none; line-height:200px; overflow:hidden; text-indent:-9999px; display:block; } .serialNum-table .btn-box .btn-g:hover{ background:url(btn_stop1.png) no-repeat; background-position:0 0; border:none; line-height:200px; overflow:hidden; text-indent:-9999px; display:block;} /*过滤按钮*/ +#btnBoxGoods{ + display: none; +} .btn_box{ display: inline-block; - width: 60px; + width: 70px; float: left; margin-left:5px; } .btn_box a{ - line-height: 20px; - font-size: 18px; + line-height: 30px; + font-size: 22px; text-decoration: none; cursor: pointer; color:#2e6271; @@ -414,13 +417,14 @@ } #btnBoxGoods_ul{ display: inline-block; - width: 60px; + width: 70px; text-align: center; margin-top:10px; } .btnBoxGoods_li{ - width: 30px; + width: 35px; float: left; - line-height: 30px; - height:30px; + line-height:30px; + cursor: pointer; + margin-top:5px; } Index: ssts-web/src/main/webapp/disinfectsystem/touchScreen/recycle/recycleForTouchScreen.jsp =================================================================== diff -u -r25509 -r25512 --- ssts-web/src/main/webapp/disinfectsystem/touchScreen/recycle/recycleForTouchScreen.jsp (.../recycleForTouchScreen.jsp) (revision 25509) +++ ssts-web/src/main/webapp/disinfectsystem/touchScreen/recycle/recycleForTouchScreen.jsp (.../recycleForTouchScreen.jsp) (revision 25512) @@ -80,7 +80,7 @@ display:none; } .data-table .tousseDetailTable td{ padding:0px;text-align:left;vertical-align:middle;} -.data-table .tousseDetailTable .input-a{padding:0 2px;width:366px;} +.data-table .tousseDetailTable .input-a{padding:0 2px;width:335px;} .zhuangzai-table .list-item .totalnum{ display:inline-block;text-align:center;float:right; width:86px;height:58px;overflow:hidden;margin: 0px;} @@ -290,32 +290,32 @@