Index: ssts-web/src/main/webapp/dx-disinfectsystem/js/washingApplication/inputPrint.js
===================================================================
diff -u -r24686 -r24736
--- ssts-web/src/main/webapp/dx-disinfectsystem/js/washingApplication/inputPrint.js	(.../inputPrint.js)	(revision 24686)
+++ ssts-web/src/main/webapp/dx-disinfectsystem/js/washingApplication/inputPrint.js	(.../inputPrint.js)	(revision 24736)
@@ -1,33 +1,32 @@
-//添加清洗篮筐的删除
-function addBasketDelete(bc,cbi)
-{
-	var obhi = JSON.parse($('#hiddenss').val());
-	var obid = bc.replace("bc","");
-	obid = parseInt(obid);
-	var fu = [];
-	for(var i=0; i<obhi.length; i++)
-	{
-		if(obhi[i].barcode==obid)
+	//添加清洗篮筐的删除
+	function addBasketDelete(bc,cbi){
+		var obhi = JSON.parse($('#hiddenss').val());
+		var obid = bc.replace("bc","");
+		obid = parseInt(obid);
+		var fu = [];
+		for(var i=0; i<obhi.length; i++)
 		{
+			if(obhi[i].barcode==obid)
+			{
+			}
+			else
+			{
+				fu.push(obhi[i]);
+			}
 		}
-		else
-		{
-			fu.push(obhi[i]);
-		}
+		$('#hiddenss').val(JSON.stringify(fu));
+		uBaskets(JSON.parse($('#hiddenss').val()));
 	}
-	$('#hiddenss').val(JSON.stringify(fu));
-	uBaskets(JSON.parse($('#hiddenss').val()));
-}
-//添加清洗模态框关闭时执行
-$('#addModal').on('hidden.bs.modal', function () {
-  // 执行一些动作...
-	//保存成功后关闭模态框并清理模态框以及隐藏域里面的数据
-	$('#hiddenss').val("");
-	$("#addCleanGetCode1").val("");
-	$("#addCleanStartDateStr").val("");
-	$("#addCleanOrgWashEndTime").val("");
-	uBaskets([]);
-})
+	//添加清洗模态框关闭时执行
+	$('#addModal').on('hidden.bs.modal', function () {
+		// 执行一些动作...
+		//保存成功后关闭模态框并清理模态框以及隐藏域里面的数据
+		$('#hiddenss').val("");
+		$("#addCleanGetCode1").val("");
+		$("#addCleanStartDateStr").val("");
+		$("#addCleanOrgWashEndTime").val("");
+		uBaskets([]);
+	})
 	//清洗记录修改 篮筐的删除
 	function updateBasketDelete(cbi){
 		var cbiArrNew=[];
@@ -167,7 +166,6 @@
 
 	function UpdateCleanList(UpId,sealNum,disIden,disPro,startDS,endDS){
 		$("#updateSerialNumber").val(sealNum);
-		
 		$.ajax({
 			url: "/disinfectSystem/washAndDisinfect/washAndDisinfectRecordController/findWashMaterialByWashId.mhtml",
 			type: "post",
@@ -177,12 +175,8 @@
 				$("#updateOperator").val(operator);
 				console.log("rreess:"+res);
 				var resArr = res;
-				//baskets[0].personInCharge;
-				
 				updateDetailBaskets(res.baskets,UpId);
 				$("#updateListBasketArr").val(JSON.stringify(res));
-				
-				
 			}
 		})
 	}
@@ -299,14 +293,12 @@
 					cur_table.html(html);
 				}
 			})
