Index: ssts-web/src/main/webapp/disinfectsystem/touchScreen/recycle/1980/images/washformbody_bg.jpg
===================================================================
diff -u -r16036 -r20364
Binary files differ
Index: ssts-web/src/main/webapp/disinfectsystem/touchScreen/recycle/1980/images/washformstyle_position.css
===================================================================
diff -u -r15432 -r20364
--- ssts-web/src/main/webapp/disinfectsystem/touchScreen/recycle/1980/images/washformstyle_position.css	(.../washformstyle_position.css)	(revision 15432)
+++ ssts-web/src/main/webapp/disinfectsystem/touchScreen/recycle/1980/images/washformstyle_position.css	(.../washformstyle_position.css)	(revision 20364)
@@ -123,6 +123,32 @@
 .zhuangzai-table .list-item .num{ width:297px;height:58px;line-height:25px;overflow:hidden;}
 .zhuangzai-table .list-item .del{ width:271px;}
 
+.qingxi-table{position:absolute;width:725px; height:695px; bottom:64px; left:30px;top:245px;}
+.qingxi-table .box{height:700px; overflow-y:scroll; overflow-x:hidden}
+.qingxi-table table td{ padding:7px 0}
+.qingxi-table .name,.zhuangzai-table .num{}
+.qingxi-table span{font-size:27px}
+.qingxi-table .add{background:url(pic_bg.jpg) no-repeat -318px -136px; width:22px; height:23px; display:inline-block;cursor:pointer}
+.qingxi-table .minus{background:url(pic_bg.jpg) no-repeat -318px -162px; width:22px; height:23px; display:inline-block;cursor:pointer}
+.qingxi-table .sed{ display:none}
+.qingxi-table .list-item li{ background:url(table3_bg.gif) no-repeat top center; padding:8px 0px 7px 0px;font-size:30px; color:#666; line-height:58px;}
+.qingxi-table .list-item li em{ width:85px; text-align:center;}
+.qingxi-table .list-item li i{ width:129px; text-align:center}
+.qingxi-table .list-item li font{ padding-left:40px}
+.qingxi-table .list-item li .btn{ background:url(btn_send.jpg) no-repeat top center; background-size:40px; width:84px; height:58px; display:block; line-height:200px; overflow:hidden; margin:0 auto; padding-left:0}
+.qingxi-table .list-item li .btn:hover{ background:url(btn_send.jpg) no-repeat top center; background-size:40px; width:84px; height:58px; display:block; line-height:200px; overflow:hidden; margin:0 auto; padding-left:0 }
+.qingxi-table .list-item dl{ margin-top:7px; width:800px; background:#f9fce8; }
+.qingxi-table .list-item dd{ float:left;  border-bottom:1px solid #ddd;border-right:1px solid #ddd; padding:7px 0; text-align:center; }
+.qingxi-table .list-item .name{ width:315px;height:58px;line-height:25px;overflow:hidden;}
+.qingxi-table .list-item .barcode{ padding-left:0}
+.qingxi-table .list-item .code{ width:178px;}
+.qingxi-table .list-item .amount{ padding-left:120px}
+.qingxi-table .list-item .name span{ no-repeat 0 10px; padding-left:0px;}
+.qingxi-table .list-item .num{ width:95px;height:58px;line-height:25px;overflow:hidden;}
+.qingxi-table .list-item .del{ width:120px;}
+.qingxi-table .btn-box .btn-e{ background:url(112.png) no-repeat; background-position:0 0; background-size:80px; width:137px; height:64px; border:none; line-height:200px; overflow:hidden; text-indent:-9999px; display:block; margin-left:300px;}
+.qingxi-table .btn-box .btn-e:hover{ background:url(112.png) no-repeat; background-position:0 0; border:none; background-size:80px; line-height:200px; overflow:hidden; text-indent:-9999px; display:block;}
+
 .copyRight{ position:absolute; bottom:0; height:29px; text-align:center; font-family:Tahoma, Geneva, sans-serif; width:1980px; font-size:16px; line-height:29px;}
 
 .clds-box{ width:960px; margin:0 auto; font-size:18px; background:#f0f0f0; padding:15px 10px}
Index: ssts-web/src/main/webapp/disinfectsystem/washanddisinfectmanager/washanddisinfectrecord/washForTouchScreen.jsp
===================================================================
diff -u -r18077 -r20364
--- ssts-web/src/main/webapp/disinfectsystem/washanddisinfectmanager/washanddisinfectrecord/washForTouchScreen.jsp	(.../washForTouchScreen.jsp)	(revision 18077)
+++ ssts-web/src/main/webapp/disinfectsystem/washanddisinfectmanager/washanddisinfectrecord/washForTouchScreen.jsp	(.../washForTouchScreen.jsp)	(revision 20364)
@@ -53,8 +53,10 @@
     session.setAttribute("havePosition",havePosition);
     if(havePosition == true){
     	session.setAttribute("positionStyle", "display: block");
+    	session.setAttribute("qingxiStyle", "display: none");
     }else{
     	session.setAttribute("positionStyle", "display: none");
+    	session.setAttribute("qingxiStyle", "display: block");
     }
     
     //语音提示类型
@@ -88,7 +90,7 @@
 
 <script type="text/javascript" src="washForTouchScreen.js"></script>
 
-<body onload="zoomTouchScreenViewToActualScreenSize(1920,1080);initDate();">
+<body onload="zoomTouchScreenViewToActualScreenSize(1920,1080);initDate();toCleanTheBasketData();">
 
 <!-- alertDIV -->
 <style>
@@ -148,14 +150,27 @@
             </table>
         </div>
     </div>
+    <!--待清洗篮筐 start -->
+    <div class="qingxi-table" style="${qingxiStyle}">
+         <div class="box">
+            <ul id="basketsUlS" class="list-item clearfix">
+            </ul>
+        </div>
+         <div class="btn-box">
+          <input type="button" value="刷新" class="btn-e" onclick="refreshBasket();"/>
+        </div>
+    </div>
+   
     <!--待装载篮筐 start-->
     <div class="zhuangzai-table">
         <div class="box">
-        	<ul id="scanContainerBarcodeTipUl"><li style="background: url(null) no-repeat top center;padding: 8px 0px 7px 0;font-size: 152px;color: #CDCDCD;line-height: 658px;text-align: center;">请扫描篮筐条码</li></ul>
+        	<ul id="scanContainerBarcodeTipUl"><li style="background: url(null) no-repeat top center;padding: 8px 0px 7px 0px;font-size: 60px;color: #CDCDCD;line-height: 658px;text-align: center;">请扫描篮筐条码</li></ul>
             <ul id="basketsUl" class="list-item clearfix">
             </ul>
         </div>
     </div>
+  
+    
     <!--待装载篮筐 end-->
     <!--版权 start-->
     <div class="copyRight">©2016  广州孚峻信息技术有限公司  版权所有</div>
Index: ssts-web/src/main/webapp/disinfectsystem/touchScreen/recycle/1980/images/washformstyle.css
===================================================================
diff -u -r14770 -r20364
--- ssts-web/src/main/webapp/disinfectsystem/touchScreen/recycle/1980/images/washformstyle.css	(.../washformstyle.css)	(revision 14770)
+++ ssts-web/src/main/webapp/disinfectsystem/touchScreen/recycle/1980/images/washformstyle.css	(.../washformstyle.css)	(revision 20364)
@@ -28,23 +28,24 @@
 .blank40 {clear:both; height:40px; display:block; font-size:1px;overflow:hidden;}
 
 .mbody{ background:url(washformbody_bg.jpg) no-repeat; width:1980px; height:1080px; margin:0 auto; position:relative}
-.add-form{ position:absolute; width:1980px; height:151px; top:140px; left:175px}
+.add-form{ position:absolute; width:567px; height:151px; top:140px; left:1310px}
 .add-form div{ position:absolute;}
 .add-form .input{ background:url(pic_bg.jpg) no-repeat 0 -135px; width:272px; height:42px; border:0px; font-size:26px; padding:10px 10px; line-height:40px;}
-.add-form .operator{ top:65px; right:330px;}
-.add-form .personInCharge{ top:155px; right:330px;}
-.add-form .disinfectIdentification{ top:245px; right:330px;}
-.add-form .disinfectProgram{ top:335px; right:330px; }
-.add-form .startDate{ top:425px; right:330px;}
-.add-form .endDate{ top:515px; right:330px; }
+.add-form .operator{ top:65px; right:70px;}
+.add-form .personInCharge{ top:155px; right:70px;}
+.add-form .disinfectIdentification{ top:245px; right:70px;}
+.add-form .disinfectProgram{ top:335px; right:70px; }
+.add-form .startDate{ top:425px; right:70px;}
+.add-form .endDate{ top:515px; right:70px; }
+.add-form .position{ top:605px; right:70px; }
 .add-form .add{ bottom:4px; right:-161px;}
 .add-form .add a{background:url(pic_bg.jpg) no-repeat; width:169px; height:62px; display:block; line-height:200px; overflow:hidden}
 .add-form .add a:hover{ background-position:0 -63px;}
 .add-form .add2{ bottom:4px; right:-153px;top:6px}
 .add-form .add2{background:url(customerIntobasket.png) no-repeat; width:150px; height:64px; line-height:200px; overflow:hidden;}
 .add-form .add2:hover{background:url(customerIntobaskethovert.png) no-repeat; width:150px; height:64px; line-height:200px; overflow:hidden;}
 
-.data-table{position:absolute; width:1160px; height:500px; bottom:90px; left:1100px;top:900px;}
+.data-table{position:absolute; width:575px; height:500px; bottom:90px; left:1307px;top:900px;}
 .data-table .box{ height:435px; overflow-y:scroll; overflow-x:hidden;}
 .data-table .box table{ margin:0 auto; width:1083px}
 .data-table .input-a{ background:url(pic_bg.jpg) no-repeat 0 -206px; border:none; width:349px; height:62px; font-size:26px; padding:0 10px; line-height:40px;}
@@ -101,26 +102,55 @@
 .fenpei-table table,.zhuangzai-table table{ border-right:1px solid #ddd; border-bottom:1px solid #ddd}
 .fenpei-table td,.zhuangzai-table table td{ font-size:18px; color:#666;border-top:1px solid #ddd; border-left:1px solid #ddd; text-align:center; padding:3px 0}
 
-.zhuangzai-table{position:absolute;width:1215px; height:695px; bottom:64px; left:60px;top:245px;}
+.zhuangzai-table{position:absolute;width:545px; height:695px; bottom:64px; left:760px;top:245px;}
 .zhuangzai-table .box{height:770px; overflow-y:scroll; overflow-x:hidden}
 .zhuangzai-table table td{ padding:7px 0}
 .zhuangzai-table .name,.zhuangzai-table .num{}
 .zhuangzai-table span{ margin-left:10px;font-size:27px}
 .zhuangzai-table .add{background:url(pic_bg.jpg) no-repeat -318px -136px; width:22px; height:23px; display:inline-block; margin-right:10px;cursor:pointer}
 .zhuangzai-table .minus{background:url(pic_bg.jpg) no-repeat -318px -162px; width:22px; height:23px; display:inline-block; margin-right:10px;cursor:pointer}
 .zhuangzai-table .sed{ display:none}
-.zhuangzai-table .list-item li{ background:url(table2_bg.gif) no-repeat top center; padding:8px 0px 7px 0;font-size:30px; color:#666; line-height:58px; }
+.zhuangzai-table .list-item li{ padding:0px;font-size:30px; color:#666; line-height:70px; width:530px; }
 .zhuangzai-table .list-item li em{ width:85px; text-align:center;}
-.zhuangzai-table .list-item li i{ width:129px; text-align:center}
+.zhuangzai-table .list-item li i{ width:106px; text-align:center;border-bottom:1px solid #ddd;border-right:1px solid #ddd;padding:3.5px 1px;}
 .zhuangzai-table .list-item li .btn{ background:url(pic_bg.jpg) no-repeat -86px -417px; width:84px; height:58px; display:block; line-height:200px; overflow:hidden; margin:0 auto}
 .zhuangzai-table .list-item li .btn:hover{ background-position: -86px -475px; }
-.zhuangzai-table .list-item dl{ margin-top:7px; width:1205px; background:#f9fce8; }
+.zhuangzai-table .list-item dl{ margin-top:7px; width:530px; 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:626px;height:58px;line-height:25px;overflow:hidden;}
+.zhuangzai-table .list-item .name{ width:333px;height:58px;line-height:25px;overflow:hidden;}
+.zhuangzai-table .list-item .basketName{ padding-left:0;border-bottom:1px solid #ddd;border-right:1px solid #ddd;padding:10px 51px;}
+.zhuangzai-table .list-item .amount{ padding-left:120px;border-bottom:1px solid #ddd;border-right:1px solid #ddd;padding:10px 40px;}
 .zhuangzai-table .list-item .name span{ no-repeat 0 10px; padding-left:0px;}
-.zhuangzai-table .list-item .num{ width:297px;height:58px;line-height:25px;overflow:hidden;}
-.zhuangzai-table .list-item .del{ width:271px;}
+.zhuangzai-table .list-item .num{ width:89px;height:58px;line-height:25px;overflow:hidden;}
+.zhuangzai-table .list-item .del{ width:101px;height:58px;}
 
+.qingxi-table{position:absolute;width:715px; height:695px; bottom:64px; left:30px;top:245px;}
+.qingxi-table .box{height:700px; overflow-y:scroll; overflow-x:hidden}
+.qingxi-table table td{ padding:7px 0}
+.qingxi-table .name,.zhuangzai-table .num{}
+.qingxi-table span{font-size:27px;}
+.qingxi-table .add{background:url(pic_bg.jpg) no-repeat -318px -136px; width:22px; height:23px; display:inline-block;cursor:pointer}
+.qingxi-table .minus{background:url(pic_bg.jpg) no-repeat -318px -162px; width:22px; height:23px; display:inline-block;cursor:pointer}
+.qingxi-table .sed{ display:none}
+.qingxi-table .list-item li{  padding:8px 0px 7px 0px;font-size:30px; color:#666; line-height:58px;}
+.qingxi-table .list-item li em{ width:85px; text-align:center;}
+.qingxi-table .list-item li i{ width:103px; text-align:center;border-bottom:1px solid #ddd;border-right:1px solid #ddd;padding:0.2px 0.23px;}
+.qingxi-table .list-item li font{ padding-left:40px; border-bottom:1px solid #ddd;border-right:1px solid #ddd;padding:10px 13px;}
+.qingxi-table .list-item li .btn{ background:url(btn_send.jpg) no-repeat top center; background-size:40px; width:84px; height:58px; display:block; line-height:200px; overflow:hidden; margin:0 auto; padding-left:0}
+.qingxi-table .list-item li .btn:hover{ background:url(btn_send.jpg) no-repeat top center; background-size:30px; width:84px; height:58px; display:block; line-height:200px; overflow:hidden; margin:0 auto; padding-left:0 }
+.qingxi-table .list-item dl{ margin-top:7px; width:800px; background:#f9fce8; }
+.qingxi-table .list-item dd{ float:left;  border-bottom:1px solid #ddd;border-right:1px solid #ddd; padding:7px 0; text-align:center; }
+.qingxi-table .list-item .name{ width:302px;height:58px;line-height:25px;overflow:hidden;}
+.qingxi-table .list-item .barcode{ padding-left:0;}
+.qingxi-table .list-item .basketName{ padding-left:0;border-bottom:1px solid #ddd;border-right:1px solid #ddd;padding:10px 58px;}
+.qingxi-table .list-item .code{ width:193px;}
+.qingxi-table .list-item .amount{ padding-left:120px;border-bottom:1px solid #ddd;border-right:1px solid #ddd;padding:10px 43px;}
+.qingxi-table .list-item .name span{ no-repeat 0 10px; padding-left:0px;}
+.qingxi-table .list-item .num{ width:93px;height:58px;line-height:25px;overflow:hidden;}
+.qingxi-table .list-item .del{ width:120px;}
+.qingxi-table .btn-box .btn-e{ background:url(112.png) no-repeat; background-position:0 0; background-size:80px; width:137px; height:64px; border:none; line-height:200px; overflow:hidden; text-indent:-9999px; display:block; margin-left:300px;}
+.qingxi-table .btn-box .btn-e:hover{ background:url(112.png) no-repeat; background-position:0 0; border:none; background-size:80px; line-height:200px; overflow:hidden; text-indent:-9999px; display:block;}
+
 .copyRight{ position:absolute; bottom:0; height:29px; text-align:center; font-family:Tahoma, Geneva, sans-serif; width:1980px; font-size:16px; line-height:29px;}
 
 .clds-box{ width:960px; margin:0 auto; font-size:18px; background:#f0f0f0; padding:15px 10px}
@@ -278,7 +308,6 @@
 .selectDate-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; }
 .selectDate-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;}
 
-
 .selectDate-table a{line-height:200px; overflow:hidden; display:block}
 .selectDate-table .btn-a{background:url(pic_bg.jpg) no-repeat 0px -284px; width:83px; height:63px; }
 .selectDate-table .btn-a:hover{ background-position:0 -349px}
Index: ssts-web/src/main/webapp/disinfectsystem/washanddisinfectmanager/washanddisinfectrecord/washForTouchScreen.js
===================================================================
diff -u -r19624 -r20364
--- ssts-web/src/main/webapp/disinfectsystem/washanddisinfectmanager/washanddisinfectrecord/washForTouchScreen.js	(.../washForTouchScreen.js)	(revision 19624)
+++ ssts-web/src/main/webapp/disinfectsystem/washanddisinfectmanager/washanddisinfectrecord/washForTouchScreen.js	(.../washForTouchScreen.js)	(revision 20364)
@@ -123,6 +123,7 @@
     }else if(event.keyCode == 57 || event.keyCode == 105){
     	barcodeGloble += '9';
     }else if(event.keyCode == 13){
+    	$('#'+barcodeGloble+'').empty();
     	loadBarcodeDevice(barcodeGloble);
     }
     stopBubble(event);
@@ -132,17 +133,98 @@
 //删除整个篮筐
 function deleteBasket(deleteButton){
 	$(deleteButton).parent().parent().remove();
+	var ids = $(deleteButton).parent().parent().attr('id');
+	$('#'+ ids +'').remove();
+	toCleanTheBasketDatas(ids);
 }
 
+//载入待清洗篮筐列表
+function lodeBasket(lodeButton){
+	$(lodeButton).parent().parent().remove();
+	var id = $(lodeButton).parent().parent().attr('id');
+	loadBarcodeDevice(id);
+}
+
+//刷新待清洗篮筐列表
+function refreshBasket(){
+	$('#basketsUlS').empty();
+	toCleanTheBasketData();
+}
+//刷新时已载入清洗列表的篮筐不显示
+function refreshBaskets(){
+var len = $("#basketsUl li").size();//获取li标签的个数
+var arr = [];
+for(var index = 0; index < len; index++){//创建一个数字数组
+arr[index] = index;
+}
+$.each(arr, function(i){//循环得到不同的id的值
+var idValue = $("#basketsUl li").eq(i).attr("id");
+if(idValue != ''){
+  $('.'+ idValue +'').remove();
+}
+});
+}
+
+///**
+// * 启动启动定时器
+// */
+//function test() {
+//	setInterval(test2(), 1);
+//}
+
+//清洗篮筐物品删除回退到待清洗篮筐
+function toCleanTheBasketDatas(barcode){
+	 $.ajax({
+       type:'get',
+       url: WWWROOT + '/disinfectSystem/washAndDisinfect/washAndDisinfectRecordAction!getBarcodeInfoForWash.do?time='+new Date()+'&barcode='+barcode+'',
+       dataType:'json',
+       success:function(result){
+		var personInCharge = $("#personInCharge").val();
+		var personInChargeCode = $("#personInChargeCode").val();
+		var basketName = result.data.container.name;
+		var classifyBasketId = result.data.id;
+		var basketBarcode = result.data.container.barcode;
+		var itemsInfo = result.data.itemAmountInfos;
+		var isExist = isBasketExist(classifyBasketId);
+
+   		var basketElements = '<li class='+basketBarcode+' id='+basketBarcode+ '>';
+   	  	basketElements += '<input type="hidden">';
+   	  	basketElements += '<i>';
+   	  	basketElements += '<a href="javascript:void(0);" class="btn" onclick="lodeBasket(this);">删除</a>';
+   	  	basketElements += '</i>';
+   	  	basketElements += '<span class="add" onclick="toggleItems(this);"></span>';
+   	  	basketElements += '<font id = objBarcode class="barcode">'+ basketBarcode +'</font>';
+   	  	basketElements += '<font class = basketName >'+ basketName +'</font>';
+   	  	basketElements += '<font id = objAmount class="amount">&nbsp</font>';
+   		
+   	  	basketElements += '<dl class="sed clearfix">';
+       	 	if(itemsInfo != null && itemsInfo.length > 0){
+       	  		for(var i = 0;i < itemsInfo.length ; i++){
+       	  			var itemElement = createBasketItems(itemsInfo[i].itemDefinitionName,itemsInfo[i].amount);
+       	  			basketElements += itemElement;
+       	  		}
+       	  	}
+   	  	basketElements += "</dl>";
+   	  	basketElements += '</li>';
+   	 	var obj = $(basketElements);
+   	    $("#basketsUlS").prepend(obj);    
+       },
+       error:function(msg){
+       	alertDiv("加载出错，请联系管理员！",false,false,false);
+       }
+   });
+}
+
 function createBasketUiElement(basketBarcode,classifyBasketId,basketName,position,personInCharge,personInChargeCode,itemsInfo){
-	var basketElement = '<li>';
+	var basketElement = '<li id='+ basketBarcode+ '>';
 	var person = '责任人:' + personInCharge;
   	basketElement += '<input type="hidden">';
   	basketElement += '<i>';
   	basketElement += '<a href="javascript:void(0);" class="btn" onclick="deleteBasket(this);">删除</a>';
   	basketElement += '</i>';
   	basketElement += '<span class="add" onclick="toggleItems(this);"></span>';
-  	basketElement += '<font>' + basketName + '</font>';
+  	basketElement += '<font class="basketName">'+ basketName +'</font>';
+	basketElement += '<font class="amount">&nbsp</font>';
   	basketElement += '<p>' + position +'</p>';//位置
   	if(isUndefinedOrNullOrEmpty(position)){
   		basketElement += '<br><font>' + person +'</font>';
@@ -185,6 +267,48 @@
    return isExist;
 }
 
+function toCleanTheBasketData(){
+	 $.ajax({
+        type:'get',
+        url: WWWROOT + '/disinfectSystem/washAndDisinfect/washAndDisinfectRecordAction!getPendingWashAndDisinfectTousseAndBasket.do?time='+new Date()+'',
+        dataType:'json',
+        success:function(result){
+        	var array = result;
+        	for(var i = 0;i < array.length;i++){
+        		var obj = array[i];
+        		var basketName = obj.objName;
+        		var basketBarcode = obj.objBarcode;
+        		var itemsInfo = obj.children;
+           		var basketElements = '<li class='+basketBarcode+' id='+basketBarcode+ '>';
+           	  	basketElements += '<input type="hidden">';
+           	  	basketElements += '<i>';
+           	  	basketElements += '<a href="javascript:void(0);" class="btn" onclick="lodeBasket(this);">载入</a>';
+           	  	basketElements += '</i>';
+           	  	basketElements += '<span class="add" onclick="toggleItems(this);"></span>';
+           	  	basketElements += '<font class="barcode">'+ basketBarcode +'</font>';
+           	  	basketElements += '<font class="basketName">'+ basketName +'</font>';
+           	  	basketElements += '<font class="amount">&nbsp</font>';
+           		
+           	  	basketElements += '<dl class="sed clearfix">';
+               	 	if(itemsInfo != null && itemsInfo.length > 0){
+               	  		for(var j = 0;j < itemsInfo.length ; j++){
+               	  			var itemElement = createBasketItems(itemsInfo[j].objName,itemsInfo[j].objAmount);
+               	  			basketElements += itemElement;
+               	  		}
+               	  	}
+           	  	basketElements += "</dl>";
+           	  	basketElements += '</li>';
+           	 	var objt = $(basketElements);
+           	    $("#basketsUlS").prepend(objt);
+           	 refreshBaskets();
+        	}
+        },
+        error:function(msg){
+        	alertDiv("加载出错，请联系管理员！",false,false,false);
+        }
+    });
+}
+
 function getWashStartDateTimeAndEndDateTime(barcode){
 	 $.ajax({
          type:'get',
@@ -322,7 +446,7 @@
 }
 
 function isIncludeDisinfectProgram(){
-	var disinfectProgram = $("#disinfectProgram").val();
+	var disinfectProgram = $("#disinfectProgram");
 	if(disinfectProgram != "" && currentUseRinserIncludeDisinfectPrograms != null){
 		var isExist = false;
 		for(var i = 0 ; i < currentUseRinserIncludeDisinfectPrograms.length ; i++){
@@ -517,4 +641,13 @@
 		$("#endDate").val(today);
 	}
 	
+}
+
+//待装载篮筐器的器械包材料
+function createBasketItems(goodsName,amount){
+	var element = '<dd class="code"><span>&nbsp</span></dd>';
+	    element += '<dd class="name">'+goodsName+'</dd>';
+	 	element += '<dd class="num">'+amount+'</dd>';
+	 	element += '<dd class="del">&nbsp</dd>';
+    return element;
 }
\ No newline at end of file
Index: ssts-web/src/main/webapp/disinfectsystem/touchScreen/recycle/1980/images/btn_send.jpg
===================================================================
diff -u
Binary files differ