Index: ssts-web/src/main/webapp/disinfectsystem/touchScreen/recycle/recycleForTouchScreen.js =================================================================== diff -u -r13317 -r13338 --- ssts-web/src/main/webapp/disinfectsystem/touchScreen/recycle/recycleForTouchScreen.js (.../recycleForTouchScreen.js) (revision 13317) +++ ssts-web/src/main/webapp/disinfectsystem/touchScreen/recycle/recycleForTouchScreen.js (.../recycleForTouchScreen.js) (revision 13338) @@ -523,17 +523,13 @@ }); } if(!isExist){ - var str = showName; - if(showName.length > 12){ - str = showName.substring(0,12) + "..."; - } var showBarcode = idCardBarcode; if(type == '材料' && idCardBarcode == ""){ showBarcode = tousseName; } var element = ''; - element += '
' + str + '
'; + element += '
' + showName + '
'; element += '
 ' + showBarcode + '
'; element += '
' + amount + '
'; element += '
删除
'; @@ -2277,13 +2273,8 @@ } }); }else{ - var tousseNameForDisplay = ci.tousseDefinition.name; - - if(tousseNameForDisplay.length > 12){ - tousseNameForDisplay = tousseNameForDisplay.substring(0,12) + "..."; - } var element = ''; - element += '
'+tousseNameForDisplay+'
'; + element += '
'+ci.tousseDefinition.name+'
'; element += '
 '+ci.idCardBarcode+'
'; element += '
'+ci.amount+'
'; element += '
删除
'; Index: ssts-web/src/main/webapp/disinfectsystem/touchScreen/recycle/1980/images/style.css =================================================================== diff -u -r13317 -r13338 --- ssts-web/src/main/webapp/disinfectsystem/touchScreen/recycle/1980/images/style.css (.../style.css) (revision 13317) +++ ssts-web/src/main/webapp/disinfectsystem/touchScreen/recycle/1980/images/style.css (.../style.css) (revision 13338) @@ -109,10 +109,10 @@ .zhuangzai-table .list-item li .btn:hover{ background-position: -86px -475px; } .zhuangzai-table .list-item dl{ margin-top:7px; width:625px; background:#f9fce8; } .zhuangzai-table .list-item dd{ float:left; border-bottom:1px solid #ddd;border-right:1px solid #ddd; padding:7px 0; text-align:center; } -.zhuangzai-table .list-item .name{ width:235px;} +.zhuangzai-table .list-item .name{ width:235px;height:58px;line-height:25px;overflow:hidden;} .zhuangzai-table .list-item .name span{ no-repeat 0 10px; padding-left:0px;} -.zhuangzai-table .list-item .barcode{ width:160px;} -.zhuangzai-table .list-item .num{ width:86px;} +.zhuangzai-table .list-item .barcode{ width:160px;height:58px;line-height:25px;overflow:hidden;} +.zhuangzai-table .list-item .num{ width:86px;height:58px;line-height:25px;overflow:hidden;} .zhuangzai-table .list-item .del{ width:114px;} .copyRight{ position:absolute; bottom:0; height:29px; text-align:center; font-family:Tahoma, Geneva, sans-serif; width:1980px; font-size:16px; line-height:29px;} Index: ssts-web/src/main/webapp/disinfectsystem/touchScreen/recycle/1980/images/customIntoBasketStyle.css =================================================================== diff -u -r13337 -r13338 --- ssts-web/src/main/webapp/disinfectsystem/touchScreen/recycle/1980/images/customIntoBasketStyle.css (.../customIntoBasketStyle.css) (revision 13337) +++ ssts-web/src/main/webapp/disinfectsystem/touchScreen/recycle/1980/images/customIntoBasketStyle.css (.../customIntoBasketStyle.css) (revision 13338) @@ -109,10 +109,10 @@ .zhuangzai-table .list-item .num{ width:86px;} .zhuangzai-table .list-item .del{ width:114px;} -.zhuangzai-table .list-item .tousseName{ width:205px;} +.zhuangzai-table .list-item .tousseName{ width:205px;height:58px;line-height:25px;overflow:hidden;} .zhuangzai-table .list-item .tousseName span{ no-repeat 0 10px; padding-left:0px;} -.zhuangzai-table .list-item .materialName{ width:190px;} -.zhuangzai-table .list-item .materialNum{ width:86px;} +.zhuangzai-table .list-item .materialName{ width:190px;height:58px;line-height:25px;overflow:hidden;} +.zhuangzai-table .list-item .materialNum{ width:86px;height:58px;line-height:25px;overflow:hidden;} .zhuangzai-table .list-item .delBtn{ width:114px;} .copyRight{ position:absolute; bottom:0; height:29px; text-align:center; font-family:Tahoma, Geneva, sans-serif; width:1980px; font-size:16px; line-height:29px;}