-		}
-			
+		}	
 	}
 	
 $(function(){	
-	uBaskets();
-	 
 	//添加报损的材料输入框
+	
 	// 解决谷歌下输入框不能输入的问题
 	$.fn.modal.Constructor.prototype.enforceFocus = function () {};
 	
@@ -321,6 +313,7 @@
 			type: "get",
 			delay:500,
 			data: function(params){
+					$("#instr").val(params.term);
 					return {   
 						spell:params.term,
 						title:params.term,
@@ -332,7 +325,9 @@
 			processResults: function(data,params){
 				data = JSON.parse(data);
 				var res=[];
-				for(var i=0; i<data.length; i++){
+				var newob = {"id":0,"text":$("#instr").val()};
+				res.push(newob);
+				for(var i=1; i<data.length; i++){
 					var newob = {"id":i,"text":data[i].displayName};
 					res.push(newob);
 				} 
@@ -348,21 +343,17 @@
 	var myDate = new Date();
 	myDate.toLocaleTimeString()
 	var today =  myDate.getFullYear()+"-"+myDate.getMonth()+"-"+myDate.getDate()+" "+myDate.toLocaleTimeString(); 
-	
+
 	$('#addCleanStartDateStr').datetimepicker('setStartDate', today);
 	$('#addCleanOrgWashEndTime').datetimepicker('setStartDate', today);
-	
 	$("#updateStartDateStr").datetimepicker('setStartDate', today);
 	$("#updateEndDateStr").datetimepicker('setStartDate', today);
-	
 	$('#addBadTime').datetimepicker('setStartDate', today);
-	
+	uBaskets();
+
 	// 添加清洗扫码
-	var ajaxIP = "http://localhost:8088";
-	
 	//警告框
-	function warnTips(title,info)
-	{
+	function warnTips(title,info){
 		$(".errorTips-title").text(title);
 		$(".errorTips-info").text(info);
 		var eTC = $("#errorTips").clone(); 
@@ -445,14 +436,12 @@
 			})
 		}
 	})
-	
 	//清洗器械
 	$("#addInstrument").click(function(){
 		var aN = $("#addInstrumentName").val();
 		var aC = $("#addInstrumentCount").val();
 		console.log("ru:"+aN+";"+aC);
 	});
-	
 	//添加清洗的提交保存		
 	$("#addCleanRefer").click(function(){
 		var ifajax = 11;
@@ -522,7 +511,6 @@
 		});
 
 	});
-	
 	//修改
 	$("#updateHandle").click(function(){
 		var a= $("#allApplication_table").bootstrapTable('getSelections');
@@ -553,7 +541,6 @@
 			$("#cleanFalseModal").modal('show');
 		}	
 	});			
-
 	//删除
 	$("#deleteHandle").click(function(){
 		var a= $("#allApplication_table").bootstrapTable('getSelections');
Index: ssts-web/src/main/webapp/dx-disinfectsystem/js/washingApplication/washingApplication.js
===================================================================
diff -u -r24704 -r24736
--- ssts-web/src/main/webapp/dx-disinfectsystem/js/washingApplication/washingApplication.js	(.../washingApplication.js)	(revision 24704)
+++ ssts-web/src/main/webapp/dx-disinfectsystem/js/washingApplication/washingApplication.js	(.../washingApplication.js)	(revision 24736)
@@ -1001,8 +1001,11 @@
 			$("#deleteModal").modal('show');
 		}		
 	});
-
+	
+	addBaskets();
 	//inputPrint end
+	
+	
 });
 
 	// 器械参数
@@ -1217,9 +1220,9 @@
 					
 			}
 		]; 
-		$("#Baskets").bootstrapTable({
-			url: ajaxIP+"/WashingApplication/php/readyBasket.php?addCleanBasket=10",
-			method: "get",
+		$("#readyBaskets").bootstrapTable({
+// 			url: ajaxIP+"/WashingApplication/php/readyBasket.php?addCleanBasket=10",
+// 			method: "get",
 			striped: true,                      
 			cache: false,                       
 			pagination: false,                  
@@ -1239,7 +1242,9 @@
 			detailView: true,                   
 			removeByUniqueId:1,
 			columns: BasketsTableHeaderColumns, 
+			data:[]
 		});
+		
 	} 
 	//修改——清洗篮筐