Index: ssts-web/src/main/webapp/dx-disinfectsystem/js/washingApplication/washingApplication.js
===================================================================
diff -u -r24738 -r24739
--- ssts-web/src/main/webapp/dx-disinfectsystem/js/washingApplication/washingApplication.js	(.../washingApplication.js)	(revision 24738)
+++ ssts-web/src/main/webapp/dx-disinfectsystem/js/washingApplication/washingApplication.js	(.../washingApplication.js)	(revision 24739)
@@ -1,4 +1,377 @@
 var time="2018-08-05  12:30";
+	//添加清洗篮筐的删除
+	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]);
+			}
+		}
+		$('#hiddenss').val(JSON.stringify(fu));
+		uBaskets(JSON.parse($('#hiddenss').val()));
+	}
+	
+	// 器械参数
+	function instrumentInfo(){
+		var instrumentInfoTableData =new Array();
+		var instrumentInfoTableHeaderColumns = [ 
+			{
+				title : '材料名称',
+				field : 'packageName',
+				align : 'center',
+			},
+			{
+				title : '数量名称',
+				field : 'materialName',
+				align : 'center',
+				sortable: true
+			},
+			{
+				title : '是否可拆',
+				field : 'badCount',
+				align : 'center', 
+			}, 
+			{
+				title : '清洗方式',
+				field : 'supplementMan',
+				align : 'center', 
+			},
+			{
+				title : '清洗质量检查关注点',
+				field : 'supplementCount',
+				align : 'center', 
+			},
+			{
+				title : '功能检查',
+				field : 'supplementTime',
+				align : 'center', 
+			} 
+		];
+		for(var i=0; i<=100;i++){
+			instrumentInfoTableData.push({ 
+				packageName:'器械包',
+				materialName:'手术刀',
+				badCount:20,
+				supplementMan:'李秀',
+				supplementCount:20,
+				supplementTime:time 
+			});
+		}
+		$("#instrumentInfo").bootstrapTable({
+			striped: true,                      
+			cache: false,                       
+			pagination: false,                  
+			sortable: false,                    
+			sortOrder: "asc",                   
+			sidePagination: "client",           
+			pageNumber:1,                       
+			pageSize: 15,                       
+			pageList: [10, 25, 50, 100],        
+			search: false,                      
+			strictSearch: true,
+			showRefresh: false,                 
+			minimumCountColumns: 2,             
+			clickToSelect: true,                
+			height: 380,                        
+			uniqueId: "id",                     
+			cardView: false,                    
+			detailView: false,                  
+			removeByUniqueId:1,
+			columns: instrumentInfoTableHeaderColumns,
+			data: instrumentInfoTableData,
+		});
+	}
+	// 器械参数 end
+	function uBaskets(arrData){
+		var BasketsTableData =new Array();
+		var BasketsTableHeaderColumns = [
+			{
+				title : '名称',
+				field : 'name',
+				align : 'center',
+				sortable: true
+			},
+			{
+				title : '数量',
+				field : 'amount',
+				align : 'center',
+				sortable: true
+			},
+			{
+				title : '条形码',
+				field : 'barcode',
+				align : 'center',
+				sortable: true
+			},
+			{
+				title : '操作',
+				field : 'handle',
+				align : 'center',
+				formatter: function(value,row,index){
+					return "<a  id='bc"+row.barcode+"' onclick='addBasketDelete(\"bc"+row.barcode+"\" ,\"cbi"+row.classifyBasketId+"\" )'><span class='glyphicon glyphicon-trash'></span></a>";
+				},
+			},
+			{
+				title : '责任人',
+				field : 'personInCharge',
+				align : 'center',
+					
+			},
+			{
+				title : '回收科室',
+				field : 'recyclingDept',
+				align : 'center',
+					
+			},
+			{
+				title : '回收时间',
+				field : 'recyclingTime',
+				align : 'center',
+					
+			}
+		]; 
+		$('#Baskets').bootstrapTable("destroy");
+		$("#Baskets").bootstrapTable({
+			data: arrData,
+			striped: true,                     
+			cache: false,                      
+			pagination: false,                 
+			sortable: false,                   
+			sortOrder: "asc",                  
+			sidePagination: "client",          
+			pageNumber:1,                      
+			pageSize: 15,                      
+			pageList: [10, 25, 50, 100],       
+			search: false,                     
+			strictSearch: true,
+			showRefresh: false,                
+			minimumCountColumns: 2,            
+			clickToSelect: true,               
+			height: 185,                       
+			cardView: false,                   
+			detailView: true,                  
+			removeByUniqueId:1,
+			columns: BasketsTableHeaderColumns, 
+			onExpandRow: function(index, row, $detail) {
+			oTableInit.InitSubTable(index, row, $detail)
+			}	
+		});
+		var oTableInit = new Object();
+		var oInit = new Object();	
+		oTableInit.InitSubTable=function (index,row,$detail){
+			console.log(index) 
+			var cur_table = $detail.html('<table></table>').find('table');
+			console.log("row:"+row);
+			console.log("jaonCon:"+JSON.stringify(row));
+			var html = "";
+			console.log("index:"+index+";row:"+row+";$detail:"+$detail+";");
+			html += "<table class='table childTable'>";
+			var ruid = row.barcode;
+			var codeData = {barcode:ruid};
+			$.ajax({
+				url:"/disinfectSystem/washAndDisinfect/washAndDisinfectRecordController/loadContainerContentOfJSON.mhtml",
+				type:'post',
+				async: false,           //很重要，这里要使用同步请求
+				data:codeData,
+				dataType:"json",
+				success:function(data){
+					var childTable = data.content;
+					console.log(childTable);
+					for(var i=0; i<childTable.length;i++)
+					{
+						html += "<tr><td>"+childTable[i].name+"</td>";
+						html += "<td>"+childTable[i].amount+"</td>";
+						html += "<td>"+childTable[i].tousseDefinitionId+"</td>";
+						html += "<td>" +"</td>";
+						html += "<td>"+"</td>";
+						html += "<td>"+"</td>"; 
+						html += "<td>"+childTable[i].recyclingTime+"</td>";
+						html += "</tr>"; 
+					}
+					html += "</table>"
+					cur_table.html(html);
+				}
+			})
+		}	
+	}
+	//添加待清洗篮筐
+	function addCleanBaskets(furl,tableId){
+			var oTableInit = new Object();
+			var oInit = new Object();
+			$(tableId).bootstrapTable({
+				detailView: true, //父子表
+				striped: true, 		
+				sortOrder: "asc", 
+				pageNumber: 1, 		//初始化加载第一页，默认第一页
+				height: 200,
+				url: furl,      	
+				columns:[
+					{
+						title : '名称',
+						field : 'name',
+						align : 'center',
+						sortable: true
+					},
+					{
+						title : '数量',
+						field : 'amount',
+						align : 'center',
+						sortable: true
+					},
+					{
+						title : '条形码',
+						field : 'barcode',
+						align : 'center',
+						sortable: true
+					},
+					{
+						title : '操作',
+						field : 'handle',
+						align : 'center', 
+						formatter: function(value,row,index){
+						return "<a><span class='glyphicon glyphicon-trash' id='"+row.classifyBasketId+"'onclick='addBasketDelete("+row.classifyBasketId+")'></span></a>";
+											},
+					},
+					{
+						title : '责任人',
+						field : 'personInCharge',
+						align : 'center',
+							
+					},
+					{
+						title : '回收科室',
+						field : 'recyclingDept',
+						align : 'center',
+							
+					},
+					{
+						title : '回收时间',
+						field : 'recyclingTime',
+						align : 'center',
+							
+					}
+				] ,
+				onExpandRow: function(index, row, $detail){
+						oTableInit.InitSubTable(index, row, $detail)
+				}
+			});
+			oTableInit.InitSubTable=function (index,row,$detail){
+				console.log(index)
+				var cur_table = $detail.html('<table></table>').find('table');
+				console.log(row.children);
+				var html = "";
+				console.log("index:"+index+";row:"+row+";$detail:"+$detail+";");
+				html += "<table class='table childTable'>";
+				$.ajax({
+					url:furl,
+					type:'get',
+					async: false,           //很重要，这里要使用同步请求
+					success:function(data){
+						var childTable = data.data[index].children;
+						console.log(childTable);
+						for(var i=0; i<childTable.length;i++)
+						{
+							html += "<tr><td>"+childTable[i].name+"</td>";
+							html += "<td>"+childTable[i].count+"</td>";
+							html += "<td>"+childTable[i].code+"</td>";
+							html += "<td>"+childTable[i].handle+"</td>";
+							html += "<td>"+childTable[i].dutyMan+"</td>";
+							html += "<td>"+childTable[i].recoveryRoom+"</td>"; 
+							html += "<td>"+childTable[i].recoveryTime+"</td>";
+							html += "</tr>"; 
+						}
+						html += "</table>"
+						cur_table.html(html);
+					}
+				})
+			}
+	}	
+	//添加待清洗篮筐子表 end
+	//添加——清洗篮筐
+	function addBaskets(){
+		var BasketsTableData =new Array();
+		var BasketsTableHeaderColumns = [
+			{
+				 title : '名称',
+				 field : 'name',
+				 align : 'center',
+				 sortable: true
+			},
+			{
+				 title : '数量',
+				 field : 'count',
+				 align : 'center',
+				 sortable: true
+			},
+			{
+				 title : '条形码',
+				 field : 'code',
+				 align : 'center',
+				 sortable: true
+			},
+			{
+				 title : '操作',
+				 field : 'handle',
+				 align : 'center',
+				 
+			},
+			{
+				 title : '责任人',
+				 field : 'dutyMan',
+				 align : 'center',
+					
+			},
+			{
+				 title : '回收科室',
+				 field : 'recoveryRoom',
+				 align : 'center',
+					
+			},
+			{
+				 title : '回收时间',
+				 field : 'recoveryTime',
+				 align : 'center',
+					
+			}
+		]; 
+		$("#readyBaskets").bootstrapTable({
+// 			url: ajaxIP+"/WashingApplication/php/readyBasket.php?addCleanBasket=10",
+// 			method: "get",
+			striped: true,                      
+			cache: false,                       
+			pagination: false,                  
+			sortable: false,                    
+			sortOrder: "asc",                   
+			sidePagination: "client",           
+			pageNumber:1,                       
+			pageSize: 15,                       
+			pageList: [10, 25, 50, 100],        
+			search: false,                      
+			strictSearch: true, 
+			showRefresh: false,                 
+			minimumCountColumns: 2,             
+			clickToSelect: true,                
+			uniqueId: "id",                     
+			cardView: false,                    
+			detailView: true,                   
+			removeByUniqueId:1,
+			columns: BasketsTableHeaderColumns, 
+			data:[]
+		});
+		
+	} 
+	//修改——清洗篮筐
+	
+	//添加报损底部表格的底部边距  #addBad-bottom-handle-table
+	
 $(function(){
 	//页面主表
 	var parentHead = window.parent.$(".head-index");
@@ -451,25 +824,7 @@
 	UpdateInstrument();
 	//inputPrint
 	
-	//添加清洗篮筐的删除
-	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]);
-			}
-		}
-		$('#hiddenss').val(JSON.stringify(fu));
-		uBaskets(JSON.parse($('#hiddenss').val()));
-	}
+	
 	//添加清洗模态框关闭时执行
 	$('#addModal').on('hidden.bs.modal', function () {
 		// 执行一些动作...
@@ -635,118 +990,8 @@
 	//添加  清洗篮筐
 	var oTableInit = new Object();
 	var oInit = new Object();
-	function uBaskets(arrData){
-		var BasketsTableData =new Array();
-		var BasketsTableHeaderColumns = [
-			{
-				title : '名称',
-				field : 'name',
-				align : 'center',
-				sortable: true
-			},
-			{
-				title : '数量',
-				field : 'amount',
-				align : 'center',
-				sortable: true
-			},
-			{
-				title : '条形码',
-				field : 'barcode',
-				align : 'center',
-				sortable: true
-			},
-			{
-				title : '操作',
-				field : 'handle',
-				align : 'center',
-				formatter: function(value,row,index){
-					return "<a  id='bc"+row.barcode+"' onclick='addBasketDelete(\"bc"+row.barcode+"\" ,\"cbi"+row.classifyBasketId+"\" )'><span class='glyphicon glyphicon-trash'></span></a>";
-				},
-			},
-			{
-				title : '责任人',
-				field : 'personInCharge',
-				align : 'center',
-					
-			},
-			{
-				title : '回收科室',
-				field : 'recyclingDept',
-				align : 'center',
-					
-			},
-			{
-				title : '回收时间',
-				field : 'recyclingTime',
-				align : 'center',
-					
-			}
-		]; 
-		$('#Baskets').bootstrapTable("destroy");
-		$("#Baskets").bootstrapTable({
-			data: arrData,
-			striped: true,                     
-			cache: false,                      
-			pagination: false,                 
-			sortable: false,                   
-			sortOrder: "asc",                  
-			sidePagination: "client",          
-			pageNumber:1,                      
-			pageSize: 15,                      
-			pageList: [10, 25, 50, 100],       
-			search: false,                     
-			strictSearch: true,
-			showRefresh: false,                
-			minimumCountColumns: 2,            
-			clickToSelect: true,               
-			height: 185,                       
-			cardView: false,                   
-			detailView: true,                  
-			removeByUniqueId:1,
-			columns: BasketsTableHeaderColumns, 
-			onExpandRow: function(index, row, $detail) {
-			oTableInit.InitSubTable(index, row, $detail)
-			}	
-		});
-			
-		oTableInit.InitSubTable=function (index,row,$detail){
-			console.log(index) 
-			var cur_table = $detail.html('<table></table>').find('table');
-			console.log("row:"+row);
-			console.log("jaonCon:"+JSON.stringify(row));
-			var html = "";
-			console.log("index:"+index+";row:"+row+";$detail:"+$detail+";");
-			html += "<table class='table childTable'>";
-			var ruid = row.barcode;
-			var codeData = {barcode:ruid};
-			$.ajax({
-				url:"/disinfectSystem/washAndDisinfect/washAndDisinfectRecordController/loadContainerContentOfJSON.mhtml",
-				type:'post',
-				async: false,           //很重要，这里要使用同步请求
-				data:codeData,
-				dataType:"json",
-				success:function(data){
-					var childTable = data.content;
-					console.log(childTable);
-					for(var i=0; i<childTable.length;i++)
-					{
-						html += "<tr><td>"+childTable[i].name+"</td>";
-						html += "<td>"+childTable[i].amount+"</td>";
-						html += "<td>"+childTable[i].tousseDefinitionId+"</td>";
-						html += "<td>" +"</td>";
-						html += "<td>"+"</td>";
-						html += "<td>"+"</td>"; 
-						html += "<td>"+childTable[i].recyclingTime+"</td>";
-						html += "</tr>"; 
-					}
-					html += "</table>"
-					cur_table.html(html);
-				}
-			})
-		}	
-	}
 	
+	
 	// 解决谷歌下输入框不能输入的问题
 	$.fn.modal.Constructor.prototype.enforceFocus = function () {};
 	
@@ -1006,248 +1251,6 @@
 	
 });
 
