Index: ssts-web/src/main/webapp/disinfectsystem/touchScreen/recycle/expressRecycleForTouchScreen.jsp
===================================================================
diff -u -r29136 -r29173
--- ssts-web/src/main/webapp/disinfectsystem/touchScreen/recycle/expressRecycleForTouchScreen.jsp	(.../expressRecycleForTouchScreen.jsp)	(revision 29136)
+++ ssts-web/src/main/webapp/disinfectsystem/touchScreen/recycle/expressRecycleForTouchScreen.jsp	(.../expressRecycleForTouchScreen.jsp)	(revision 29173)
@@ -265,6 +265,69 @@
 var ab;
 var lock = false;
 
+function isIE(value) {
+	var vals = value || '';
+	if(!!window.ActiveXObject || "ActiveXObject" in window){
+		if(vals !== ''){
+			var DEFAULT_VERSION = 8.0;  
+			var ua = navigator.userAgent.toLowerCase();
+			var safariVersion = ua.match(/msie ([\d.]+)/) || ''; 
+			if(safariVersion == ''){
+				return false;
+			}
+			if(safariVersion[1] <= DEFAULT_VERSION ){  
+				return true;
+			}else {
+				return false;
+			}
+		}
+
+		return true;
+	}else{
+		return false;
+　　 }
+}
+
+function ChangeRatio(type){
+	var ratio=0;
+	var screen=window.screen;
+	var ua=navigator.userAgent.toLowerCase();
+
+	if(window.devicePixelRatio !== undefined){
+		ratio=window.devicePixelRatio;    
+	}else if(~ua.indexOf('msie')){
+		if(screen.deviceXDPI && screen.logicalXDPI)
+		{
+			ratio=screen.deviceXDPI/screen.logicalXDPI;        
+		}
+	}else if(window.outerWidth !== undefined && window.innerWidth !== undefined){
+		ratio=window.outerWidth/window.innerWidth;
+	}
+
+	if(ratio){
+		ratio=Math.round(ratio*100);    
+	}
+
+	var value;
+	if(type == 'width'){
+		var width = window.screen.width;
+		if(isIE()){
+			value = width*ratio/100;
+		}else {
+			value = width;
+		}
+	}else {
+		var height = window.screen.height;
+		if(isIE()){
+			value = height*ratio/100;
+		}else {
+			value = height;
+		}
+	}
+	
+	return parseInt(value);
+}
+
 //锁定键盘
 function lockup(e){ e.preventDefault(); }
 //高亮层不锁定
@@ -706,7 +769,7 @@
          	basketElement += '<span class="add" onclick="toggleItems(this);"></span>';
 			basketElement += '<font>'+basketItem.containerName+'</font>';
 			if(basketItem.sumCount) {
-				basketElement += '<font class="totalAmount"><span class="totalnum">0</span>/<span class="sumCount">'+basketItem.sumCount+'</span></font>';
+				basketElement += '<font class="totalAmount"><font class="totalnum">0</font>/<span class="sumCount">'+basketItem.sumCount+'</span></font>';
 			}else {
 				basketElement += '<font class="totalAmount">' + 0 + '</font>';
 			}
@@ -819,9 +882,40 @@
 	if(showName.length > 12){
 		str = showName.substring(0,12) + "...";
 	}
+	var screenWidth = ChangeRatio('width');
+	var screenHeight = ChangeRatio('height');
+	var nameWidth = 'auto';
+	var numWidth = 'auto';
+	if(screenWidth < 1030){
+		nameWidth = 'width:560px';
+	}else if(screenWidth>1270 && screenWidth<1300){
+		if(screenHeight<730){
+			nameWidth = 'width:595px';
+			numWidth = 'width:120px';
+		}else if(screenHeight>730 && screenHeight<780){
+			nameWidth = 'width:570px';
+			numWidth = 'width:95px';
+		}else if(screenHeight>790 && screenHeight<810){
+			nameWidth = 'width:575px';
+			numWidth = 'width:90px';
+		}else {
+			nameWidth = 'width:590px';
+		}
+	}else if(screenWidth>1350 && screenWidth<1370){
+		nameWidth = 'width:600px';
+		numWidth = 'width:115px';
+	}else if(screenWidth>1390 && screenWidth<1450){
+		nameWidth = 'width:580px';
+	}else if(screenWidth>1590 && screenWidth<1610){
+		nameWidth = 'width:600px';
+		numWidth = 'width:115px';
+	}else if(screenWidth>1910 && screenWidth<1930){
+		nameWidth = 'width:600px';
+		numWidth = 'width:120px';
+	}
 	var element = '<input type="hidden" value="">';
-		element += '<dd class="name">' + str + '</dd>';
-		element += '<dd class="num">' + amount + '</dd>';
+		element += '<dd class="name" style="'+nameWidth+'">' + str + '</dd>';
+		element += '<dd class="num" style="'+numWidth+'">' + amount + '</dd>';
 		element += '<dd class="del"><a href="javascript:void(0);" class="btn" onclick="deleteBasketItem(this);refreshAllBasketTotalNum();">删除</a></dd>';
 	
 	var json = getBasketItemJSON(ci_id,type,orgUnitName,tousseName,materialName,amount,tousseAmount,app_id,tousseDefinitionID,basketGroupBarcodes,putBasketMaxAmount,invoicePlanVersion);
@@ -997,16 +1091,93 @@
      var reduceButton = "";
      var onclickFun = "";
      if(tousseType != '消毒物品' || (tousseType == '消毒物品' && '是' == isApplyEntireTousse)){
-    	 addButton = '<td><a href="javascript:void(0);" class="add" onclick="add('+row+');">+</a></td>';
-    	 reduceButton = '<td><a href="javascript:void(0);" class="minus" onclick="reduce('+row+');">-</a></td>';
+    	 addButton = '<a href="javascript:void(0);" class="add" onclick="add('+row+');">+</a>';
+    	 reduceButton = '<a href="javascript:void(0);" class="minus" onclick="reduce('+row+');">-</a>';
     	 onclickFun = 'onclick="openUpdateAmount(this,'+ row +');"';
      }else{
-    	 addButton = '<td><a href="javascript:void(0);" class="add" onclick="">+</a></td>';
-    	 reduceButton = '<td><a href="javascript:void(0);" class="minus" onclick="">-</a></td>';
+    	 addButton = '<a href="javascript:void(0);" class="add" onclick="">+</a>';
+    	 reduceButton = '<a href="javascript:void(0);" class="minus" onclick="">-</a>';
     	 onclickFun = '';
-     }
+	 }
+	var screenWidth = ChangeRatio('width');
+	var screenHeight = ChangeRatio('height');
+	var td0 = '210px';
+	var td1 = '300px';
+	var td2 = '44px';
+	var td3 = 'auto';
+	var td4 = 'auto';
+	var td5 = 'auto';
+	var td6 = 'auto';
+	var td7 = 'auto';
+
+	if(screenWidth < 1030){
+		td0 = '300px';
+		td1 = '490px';
+		td2 = '150px';
+		td3 = '55px';
+		td4 = '80px';
+		td6 = '110px';
+	}else if(screenWidth>1270 && screenWidth<1300){
+		if(screenHeight<730){
+			td0 = '320px';
+			td1 = '600px';
+			td2 = '150px';
+			td3 = '55px';
+			td4 = '80px';
+			td6 = '110px';
+		}else if(screenHeight>730 && screenHeight<780){
+			td0 = '320px';
+			td1 = '550px';
+			td2 = '150px';
+			td3 = '55px';
+			td4 = '80px';
+			td6 = '110px';
+		}else if(screenHeight>790 && screenHeight<810){
+			td0 = '320px';
+			td1 = '550px';
+			td2 = '150px';
+			td3 = '55px';
+			td4 = '80px';
+			td6 = '110px';
+		}else {
+			td0 = '320px';
+			td1 = '550px';
+			td2 = '150px';
+			td3 = '55px';
+			td4 = '80px';
+			td6 = '110px';
+		}
+	}else if(screenWidth>1350 && screenWidth<1370){
+		td0 = '320px';
+		td1 = '550px';
+		td2 = '150px';
+		td3 = '55px';
+		td4 = '80px';
+		td6 = '110px';
+	}else if(screenWidth>1390 && screenWidth<1450){
+		td0 = '320px';
+		td1 = '550px';
+		td2 = '150px';
+		td3 = '55px';
+		td4 = '80px';
+		td6 = '110px';
+	}else if(screenWidth>1590 && screenWidth<1610){
+		td0 = '320px';
+		td1 = '550px';
+		td2 = '150px';
+		td3 = '55px';
+		td4 = '80px';
+		td6 = '110px';
+	}else if(screenWidth>1910 && screenWidth<1930){
+		td0 = '320px';
+		td1 = '550px';
+		td2 = '150px';
+		td3 = '55px';
+		td4 = '80px';
+		td6 = '110px';
+	}
      
-     var trElement = $('<tr id="tousseItemsTr'+row+'"><td width="210px" style="font-size: 25px;"><input type="hidden" id="isCleanedEntirely'+row+'" name="isCleanedEntirely'+row+'" value="'+isCleanedEntirely+'"/>'+
+     var trElement = $('<tr id="tousseItemsTr'+row+'"><td width="'+td0+'" style="font-size: 25px;"><input type="hidden" id="isCleanedEntirely'+row+'" name="isCleanedEntirely'+row+'" value="'+isCleanedEntirely+'"/>'+
                '<input type="hidden" id="tousseItemId'+row+'" name="tousseItemId'+row+'" value="'+tousseItemId+'"/>'+
                '<input type="hidden" id="tousseDefinitionID'+row+'" name="tousseDefinitionID'+row+'" value="'+tousseDefinitionID+'"/>'+
               // '<input type="hidden" id="departGroupId'+row+'" name="departGroupId'+row+'" value="'+departGroupId+'"/>'+
@@ -1022,13 +1193,13 @@
                '<input type="hidden" id="invoicePlanVersion'+row+'" name="invoicePlanVersion'+row+'" value="'+invoicePlanVersion+'"/>'+
                '<input type="hidden" id="loadedAmount'+row+'" name="loadedAmount'+row+'" value="0"/>'+
                 depart + '</td>' +
-               '<td width="300px" style="padding-right: 53px;"><input id="showTousseName'+row+'" name="showTousseName'+row+'" type="text" readonly="readonly"  onfocus="this.blur();" class="input-a" value="'+showTousseName+'"/></td>'+
-               '<td style="padding-right: 44px;"><input id="applicationAmount'+row+'" name="applicationAmount'+row+'" type="text" readonly="readonly" class="input-b" value="'+applicationAmount+'"/></td>'+
-               addButton+
-               '<td><input id="recycleAmount'+row+'" name="recycleAmount'+row+'" type="text" readonly="readonly" onblur="" ' + onclickFun + ' onkeyup="validateNumber(this);" class="input-b" value="'+recycleAmount+'"/></td>'+
-               '<td style="padding: 0;"><input id="loadedAmount'+row+'" type="hidden" name="loadedAmount'+row+'" type="text" readonly="readonly" class="input-b" value="'+loadedAmount+'"/></td>'+
-               reduceButton+
-               '<td><a href="javascript:void(0);" class="btn-a" style="display:block;" onclick="putTousseInTheBasket('+row+');refreshAllBasketTotalNum();">入筐</a></td>'+
+               '<td width="'+td1+'"><input id="showTousseName'+row+'" name="showTousseName'+row+'" type="text" readonly="readonly"  onfocus="this.blur();" class="input-a" value="'+showTousseName+'"/></td>'+
+               '<td width="'+td2+'"><input id="applicationAmount'+row+'" name="applicationAmount'+row+'" type="text" readonly="readonly" class="input-b" value="'+applicationAmount+'"/></td>'+
+               '<td width="'+td3+'">'+addButton+'</td>'+
+               '<td width="'+td4+'"><input id="recycleAmount'+row+'" name="recycleAmount'+row+'" type="text" readonly="readonly" onblur="" ' + onclickFun + ' onkeyup="validateNumber(this);" class="input-b" value="'+recycleAmount+'"/></td>'+
+               '<td width="'+td5+'" style="padding: 0;"><input id="loadedAmount'+row+'" type="hidden" name="loadedAmount'+row+'" type="text" readonly="readonly" class="input-b" value="'+loadedAmount+'"/></td>'+
+			   '<td width="'+td6+'">'+reduceButton+'</td>'+
+               '<td width="'+td7+'"><a href="javascript:void(0);" class="btn-a" style="display:block;" onclick="putTousseInTheBasket('+row+');refreshAllBasketTotalNum();">入筐</a></td>'+
                '</tr>');
     $("#tousseItemTable").append(trElement);
     
@@ -1429,339 +1600,205 @@
 	}
 })
 