-	// 器械参数
-	function instrumentInfo(){
-		var instrumentInfoTableData =new Array();
-		var instrumentInfoTableHeaderColumns = [ 
-			{
-				title : '材料名称',
-				field : 'packageName',
-				align : 'center',
-			},
-			{
-				title : '数量名称',
-				field : 'materialName',
-				align : 'center',
-				sortable: true
-			},
-			{
-				title : '是否可拆',
-				field : 'badCount',
-				align : 'center', 
-			}, 
-			{
-				title : '清洗方式',
-				field : 'supplementMan',
-				align : 'center', 
-			},
-			{
-				title : '清洗质量检查关注点',
-				field : 'supplementCount',
-				align : 'center', 
-			},
-			{
-				title : '功能检查',
-				field : 'supplementTime',
-				align : 'center', 
-			} 
-		];
-		for(var i=0; i<=100;i++){
-			instrumentInfoTableData.push({ 
-				packageName:'器械包',
-				materialName:'手术刀',
-				badCount:20,
-				supplementMan:'李秀',
-				supplementCount:20,
-				supplementTime:time 
-			});
-		}
-		$("#instrumentInfo").bootstrapTable({
-			striped: true,                      
-			cache: false,                       
-			pagination: false,                  
-			sortable: false,                    
-			sortOrder: "asc",                   
-			sidePagination: "client",           
-			pageNumber:1,                       
-			pageSize: 15,                       
-			pageList: [10, 25, 50, 100],        
-			search: false,                      
-			strictSearch: true,
-			showRefresh: false,                 
-			minimumCountColumns: 2,             
-			clickToSelect: true,                
-			height: 380,                        
-			uniqueId: "id",                     
-			cardView: false,                    
-			detailView: false,                  
-			removeByUniqueId:1,
-			columns: instrumentInfoTableHeaderColumns,
-			data: instrumentInfoTableData,
-		});
-	}
-	// 器械参数 end
-
-	//添加待清洗篮筐
-	function addCleanBaskets(furl,tableId){
-			var oTableInit = new Object();
-			var oInit = new Object();
-			$(tableId).bootstrapTable({
-				detailView: true, //父子表
-				striped: true, 		
-				sortOrder: "asc", 
-				pageNumber: 1, 		//初始化加载第一页，默认第一页
-				height: 200,
-				url: furl,      	
-				columns:  [
-					{
-						title : '名称',
-						field : 'name',
-						align : 'center',
-						sortable: true
-					},
-					{
-						title : '数量',
-						field : 'amount',
-						align : 'center',
-						sortable: true
-					},
-					{
-						title : '条形码',
-						field : 'barcode',
-						align : 'center',
-						sortable: true
-					},
-					{
-						title : '操作',
-						field : 'handle',
-						align : 'center', 
-						formatter: function(value,row,index){
-						return "<a><span class='glyphicon glyphicon-trash' id='"+row.classifyBasketId+"'onclick='addBasketDelete("+row.classifyBasketId+")'></span></a>";
-											},
-					},
-					{
-						title : '责任人',
-						field : 'personInCharge',
-						align : 'center',
-							
-					},
-					{
-						title : '回收科室',
-						field : 'recyclingDept',
-						align : 'center',
-							
-					},
-					{
-						title : '回收时间',
-						field : 'recyclingTime',
-						align : 'center',
-							
-					}
-				] ,
-				onExpandRow: function(index, row, $detail){
-						oTableInit.InitSubTable(index, row, $detail)
-				}
-			});
-			oTableInit.InitSubTable=function (index,row,$detail){
-				console.log(index)
-				var cur_table = $detail.html('<table></table>').find('table');
-				console.log(row.children);
-				var html = "";
-				console.log("index:"+index+";row:"+row+";$detail:"+$detail+";");
-				html += "<table class='table childTable'>";
-				$.ajax({
-					url:furl,
-					type:'get',
-					async: false,           //很重要，这里要使用同步请求
-					success:function(data){
-						var childTable = data.data[index].children;
-						console.log(childTable);
-						for(var i=0; i<childTable.length;i++)
-						{
-							html += "<tr><td>"+childTable[i].name+"</td>";
-							html += "<td>"+childTable[i].count+"</td>";
-							html += "<td>"+childTable[i].code+"</td>";
-							html += "<td>"+childTable[i].handle+"</td>";
-							html += "<td>"+childTable[i].dutyMan+"</td>";
-							html += "<td>"+childTable[i].recoveryRoom+"</td>"; 
-							html += "<td>"+childTable[i].recoveryTime+"</td>";
-							html += "</tr>"; 
-						}
-						html += "</table>"
-						cur_table.html(html);
-					}
-				})
-			}
-	}	
-	//添加待清洗篮筐子表 end
-	//添加——清洗篮筐
-	function addBaskets(){
-		var BasketsTableData =new Array();
-		var BasketsTableHeaderColumns = [
-			{
-				 title : '名称',
-				 field : 'name',
-				 align : 'center',
-				 sortable: true
-			},
-			{
-				 title : '数量',
-				 field : 'count',
-				 align : 'center',
-				 sortable: true
-			},
-			{
-				 title : '条形码',
-				 field : 'code',
-				 align : 'center',
-				 sortable: true
-			},
-			{
-				 title : '操作',
-				 field : 'handle',
-				 align : 'center',
-				 
-			},
-			{
-				 title : '责任人',
-				 field : 'dutyMan',
-				 align : 'center',
-					
-			},
-			{
-				 title : '回收科室',
-				 field : 'recoveryRoom',
-				 align : 'center',
-					
-			},
-			{
-				 title : '回收时间',
-				 field : 'recoveryTime',
-				 align : 'center',
-					
-			}
-		]; 
-		$("#readyBaskets").bootstrapTable({
-// 			url: ajaxIP+"/WashingApplication/php/readyBasket.php?addCleanBasket=10",
-// 			method: "get",
-			striped: true,                      
-			cache: false,                       
-			pagination: false,                  
-			sortable: false,                    
-			sortOrder: "asc",                   
-			sidePagination: "client",           
-			pageNumber:1,                       
-			pageSize: 15,                       
-			pageList: [10, 25, 50, 100],        
-			search: false,                      
-			strictSearch: true, 
-			showRefresh: false,                 
-			minimumCountColumns: 2,             
-			clickToSelect: true,                
-			uniqueId: "id",                     
-			cardView: false,                    
-			detailView: true,                   
-			removeByUniqueId:1,
-			columns: BasketsTableHeaderColumns, 
-			data:[]
-		});
 		
-	} 
-	//修改——清洗篮筐
-	
-	//添加报损底部表格的底部边距  #addBad-bottom-handle-table
-	
-