-function isIE(value) {
-		var vals = value || '';
-		if(!!window.ActiveXObject || "ActiveXObject" in window){
-			if(vals !== ''){
-				var DEFAULT_VERSION = 8.0;  
-				var ua = navigator.userAgent.toLowerCase();
-				var safariVersion = ua.match(/msie ([\d.]+)/) || ''; 
-				if(safariVersion == ''){
-					return false;
-				}
-				if(safariVersion[1] <= DEFAULT_VERSION ){  
-					return true;
-				}else {
-					return false;
-				}
-			}
+var screenWidth = ChangeRatio('width');
+var screenHeight = ChangeRatio('height');
+var htmlHeight = $('html').height();
+$('.mbody').css('width','100%');
 
-			return true;
-		}else{
-			return false;
-	　　 }
-	}
-    
-    function ChangeRatio(type){
-		var ratio=0;
-		var screen=window.screen;
-		var ua=navigator.userAgent.toLowerCase();
-
-		if(window.devicePixelRatio !== undefined){
-			ratio=window.devicePixelRatio;    
-		}else if(~ua.indexOf('msie')){
-			if(screen.deviceXDPI && screen.logicalXDPI)
-			{
-				ratio=screen.deviceXDPI/screen.logicalXDPI;        
-			}
-		}else if(window.outerWidth !== undefined && window.innerWidth !== undefined){
-			ratio=window.outerWidth/window.innerWidth;
-		}
-
-		if(ratio){
-			ratio=Math.round(ratio*100);    
-		}
-
-		var value;
-		if(type == 'width'){
-			var width = window.screen.width;
-			if(isIE()){
-				value = width*ratio/100;
-			}else {
-				value = width;
-			}
-		}else {
-			var height = window.screen.height;
-			if(isIE()){
-				value = height*ratio/100;
-			}else {
-				value = height;
-			}
-		}
-		
-		return parseInt(value);
-    }
-    
-    var screenWidth = ChangeRatio('width');
-    var screenHeight = ChangeRatio('height');
-    var htmlHeight = $('html').height();
-    $('.mbody').css('width','100%');
-    
-	if(screenWidth < 1030){
-        $('.mbody').css({'width':'2600px','height':'1717px'});
-        $('.data-table').css({'width':'1540px','height':'1110px','bottom':'100px','left':'56px'});
-        $('.data-table .box').css({'height':'1030px'});
-        $('#tousseItemTable').css({'width':'1520px'});
-        $('.zhuangzai-table').css({'width':'820px','height':'1100px','bottom':'90px','right':'80px'});
-		$('.zhuangzai-table .box').css({'height':'1080px'});
-		$('.add-form').css({'top':'295px'});
-		$('#allIntoBasket').css({'top':'415px','left':'770px'});
-		$('#divselect').css({'left':'50px'});
-		$('#divTousseGroup').css({'left':'1060px'});
-        if(isIE()){
-            var height = htmlHeight + 100;
-            $('.mbody').css({'width':'1040px','height':'740px'});
-            $('.data-table').css({'width':'610px','height':(height-298)+'px','top':'210px','left':'25px'});
-            $('.data-table .box').css({'height':(height-388)+'px'});
-            $('#tousseItemTable').css({'width':'590px'});
-            $('.zhuangzai-table').css({'width':'340px','height':(height-338)+'px','top':'230px','right':'30px'});
-		}
-	}else if(screenWidth>1270 && screenWidth<1300){
-        if(screenHeight<730){
-            $('.mbody').css({'width':'2750px','height':'1350px'});
-            $('.data-table').css({'width':'1630px','height':'860px','bottom':'80px','left':'56px'});
-            $('.data-table .box').css({'height':'780px'});
-            $('#tousseItemTable').css({'width':'1610px'});
-            $('.zhuangzai-table').css({'width':'880px','height':'840px','bottom':'90px','right':'80px'});
-			$('.zhuangzai-table .box').css({'height':'840px'});
-			$('#allIntoBasket').css({'top':'315px','left':'800px'});
-			$('#divselect').css({'left':'50px'});
-			$('#divTousseGroup').css({'left':'1060px'});
-			if(isIE()){
-                var height = htmlHeight + 100;
-                $('.mbody').css({'width':'1280px','height':'700px'});
-                $('.data-table').css({'width':'780px','height':(height-318)+'px','top':'210px','left':'20px'});
-                $('.data-table .box').css({'height':(height-408)+'px'});
-                $('#tousseItemTable').css({'width':'780px'});
-                $('.zhuangzai-table').css({'width':'410px','height':(height-318)+'px','top':'220px','right':'40px'});
-            }
-        }else if(screenHeight>730 && screenHeight<780){
-            $('.mbody').css({'width':'2600px','height':'1420px'});
-            $('.data-table').css({'width':'1540px','height':'920px','bottom':'80px','left':'56px'});
-            $('.data-table .box').css({'height':'840px'});
-            $('#tousseItemTable').css({'width':'1520px'});
-            $('.zhuangzai-table').css({'width':'825px','height':'890px','bottom':'90px','right':'80px'});
-			$('.zhuangzai-table .box').css({'height':'890px'});
-			$('#allIntoBasket').css({'top':'340px','left':'770px'});
-			$('#divselect').css({'left':'50px'});
-			$('#divTousseGroup').css({'left':'1060px'});
-            if(isIE()){
-                var height = htmlHeight + 100;
-                $('.mbody').css({'width':'1280px','height':'700px'});
-                $('.data-table').css({'width':'780px','height':(height-318)+'px','top':'210px','left':'20px'});
-                $('.data-table .box').css({'height':(height-408)+'px'});
-                $('#tousseItemTable').css({'width':'780px'});
-                $('.zhuangzai-table').css({'width':'410px','height':(height-318)+'px','top':'220px','right':'40px'});
-            }
-        }else if(screenHeight>790 && screenHeight<810){
-            $('.mbody').css({'width':'2600px','height':'1450px'});
-            $('.data-table').css({'width':'1540px','height':'920px','bottom':'80px','left':'56px'});
-            $('.data-table .box').css({'height':'840px'});
-            $('#tousseItemTable').css({'width':'1520px'});
-            $('.zhuangzai-table').css({'width':'825px','height':'890px','bottom':'90px','right':'80px'});
-			$('.zhuangzai-table .box').css({'height':'890px'});
-			$('#allIntoBasket').css({'top':'460px','left':'770px'});
-			$('#divselect').css({'left':'50px'});
-			$('#divTousseGroup').css({'left':'1060px'});
-            if(isIE()){
-                var height = htmlHeight + 100;
-                $('.mbody').css({'width':'1280px','height':'700px'});
-                $('.data-table').css({'width':'780px','height':(height-318)+'px','top':'210px','left':'20px'});
-                $('.data-table .box').css({'height':(height-408)+'px'});
-                $('#tousseItemTable').css({'width':'780px'});
-                $('.zhuangzai-table').css({'width':'410px','height':(height-318)+'px','top':'220px','right':'40px'});
-            }
-        }else {
-            $('.mbody').css({'width':'2600px','height':'1900px'});
-            $('.data-table').css({'width':'1550px','height':'1240px','bottom':'120px','left':'56px'});
-            $('.data-table .box').css({'height':'1160px'});
-            $('#tousseItemTable').css({'width':'1530px'});
-            $('.zhuangzai-table').css({'width':'840px','height':'1200px','bottom':'115px','right':'70px'});
-			$('.zhuangzai-table .box').css({'height':'1200px'});
-			$('.add-form').css({'top':'335px'});
-			$('#allIntoBasket').css({'top':'460px','left':'770px'});
-			$('#divselect').css({'left':'50px'});
-			$('#divTousseGroup').css({'left':'1060px'});
-            if(isIE()){
-                var height = htmlHeight + 100;
-                $('.mbody').css({'width':'1280px','height':'1000px'});
-                $('.data-table').css({'width':'780px','height':(height-388)+'px','top':'280px','left':'20px'});
-                $('.data-table .box').css({'height':(height-478)+'px'});
-                $('#tousseItemTable').css({'width':'780px'});
-                $('.zhuangzai-table').css({'width':'410px','height':(height-408)+'px','top':'310px','right':'40px'});
-            }
-        }
-	}else if(screenWidth>1350 && screenWidth<1370){
-        $('.mbody').css({'width':'2745px','height':'1360px'});
-		$('.data-table').css({'width':'1660px','height':'860px','bottom':'90px','left':'56px'});
-        $('.data-table .box').css({'height':'780px'});
-        $('#tousseItemTable').css({'width':'1640px'});
-        $('.zhuangzai-table').css({'width':'880px','height':'850px','bottom':'90px','right':'90px'});
-		$('.zhuangzai-table .box').css({'height':'855px'});
+if(screenWidth < 1030){
+	$('.mbody').css({'width':'2600px','height':'1717px'});
+	$('.data-table').css({'width':'1450px','height':'1110px','bottom':'100px','left':'160px'});
+	$('.data-table .box').css({'height':'1030px'});
+	$('#tousseItemTable').css({'width':'1520px'});
+	$('.zhuangzai-table').css({'width':'820px','height':'1100px','bottom':'90px','right':'80px'});
+	$('.zhuangzai-table .box').css({'height':'1080px'});
+	$('.add-form').css({'top':'295px'});
+	$('#allIntoBasket').css({'top':'415px','left':'770px'});
+	$('#divselect').css({'left':'50px'});
+	$('#divTousseGroup').css({'left':'1060px'});
+}else if(screenWidth>1270 && screenWidth<1300){
+	if(screenHeight<730){
+		$('.mbody').css({'width':'2750px','height':'1350px'});
+		$('.data-table').css({'width':'1630px','height':'860px','bottom':'80px','left':'56px'});
+		$('.data-table .box').css({'height':'780px'});
+		$('#tousseItemTable').css({'width':'1350px'});
+		$('.zhuangzai-table').css({'width':'880px','height':'840px','bottom':'90px','right':'80px'});
+		$('.zhuangzai-table .box').css({'height':'840px'});
 		$('#allIntoBasket').css({'top':'315px','left':'800px'});
 		$('#divselect').css({'left':'50px'});
 		$('#divTousseGroup').css({'left':'1060px'});
-        if(isIE()){
-            var height = htmlHeight + 100;
-            $('.mbody').css({'width':'1370px','height':'700px'});
-            $('.data-table').css({'width':'810px','height':(height-318)+'px','top':'210px','left':'40px'});
-            $('.data-table .box').css({'height':(height-408)+'px'});
-            $('#tousseItemTable').css({'width':'790px'});
-            $('.zhuangzai-table').css({'width':'440px','height':(height-318)+'px','top':'220px','right':'40px'});
-		}
-	}else if(screenWidth>1390 && screenWidth<1450){
-        $('.mbody').css({'width':'2600px','height':'1460px'});
-		$('.data-table').css({'width':'1560px','height':'930px','bottom':'90px','left':'56px'});
-        $('.data-table .box').css({'height':'850px'});
-        $('#tousseItemTable').css({'width':'1540px'});
-        $('.zhuangzai-table').css({'width':'830px','height':'920px','bottom':'90px','right':'80px'});
-		$('.zhuangzai-table .box').css({'height':'920px'});
-		$('#allIntoBasket').css({'top':'350px','left':'800px'});
+	}else if(screenHeight>730 && screenHeight<780){
+		$('.mbody').css({'width':'2600px','height':'1420px'});
+		$('.data-table').css({'width':'1540px','height':'920px','bottom':'80px','left':'56px'});
+		$('.data-table .box').css({'height':'840px'});
+		$('#tousseItemTable').css({'width':'1350px'});
+		$('.zhuangzai-table').css({'width':'825px','height':'890px','bottom':'90px','right':'80px'});
+		$('.zhuangzai-table .box').css({'height':'890px'});
+		$('#allIntoBasket').css({'top':'340px','left':'770px'});
 		$('#divselect').css({'left':'50px'});
 		$('#divTousseGroup').css({'left':'1060px'});
-        if(isIE()){
-            var height = htmlHeight + 100;
-            $('.mbody').css({'width':'1440px','height':'900px'});
-            $('.data-table').css({'width':'850px','height':(height-348)+'px','top':'250px','left':'40px'});
-            $('.data-table .box').css({'height':(height-438)+'px'});
-            $('#tousseItemTable').css({'width':'790px'});
-            $('.zhuangzai-table').css({'width':'460px','height':(height-378)+'px','top':'280px','right':'40px'});
-		}
-	}else if(screenWidth>1590 && screenWidth<1610){
-        $('.mbody').css({'width':'2720px','height':'1400px'});
-		$('.data-table').css({'width':'1620px','height':'900px','bottom':'80px','left':'56px'});
-        $('.data-table .box').css({'height':'820px'});
-        $('#tousseItemTable').css({'width':'1600px'});
-        $('.zhuangzai-table').css({'width':'875px','height':'875px','bottom':'90px','right':'80px'});
-		$('.zhuangzai-table .box').css({'height':'870px'});
-		$('#allIntoBasket').css({'top':'335px','left':'800px'});
+	}else if(screenHeight>790 && screenHeight<810){
+		$('.mbody').css({'width':'2600px','height':'1450px'});
+		$('.data-table').css({'width':'1540px','height':'920px','bottom':'80px','left':'56px'});
+		$('.data-table .box').css({'height':'840px'});
+		$('#tousseItemTable').css({'width':'1350px'});
+		$('.zhuangzai-table').css({'width':'825px','height':'890px','bottom':'90px','right':'80px'});
+		$('.zhuangzai-table .box').css({'height':'890px'});
+		$('#allIntoBasket').css({'top':'460px','left':'770px'});
 		$('#divselect').css({'left':'50px'});
 		$('#divTousseGroup').css({'left':'1060px'});
-        if(isIE()){
-            var height = htmlHeight + 100;
-            $('.mbody').css({'width':'1600px','height':'900px'});
-            $('.data-table').css({'width':'960px','height':(height-348)+'px','top':'250px','left':'40px'});
-            $('.data-table .box').css({'height':(height-438)+'px'});
-            $('#tousseItemTable').css({'width':'940px'});
-            $('.zhuangzai-table').css({'width':'510px','height':(height-378)+'px','top':'280px','right':'40px'});
-		}
-	}else if(screenWidth>1910 && screenWidth<1930){
-        $('.mbody').css({'width':'2700px','height':'1400px'});
-        $('.data-table').css({'width':'1620px','height':'890px','bottom':'80px','left':'56px'});
-        $('.data-table .box').css({'height':'810px'});
-		$('.zhuangzai-table').css({'width':'875px','height':'880px','bottom':'85px','right':'75px'});
-		$('.zhuangzai-table .box').css({'height':'880px'});
-		$('#allIntoBasket').css({'top':'335px','left':'800px'});
+	}else {
+		$('.mbody').css({'width':'2600px','height':'1900px'});
+		$('.data-table').css({'width':'1550px','height':'1240px','bottom':'120px','left':'56px'});
+		$('.data-table .box').css({'height':'1160px'});
+		$('#tousseItemTable').css({'width':'1350px'});
+		$('.zhuangzai-table').css({'width':'840px','height':'1200px','bottom':'115px','right':'70px'});
+		$('.zhuangzai-table .box').css({'height':'1200px'});
+		$('.add-form').css({'top':'335px'});
+		$('#allIntoBasket').css({'top':'460px','left':'770px'});
 		$('#divselect').css({'left':'50px'});
 		$('#divTousseGroup').css({'left':'1060px'});
-        if(isIE()){
-            var height = htmlHeight + 100;
-            $('.mbody').css({'width':'1920px','height':'1062px'});
-            $('.data-table').css({'width':'1150px','height':(height-408)+'px','top':'310px','left':'40px'});
-            $('.data-table .box').css({'height':(height-498)+'px'});
-			$('.zhuangzai-table').css({'width':'620px','height':(height-428)+'px','top':'330px','right':'60px'});
-			$('#allIntoBasket').css({'top':'335px','left':'800px'});
-			$('#divselect').css({'left':'50px'});
-			$('#divTousseGroup').css({'left':'1060px'});
-		}
 	}
-	function userContainer(that,user,basketName,basketBarcode,classifyBasketId){
-		if ( event && event.preventDefault ){
-			event.preventDefault();
-		}else{//IE中阻止函数器默认动作的方式
-			window.event.returnValue = false;
-		}	
-		if(user == 1){
-			var sumCount = $(that).parent().parent().find('.totalAmount').text();
-			var msg = {
-				basket:{
-					containerBarcode:basketBarcode,
-					id:classifyBasketId,
-					containerName:basketName,
-					washClassifyType:'',
-					sumCount:parseInt(sumCount)
-				}
+}else if(screenWidth>1350 && screenWidth<1370){
+	$('.mbody').css({'width':'2745px','height':'1360px'});
+	$('.data-table').css({'width':'1660px','height':'860px','bottom':'90px','left':'56px'});
+	$('.data-table .box').css({'height':'780px'});
+	$('#tousseItemTable').css({'width':'1350px'});
+	$('.zhuangzai-table').css({'width':'880px','height':'850px','bottom':'90px','right':'90px'});
+	$('.zhuangzai-table .box').css({'height':'855px'});
+	$('#allIntoBasket').css({'top':'315px','left':'800px'});
+	$('#divselect').css({'left':'50px'});
+	$('#divTousseGroup').css({'left':'1060px'});
+}else if(screenWidth>1390 && screenWidth<1450){
+	$('.mbody').css({'width':'2600px','height':'1460px'});
+	$('.data-table').css({'width':'1560px','height':'930px','bottom':'90px','left':'56px'});
+	$('.data-table .box').css({'height':'850px'});
+	$('#tousseItemTable').css({'width':'1350px'});
+	$('.zhuangzai-table').css({'width':'830px','height':'920px','bottom':'90px','right':'80px'});
+	$('.zhuangzai-table .box').css({'height':'920px'});
+	$('#allIntoBasket').css({'top':'350px','left':'800px'});
+	$('#divselect').css({'left':'50px'});
+	$('#divTousseGroup').css({'left':'1060px'});
+}else if(screenWidth>1590 && screenWidth<1610){
+	$('.mbody').css({'width':'2720px','height':'1400px'});
+	$('.data-table').css({'width':'1620px','height':'900px','bottom':'80px','left':'56px'});
+	$('.data-table .box').css({'height':'820px'});
+	$('#tousseItemTable').css({'width':'1350px'});
+	$('.zhuangzai-table').css({'width':'875px','height':'875px','bottom':'90px','right':'80px'});
+	$('.zhuangzai-table .box').css({'height':'870px'});
+	$('#allIntoBasket').css({'top':'335px','left':'800px'});
+	$('#divselect').css({'left':'50px'});
+	$('#divTousseGroup').css({'left':'1060px'});
+}else if(screenWidth>1910 && screenWidth<1930){
+	$('.mbody').css({'width':'2700px','height':'1400px'});
+	$('.data-table').css({'width':'1620px','height':'890px','bottom':'80px','left':'56px'});
+	$('.data-table .box').css({'height':'810px'});
+	$('#tousseItemTable').css({'width':'1350px'});
+	$('.zhuangzai-table').css({'width':'875px','height':'880px','bottom':'85px','right':'75px'});
+	$('.zhuangzai-table .box').css({'height':'890px'});
+	$('#basketsUl').find('.sed').css({'width':'600px'});
+	$('#basketsUl .sed .num').css({'width':'120px'});
+	$('#allIntoBasket').css({'top':'335px','left':'800px'});
+	$('#divselect').css({'left':'50px'});
+	$('#divTousseGroup').css({'left':'1060px'});
+}
+function userContainer(that,user,basketName,basketBarcode,classifyBasketId){
+	if ( event && event.preventDefault ){
+		event.preventDefault();
+	}else{//IE中阻止函数器默认动作的方式
+		window.event.returnValue = false;
+	}	
+	if(user == 1){
+		var sumCount = $(that).parent().parent().find('.totalAmount').text();
+		var msg = {
+			basket:{
+				containerBarcode:basketBarcode,
+				id:classifyBasketId,
+				containerName:basketName,
+				washClassifyType:'',
+				sumCount:parseInt(sumCount)
 			}
-			addBasketElement(msg);
-			$(that).parent().parent().remove();
-		}else {
-			var sumCount = $(that).parent().find('.totalAmount').text();
-			addBasketElement(msg);
-			$(that).parent().remove();
 		}
+		addBasketElement(msg);
+		$(that).parent().parent().remove();
+	}else {
+		var sumCount = $(that).parent().find('.totalAmount').text();
+		addBasketElement(msg);
+		$(that).parent().remove();
 	}
-	if(sstsConfig.loadWashLoadingStatusBasketsWhenRecycling){
-		getWashLoadingStatusBaskets()
-	}
-	//获取清洗装载状态的篮筐
-	function getWashLoadingStatusBaskets(){
-		$.ajax({
-			type : "post",
-			url : WWWROOT + '/disinfectSystem/recyclingRecordAction!getWashLoadingStatusBaskets.do',
-			dataType:'json',
-			async:true,
-			success:function(result){
-				if(result.length > 0){
-					for(var i=0;i<result.length;i++){
-						var containerBarcode = result[i].containerBarcode;
-						var containerName = result[i].containerName;
-						var id = result[i].id;
-						var sumAmount = 0;
-						var text = '';
-						var sumText = '';
-						for(var j=0;j<result[i].classifiedItems.length;j++){
-							var name = result[i].classifiedItems[j].name;
-							var amount = result[i].classifiedItems[j].amount;
-							sumAmount+= parseInt(amount);
-							text += name+'*'+amount+'，';
-						}
-						var basketElement = '<li>';
-						basketElement += '<input type="hidden">';
-						basketElement += '<i>';
-						basketElement += '<a href="javascript:void(0);" class="btn1" id="B'+containerBarcode+'" onclick="userContainer(this,1,\''+containerName+'\',\''+containerBarcode+'\',\''+id+'\');">使用</a>';
-						basketElement += '</i>';
-						basketElement += '<span class="add" onclick="toggleItems(this);"></span>';
-						
-						var showBasketLoadMaterialAmount = sstsConfig.showBasketLoadMaterialAmount;
-						var imageButton = '';
-						if(showBasketLoadMaterialAmount == true){
-							imageButton = '<img src="/images/btn_query.jpg" onclick = "basketLoadGoods(\''+containerName+'\',\''+containerBarcode+'\',\''+id+'\');" >';
-						}
-		
-						if(text !== ''){
-							if(text.split('，').length > 4){
-								sumText = text.split('，')[0]+'，'+text.split('，')[1]+'，'+text.split('，')[2]+'......';
-							}else {
-								if(text.split('，').length == 2){
-									sumText = text.split('，')[0];
-								}else if(text.split('，').length == 3){
-									sumText = text.split('，')[0]+'，'+text.split('，')[1];
-								}else if(text.split('，').length == 4){
-									sumText = text.split('，')[0]+'，'+text.split('，')[1]+'，'+text.split('，')[2]
-								}
+}
+if(sstsConfig.loadWashLoadingStatusBasketsWhenRecycling){
+	getWashLoadingStatusBaskets()
+}
+//获取清洗装载状态的篮筐
+function getWashLoadingStatusBaskets(){
+	$.ajax({
+		type : "post",
+		url : WWWROOT + '/disinfectSystem/recyclingRecordAction!getWashLoadingStatusBaskets.do',
+		dataType:'json',
+		async:true,
+		success:function(result){
+			if(result.length > 0){
+				for(var i=0;i<result.length;i++){
+					var containerBarcode = result[i].containerBarcode;
+					var containerName = result[i].containerName;
+					var id = result[i].id;
+					var sumAmount = 0;
+					var text = '';
+					var sumText = '';
+					for(var j=0;j<result[i].classifiedItems.length;j++){
+						var name = result[i].classifiedItems[j].name;
+						var amount = result[i].classifiedItems[j].amount;
+						sumAmount+= parseInt(amount);
+						text += name+'*'+amount+'，';
+					}
+					var basketElement = '<li>';
+					basketElement += '<input type="hidden">';
+					basketElement += '<i>';
+					basketElement += '<a href="javascript:void(0);" class="btn1" id="B'+containerBarcode+'" onclick="userContainer(this,1,\''+containerName+'\',\''+containerBarcode+'\',\''+id+'\');">使用</a>';
+					basketElement += '</i>';
+					basketElement += '<span class="add" onclick="toggleItems(this);"></span>';
+					
+					var showBasketLoadMaterialAmount = sstsConfig.showBasketLoadMaterialAmount;
+					var imageButton = '';
+					if(showBasketLoadMaterialAmount == true){
+						imageButton = '<img src="/images/btn_query.jpg" onclick = "basketLoadGoods(\''+containerName+'\',\''+containerBarcode+'\',\''+id+'\');" >';
+					}
+	
+					if(text !== ''){
+						if(text.split('，').length > 4){
+							sumText = text.split('，')[0]+'，'+text.split('，')[1]+'，'+text.split('，')[2]+'......';
+						}else {
+							if(text.split('，').length == 2){
+								sumText = text.split('，')[0];
+							}else if(text.split('，').length == 3){
+								sumText = text.split('，')[0]+'，'+text.split('，')[1];
+							}else if(text.split('，').length == 4){
+								sumText = text.split('，')[0]+'，'+text.split('，')[1]+'，'+text.split('，')[2]
 							}
 						}
-		
-						var amountStyle = (result[i].percentage == 1)?'color:red':'';
-		
-						basketElement += '<font onclick="userContainer(this,0,\''+containerName+'\',\''+containerBarcode+'\',\''+id+'\');");">' + (containerName) + '' + imageButton +'</font>';
-						basketElement += '<font class="totalAmount" style="'+amountStyle+'">' + sumAmount + '</font>';
-						basketElement += '<dl class="sed clearfix" style="padding:0 15px">'+sumText+'</dl>';
-						basketElement += '</li>';
-						var obj = $(basketElement);
-						$("#loadingPutBasket").prepend(obj);
 					}
+	
+					var amountStyle = (result[i].percentage == 1)?'color:red':'';
+	
+					basketElement += '<font onclick="userContainer(this,0,\''+containerName+'\',\''+containerBarcode+'\',\''+id+'\');");">' + (containerName) + '' + imageButton +'</font>';
+					basketElement += '<font class="totalAmount" style="'+amountStyle+'">' + sumAmount + '</font>';
+					basketElement += '<dl class="sed clearfix" style="padding:0 15px">'+sumText+'</dl>';
+					basketElement += '</li>';
+					var obj = $(basketElement);
+					$("#loadingPutBasket").prepend(obj);
+				}
+				$("#scanContainerBarcodeTipUl").hide();
+			}else {
+				if($("#basketsUl > li").length == 0){
+					$("#scanContainerBarcodeTipUl").show();
+				}else{
 					$("#scanContainerBarcodeTipUl").hide();
-				}else {
-					if($("#basketsUl > li").length == 0){
-						$("#scanContainerBarcodeTipUl").show();
-					}else{
-						$("#scanContainerBarcodeTipUl").hide();
-					}
 				}
 			}
-		})
-	}
+		}
+	})
+}
 </script>
 </body>
 <jsp:include page="../../videoMonitor/common/heartbeatRequestCommon.jsp">
Index: ssts-web/src/main/webapp/disinfectsystem/touchScreen/recycle/recycleForTouchScreen.js
===================================================================
diff -u -r29142 -r29173
--- ssts-web/src/main/webapp/disinfectsystem/touchScreen/recycle/recycleForTouchScreen.js	(.../recycleForTouchScreen.js)	(revision 29142)
+++ ssts-web/src/main/webapp/disinfectsystem/touchScreen/recycle/recycleForTouchScreen.js	(.../recycleForTouchScreen.js)	(revision 29173)
@@ -944,23 +944,25 @@
 		name = item.materialName;
 		tousseNameForMaterial = item.tousseName;
 		$('dl[class="sed clearfix"]').each(function(){
-			var basketEle = $(this).prev().prev().prev().prev().prev().val();
-			var basketJSON = JSON.parse(basketEle);
-			$(this).children().each(function(){
-				if($(this).attr('type') == 'hidden'){
-					var hideValue = $(this).val();
-			       	if(!isUndefinedOrNullOrEmpty(hideValue)){
-			           	var obj = JSON.parse(hideValue);
-			           	if(obj.type == '材料' && obj.tousseDefinitionID == item.tousseDefinitionID && 
-			           			obj.basketGroupBarcodes == basketGroupBarcodes && 
-			           			obj.idCardBarcode == idCardBarcode && obj.tousseInstanceBarcode == tousseInstanceBarcode){
-			           		
-			           		var delButton = $(this).next().next().next().next().find('a');
-			           		deleteMaterialItem(delButton,basketJSON.barcode,basketJSON.classifyBasketId);
-			           	} 
-			       	}
-				}
-			});
+			var basketEle = $(this).prev().prev().prev().prev().prev().prev().val() || $(this).prev().prev().prev().prev().prev().val();
+			if(basketEle !== ''){
+				var basketJSON = JSON.parse(basketEle);
+				$(this).children().each(function(){
+					if($(this).attr('type') == 'hidden'){
+						var hideValue = $(this).val();
+						if(!isUndefinedOrNullOrEmpty(hideValue)){
+							var obj = JSON.parse(hideValue);
+							if(obj.type == '材料' && obj.tousseDefinitionID == item.tousseDefinitionID && 
+									obj.basketGroupBarcodes == basketGroupBarcodes && 
+									obj.idCardBarcode == idCardBarcode && obj.tousseInstanceBarcode == tousseInstanceBarcode){
+								
+								var delButton = $(this).next().next().next().next().find('a');
+								deleteMaterialItem(delButton,basketJSON.barcode,basketJSON.classifyBasketId);
+							} 
+						}
+					}
+				});
+			}
 	    });
 	}
 	var tousseAmountForMaterial = item.tousseAmount;
@@ -4159,7 +4161,6 @@
 	var jsonStr = getJsonParams(confirmation,isConfirm);
 	if(jsonStr == '') {return;}
 	var jSONe = JSON.parse(jsonStr);
-	//console.log(jSONe);return
 	alertDiv("保存中,请稍候......", true);
 	if(IntheBoxState == true){
         jSONe.tally = true;
@@ -6058,6 +6059,7 @@
 			}
 			
             if(record.classifyBaskets != null){
+				console.log(record.classifyBaskets)
                 for(var i = 0 ; i< record.classifyBaskets.length ; i++){
 					var basket = record.classifyBaskets[i];
 					var washClassifyType = basket.washClassifyType;
@@ -6095,7 +6097,7 @@
                             var element =  '<input type="hidden">';
                             	element += '<dd class="name"><span>'+materialName+'</span></dd>';
                             	element += '<dd class="barcode">&nbsp'+showBarcode+'</dd>';
-                            	element += '<dd class="num"><span class="currentAmout"></span>/'+ci.amount+'</dd>';
+                            	element += '<dd class="num">'+ci.amount+'</dd>';
                             	element += '<dd class="del"><a href="javascript:void(0);" class="btn" onclick="deleteConfirm(\'是否要从篮筐内移除物品【' + materialName + '】？\',\'deleteBasketItem\',\'\',this,\'\',\'\',\'\');">删除</a></dd>';
                            
                             $('dl[class="sed clearfix"]:eq(0)').prepend(element);
Index: ssts-web/src/main/webapp/disinfectsystem/touchScreen/recycle/1980/images/expressStyle.css
===================================================================
diff -u -r29136 -r29173
--- ssts-web/src/main/webapp/disinfectsystem/touchScreen/recycle/1980/images/expressStyle.css	(.../expressStyle.css)	(revision 29136)
+++ ssts-web/src/main/webapp/disinfectsystem/touchScreen/recycle/1980/images/expressStyle.css	(.../expressStyle.css)	(revision 29173)
@@ -109,7 +109,7 @@
 .zhuangzai-table .list-item li .btn:hover{ background-position: -86px -475px; }
 .zhuangzai-table .list-item li .btn1{ background:url(user.png) no-repeat 0px -2px; width:84px; height:58px; display:block; line-height:200px; overflow:hidden; margin:0 auto}
 .zhuangzai-table .list-item li .btn1:hover{ background-position: 0px -60px; }
-.zhuangzai-table .list-item dl{ margin-top:7px; width:625px; background:#f9fce8; }
+.zhuangzai-table .list-item dl{ margin-top:7px; 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:397px;}
 .zhuangzai-table .list-item .name span{ background:url(arrow.jpg) no-repeat 0 10px; padding-left:15px;}
Index: ssts-web/src/main/webapp/disinfectsystem/touchScreen/recycle/customIntoBasket.js
===================================================================
diff -u -r29136 -r29173
--- ssts-web/src/main/webapp/disinfectsystem/touchScreen/recycle/customIntoBasket.js	(.../customIntoBasket.js)	(revision 29136)
+++ ssts-web/src/main/webapp/disinfectsystem/touchScreen/recycle/customIntoBasket.js	(.../customIntoBasket.js)	(revision 29173)
@@ -1228,7 +1228,7 @@
 		basketElement += '</i>';
 		basketElement += '<span class="add" onclick="toggleItems(this);"></span>';
 		basketElement += '<div class="basketName status-empty-yellow"><div class="containImplant"></div><div>'+basketName+'</div></div>'
-		basketElement += '<font class="totalAmount"><span class="totalnum">0</span>/<span class="sumCount">'+sumAmount+'</span></font>';
+		basketElement += '<font class="totalAmount"><font class="totalnum">0</font>/<span class="sumCount">'+sumAmount+'</span></font>';
 		basketElement += '<dl class="sed clearfix"></dl>';
 		basketElement += '</li>';
 	var obj = $(basketElement);
@@ -1240,76 +1240,75 @@
 
 	$(that).parent().parent().remove();
 }
-if(sstsConfig.loadWashLoadingStatusBasketsWhenRecycling){
-	getWashLoadingStatusBaskets()
-}
 //获取清洗装载状态的篮筐
 function getWashLoadingStatusBaskets(){
-	$.ajax({
-		type : "post",
-		url : WWWROOT+'/disinfectSystem/recyclingRecordAction!getWashLoadingStatusBaskets.do',
-		dataType:'json',
-		async:true,
-		success:function(result){
-			if(result.length > 0){
-				for(var i=0;i<result.length;i++){
-					var containerBarcode = result[i].containerBarcode;
-					var containerName = result[i].containerName;
-					var id = result[i].id;
-					var sumAmount = 0;
-					var text = '';
-					var sumText = '';
-					for(var j=0;j<result[i].classifiedItems.length;j++){
-						var name = result[i].classifiedItems[j].name;
-						var amount = result[i].classifiedItems[j].amount;
-						sumAmount+= parseInt(amount);
-						text += name+'*'+amount+'，';
-					}
-					
-					var basketElement = '<li>';
-					basketElement += '<input type="hidden">';
-					basketElement += '<i>';
-					basketElement += '<a href="javascript:void(0);" class="btn1" id="B'+containerBarcode+'" onclick="userContainer(this,'+sumAmount+',\''+containerName+'\',\''+containerBarcode+'\',\''+id+'\');">使用</a>';
-					basketElement += '</i>';
-					basketElement += '<span class="add" onclick="toggleItems(this);"></span>';
-					
-					var showBasketLoadMaterialAmount = sstsConfig.showBasketLoadMaterialAmount;
-					var imageButton = '';
-					if(showBasketLoadMaterialAmount == true){
-						imageButton = '<img src="/images/btn_query.jpg" onclick = "basketLoadGoods(\''+containerName+'\',\''+containerBarcode+'\',\''+id+'\');" >';
-					}
-	
-					if(text !== ''){
-						if(text.split('，').length > 4){
-							sumText = text.split('，')[0]+'，'+text.split('，')[1]+'，'+text.split('，')[2]+'......';
-						}else {
-							if(text.split('，').length == 2){
-								sumText = text.split('，')[0];
-							}else if(text.split('，').length == 3){
-								sumText = text.split('，')[0]+'，'+text.split('，')[1];
-							}else if(text.split('，').length == 4){
-								sumText = text.split('，')[0]+'，'+text.split('，')[1]+'，'+text.split('，')[2]
+	if(sstsConfig.loadWashLoadingStatusBasketsWhenRecycling){
+		$.ajax({
+			type : "post",
+			url : WWWROOT + '/disinfectSystem/recyclingRecordAction!getWashLoadingStatusBaskets.do',
+			dataType:'json',
+			async:true,
+			success:function(result){
+				if(result.length > 0){
+					for(var i=0;i<result.length;i++){
+						var containerBarcode = result[i].containerBarcode;
+						var containerName = result[i].containerName;
+						var id = result[i].id;
+						var sumAmount = 0;
+						var text = '';
+						var sumText = '';
+						for(var j=0;j<result[i].classifiedItems.length;j++){
+							var name = result[i].classifiedItems[j].name;
+							var amount = result[i].classifiedItems[j].amount;
+							sumAmount+= parseInt(amount);
+							text += name+'*'+amount+'，';
+						}
+						
+						var basketElement = '<li>';
+						basketElement += '<input type="hidden">';
+						basketElement += '<i>';
+						basketElement += '<a href="javascript:void(0);" class="btn1" id="B'+containerBarcode+'" onclick="userContainer(this,'+sumAmount+',\''+containerName+'\',\''+containerBarcode+'\',\''+id+'\');">使用</a>';
+						basketElement += '</i>';
+						basketElement += '<span class="add" onclick="toggleItems(this);"></span>';
+						
+						var showBasketLoadMaterialAmount = sstsConfig.showBasketLoadMaterialAmount;
+						var imageButton = '';
+						if(showBasketLoadMaterialAmount == true){
+							imageButton = '<img src="/images/btn_query.jpg" onclick = "basketLoadGoods(\''+containerName+'\',\''+containerBarcode+'\',\''+id+'\');" >';
+						}
+		
+						if(text !== ''){
+							if(text.split('，').length > 4){
+								sumText = text.split('，')[0]+'，'+text.split('，')[1]+'，'+text.split('，')[2]+'......';
+							}else {
+								if(text.split('，').length == 2){
+									sumText = text.split('，')[0];
+								}else if(text.split('，').length == 3){
+									sumText = text.split('，')[0]+'，'+text.split('，')[1];
+								}else if(text.split('，').length == 4){
+									sumText = text.split('，')[0]+'，'+text.split('，')[1]+'，'+text.split('，')[2]
+								}
 							}
 						}
+		
+						var amountStyle = (result[i].percentage == 1)?'color:red':'';
+		
+						basketElement += '<font onclick="userContainer(this,0,\''+containerName+'\',\''+containerBarcode+'\',\''+id+'\');");">' + (containerName) + '' + imageButton +'</font>';
+						basketElement += '<font class="totalAmount" style="'+amountStyle+'">' + sumAmount + '</font>';
+						basketElement += '<dl class="sed clearfix" style="padding:0 15px">'+sumText+'</dl>';
+						basketElement += '</li>';
+						var obj = $(basketElement);
+						$("#loadingPutBasket").prepend(obj);
 					}
-	
-					var amountStyle = (result[i].percentage == 1)?'color:red':'';
-	
-					basketElement += '<font onclick="userContainer(this,0,\''+containerName+'\',\''+containerBarcode+'\',\''+id+'\');");">' + (containerName) + '' + imageButton +'</font>';
-					basketElement += '<font class="totalAmount" style="'+amountStyle+'">' + sumAmount + '</font>';
-					basketElement += '<dl class="sed clearfix" style="padding:0 15px">'+sumText+'</dl>';
-					basketElement += '</li>';
-					var obj = $(basketElement);
-					$("#loadingPutBasket").prepend(obj);
-				}
-				$("#scanContainerBarcodeTipUl").hide();
-			}else {
-				if($("#basketsUl > li").length == 0){
-					$("#scanContainerBarcodeTipUl").show();
-				}else{
 					$("#scanContainerBarcodeTipUl").hide();
+				}else {
+					if($("#basketsUl > li").length == 0){
+						$("#scanContainerBarcodeTipUl").show();
+					}else{
+						$("#scanContainerBarcodeTipUl").hide();
+					}
 				}
 			}
-		}
-	})
+		})
+	}
 }
\ No newline at end of file
Index: ssts-web/src/main/webapp/disinfectsystem/touchScreen/recycle/customIntoBasket.jsp
===================================================================
diff -u -r29136 -r29173
--- ssts-web/src/main/webapp/disinfectsystem/touchScreen/recycle/customIntoBasket.jsp	(.../customIntoBasket.jsp)	(revision 29136)
+++ ssts-web/src/main/webapp/disinfectsystem/touchScreen/recycle/customIntoBasket.jsp	(.../customIntoBasket.jsp)	(revision 29173)
@@ -55,7 +55,7 @@
 	//如果用jquery的ready方法会报错,因为dwr的查询需要时间会造成页面的js方法认不到的问题
 </script>
 </head>
-<body onload="zoomTouchScreenViewToActualScreenSize(2600,1462);loadItem();">
+<body onload="zoomTouchScreenViewToActualScreenSize(2600,1462);loadItem();getWashLoadingStatusBaskets()">
 <!-- alertDIV -->
 <style>
 .lightbox{width:400px;background:#FFFFFF;border:5px solid #ccc;line-height:35px;display:none; margin:0;}