Index: ssts-web/src/main/webapp/dx-disinfectsystem/js/washingApplication/washingApplication.js
===================================================================
diff -u -r24686 -r24704
--- ssts-web/src/main/webapp/dx-disinfectsystem/js/washingApplication/washingApplication.js	(.../washingApplication.js)	(revision 24686)
+++ ssts-web/src/main/webapp/dx-disinfectsystem/js/washingApplication/washingApplication.js	(.../washingApplication.js)	(revision 24704)
@@ -1,375 +1,323 @@
- 
+var time="2018-08-05  12:30";
 $(function(){
-		var time="2018-08-05  12:30";
-		var parentHead = window.parent.$(".head-index");
-		var navbar =  window.parent.$(".content-index");
-		var parentHeadIf = window.parent.$(".content-index-toggle-off");
-		var mainNavHeight = $(".mainNav").height();
-		var alltablefirst = $(window).height() - parentHead.height() - navbar.height() - mainNavHeight;
-		
-		// 主表
-		var mainTableData =new Array();
-		var columnArray = [
-			{
-				checkbox : true,
-				visible : true 
+	//页面主表
+	var parentHead = window.parent.$(".head-index");
+	var navbar =  window.parent.$(".content-index");
+	var parentHeadIf = window.parent.$(".content-index-toggle-off");
+	var mainNavHeight = $(".mainNav").height();
+	var alltablefirst = $(window).height() - parentHead.height() - navbar.height() - mainNavHeight;
+	var mainTableData =new Array();
+	//jq过滤事件
+	var addArray= new Array();
+	var array=[];
+	function queryParams(params,searchName) {
+		if(params.search==null||params.search==""){
+			var filtersValue = [];
+		}
+		else{
+			//搜索
+			console.log( "search type:" + typeof(params.search) );
+			var hiddenArr = JSON.parse($("#hiddens").val());
+			var filtersValue = [];
+			
+			for(var i=0;i<hiddenArr.length;i++){//hiddenArr.length
+				if(hiddenArr[i]=="startDateStr"||hiddenArr[i]=="endDateStr"||hiddenArr[i]=="cycleCounter"||hiddenArr[i]=="washDataAmount"||hiddenArr[i]=="washMaterialAmount"){
+					
+				} 
+				else{
+					var filtersAppend = {
+						columnLabel: hiddenArr[i],
+						propFullName: "",
+						value: params.search,
+						operator: "like"
+					};
+					filtersValue[i]=filtersAppend;
+				}
+			}
+		};
+		var temp = {   
+			//这里的键的名字和控制器的变量名必须一直，这边改动，控制器也需要改成一样的
+			offset: params.offset, //页码
+			limit: params.limit,   //页面大小
+			filters: filtersValue,
+			logicalOperator : "OR",
+			gridId: "com.forgon.disinfectsystem.washanddisinfectmanager.washanddisinfectrecord.findWashAndDisinfectRecordList",
+		}; 
+		return {gridParams:JSON.stringify(temp)};
+	}
+	var columnArray = [
+		{
+			checkbox : true,
+			visible : true 
+		},
+		{
+			title : '流水号',
+			field : 'serialNumber',
+			align : 'center',
+			sortable: true, 
+			formatter: function (value,row,index){
+				var alink = '<a  class="mainFont" data-toggle="modal" data-target="#updateModal" onclick="UpdateCleanList(';
+				
+				alink += row.id+',\''+row.serialNumber+'\'';
+				alink += ",\'"+row.disinfectIdentification+"\',";
+				alink += "\'"+row.disinfectProgram+"\',";
+				alink += "\'"+row.startDateStr+"\',";
+				alink += "\'"+row.endDateStr+"\'";
+				alink += ')">'+row.serialNumber+'</a>';
+				return alink;
 			},
+		}, 
+		{
+			title : '操作员',
+			field : 'operator',
+			align : 'center'
+		},
+		{
+			title : '清洗机名称',
+			field : 'disinfectIdentification',
+			align : 'center'
+		},
+		{
+			title : '清洗程序',
+			field : 'disinfectProgram',
+			align : 'center'
+		},
+		{
+			title : '清洗状态',
+			field : 'washStatus',
+			align : 'center',
+			formatter: function (value,row,index){
+				if(row.washStatus=="清洗完成")
+				{
+					var ws = "<div class='progress'><div class='progress-bar progress-bar-success' role='progressbar' aria-valuenow='100'";
+							ws += "aria-valuemin='0' aria-valuemax='100' style='width: 100%'><span class='sr-only'>100% Complete</span>";
+							ws += row.washStatus;
+							ws += "</div></div>";
+					return  ws;
+				}
+				if(row.washStatus=="清洗中")
+				{
+					 var ws = "<div class='progress'><div class='progress-bar progress-bar-info progress-bar-striped' role='progressbar' aria-valuenow='50'";
+							ws += "aria-valuemin='0' aria-valuemax='50' style='width: 50%'><span class='sr-only'>50% Complete</span>";
+							ws += row.washStatus;
+							ws += "</div></div>";
+					 return  ws;
+				}
+				if(row.washStatus=="清洗失败")
+				{
+					 var ws = "<div class='progress'><div class='progress-bar progress-bar-danger progress-bar-striped' role='progressbar' aria-valuenow='100'";
+							ws += "aria-valuemin='0' aria-valuemax='100' style='width: 100%'><span class='sr-only'>100% Complete</span>";
+							ws += row.washStatus;
+							ws += "</div></div>";
+					 return  ws;
+				}
+			},
+		}, 
+		{
+			title : '开始时间',
+			field : 'startDateStr',
+			align : 'center',
+			sortable: true
+		},
+		{
+			title : '结束时间',
+			field : 'endDateStr',
+			align : 'center',
+			sortable: true
+		},
+		{
+			title : '操作',
+			field : 'cycleCounter',
+			align : 'center',
+			formatter: function(value,row,index)
 			{
-				title : '流水号',
-				field : 'serialNumber',
-				align : 'center',
-				sortable: true, 
-				formatter: function (value,row,index){
-					var alink = '<a  class="mainFont" data-toggle="modal" data-target="#updateModal" onclick="UpdateCleanList(';
-					
-					alink += row.id+',\''+row.serialNumber+'\'';
-					alink += ",\'"+row.disinfectIdentification+"\',";
+					var alink =  "<a data-toggle='modal' data-target='#updateModal'";
+					alink += "onclick='UpdateCleanList(";
+					alink += row.id +",";
+					alink += "\',"+row.disinfectIdentification+"\',";
 					alink += "\'"+row.disinfectProgram+"\',";
 					alink += "\'"+row.startDateStr+"\',";
-					alink += "\'"+row.endDateStr+"\'";
-					alink += ')">'+row.serialNumber+'</a>';
-					return alink;
-				},
-			}, 
-			{
-				title : '操作员',
-				field : 'operator',
-				align : 'center'
+					alink += "\'"+row.endDateStr+"\',";
+					
+					alink += ")'>";
+					alink += "<span class='glyphicon glyphicon-asterisk' ></span></a>";
+					return   alink;
 			},
-			{
-				title : '清洗机名称',
-				field : 'disinfectIdentification',
-				align : 'center'
+		}, 
+		{
+			title : '清洗参数',
+			field : 'washDataAmount',
+			align : 'center'
+		},
+		{
+			title : '清洗总数',
+			field : 'washMaterialAmount',
+			align : 'center',
+			sortable: true
+		},
+	];
+	var InitTable =function(url){
+			//先销毁表格
+		$('#washMainTable').bootstrapTable("destroy");
+			//添加表格
+		$('#washMainTable').bootstrapTable({
+			url:url,
+			method:'post',		//请求方式
+			contentType: "application/x-www-form-urlencoded",//请求数据内容格式 默认是 application/json 自己根据格式自行服务端处理
+			height: alltablefirst,
+			search: true,			//是否搜索
+			pagination: true,	//是否分页
+			pageList: [5, 10, 20, 50],//分页步进值
+			sidePagination: "server",	//服务端分页
+			queryParamsType: "limit",	//查询参数组织方式
+			onColumnSwitch:onColumnSwitch,
+			queryParams : queryParams, 
+			searchOnEnterKey: "true",	//回车搜索
+			showRefresh: "true",			//刷新按钮
+			showColumns: true,				//列选择按钮
+			minimumCountColumns: 1,		//最少允许的列数
+			clickToSelect: true,			//是否启用点击选中行
+			uniqueId: "ID",						//每一行的唯一标识，一般为主键列
+			cardView: false,          //是否显示详细视图
+			detailView: false,				//是否显示父子表
+			showExport: true,
+			exportDataType: "selected",//导出checkbox选中的行数
+			paginationLoop: false, 		//是否无限循环
+			columns: columnArray,
+			responseHandler:function(res){
+				console.log("ass:"+res.rows[0].operator);
+				if(res.rows[0].operator){
+					var operator = res.rows[0].operator;
+					$("#updateArr").val(operator);
+				}
+				return res;
 			},
+		});
+		return InitTable;
+	}
+	var mainTableOn = InitTable("/disinfectSystem/grid/gridController/getGrid.mhtml");		
+	for (var i = 0; i < columnArray.length; i++){
+		if(!columnArray[i].field)
+		{
+		}
+		if(columnArray[i].field==null)
+		{ 
+		}
+		else
+		{
+				array.push(columnArray[i].field);
+		}
+	}
+	$('#hiddens').val(JSON.stringify(array));
+	//列筛选
+	function onColumnSwitch(field,checked){
+		var str ={'Name':field,'states':checked}
+		addArray.push(str);
+		Array.prototype.indexOf = function(val) {
+			for (var i = 0; i < this.length; i++) {
+				if (this[i] == val) return i;
+			}
+			return -1;
+		};
+		Array.prototype.remove = function(val) {
+			var index = this.indexOf(val);
+			if (index > -1) {
+				this.splice(index, 1);
+			}
+		};
+		for(var i=0;i<addArray.length;i++){
+			if(addArray[i].states===false){
+				array.remove(addArray[i].Name);
+			}
+			if(addArray[i].states===true){
+				array.push(addArray[i].Name);
+			}
+		}
+		$('#hiddens').val(JSON.stringify(array));
+	} 
+	$(".fixed-table-pagination").css("top",$(".main").height()-47);
+	$(".mainTable .fixed-table-toolbar").append($(".mainNav-shop"));
+	//高度自适应，分页条的定位 
+	$(window).resize(function () {
+			$("#washMainTable").bootstrapTable('resetView', { 
+				height : $(window).height()  - parentHead.height() - navbar.height() - mainNavHeight
+			}); 
+			$(".fixed-table-pagination").css("top",$(".main").height());
+	});
+	$(window).resize(function () {
+			$("#addCleanUpdate-top-tools").bootstrapTable('resetView');
+	}); 
+	//父页面的头部收缩
+	parentHeadIf.click(function(){
+		$("#washMainTable").bootstrapTable('resetView', { 
+			height : $(window).height()  - parentHead.height() - navbar.height() - mainNavHeight
+		}); 
+		$(".washMain .fixed-table-pagination").css("top",$(".washMain").height());
+	});
+	//页面主表 end 
+	
+	// 清洗器械
+	function cleanInstrument(){
+		var cleanInstrumentTableData =new Array();
+		var cleanInstrumentTableHeaderColumns = [ 
 			{
-				title : '清洗程序',
-				field : 'disinfectProgram',
-				align : 'center'
-			},
-			{
-				title : '清洗状态',
-				field : 'washStatus',
+				title : '名称',
+				field : 'instrumentName',
 				align : 'center',
-				formatter: function (value,row,index){
-					if(row.washStatus=="清洗完成")
-					{
-						var ws = "<div class='progress'><div class='progress-bar progress-bar-success' role='progressbar' aria-valuenow='100'";
-								ws += "aria-valuemin='0' aria-valuemax='100' style='width: 100%'><span class='sr-only'>100% Complete</span>";
-								ws += row.washStatus;
-								ws += "</div></div>";
-						return  ws;
-					}
-					if(row.washStatus=="清洗中")
-					{
-						 var ws = "<div class='progress'><div class='progress-bar progress-bar-info progress-bar-striped' role='progressbar' aria-valuenow='50'";
-								ws += "aria-valuemin='0' aria-valuemax='50' style='width: 50%'><span class='sr-only'>50% Complete</span>";
-								ws += row.washStatus;
-								ws += "</div></div>";
-						 return  ws;
-					}
-					if(row.washStatus=="清洗失败")
-					{
-						 var ws = "<div class='progress'><div class='progress-bar progress-bar-danger progress-bar-striped' role='progressbar' aria-valuenow='100'";
-								ws += "aria-valuemin='0' aria-valuemax='100' style='width: 100%'><span class='sr-only'>100% Complete</span>";
-								ws += row.washStatus;
-								ws += "</div></div>";
-						 return  ws;
-					}
-				},
-			}, 
-			{
-				title : '开始时间',
-				field : 'startDateStr',
-				align : 'center',
-				sortable: true
 			},
 			{
-				title : '结束时间',
-				field : 'endDateStr',
+				title : '数量',
+				field : 'count',
 				align : 'center',
 				sortable: true
 			},
 			{
 				title : '操作',
-				field : 'cycleCounter',
+				field : 'handle',
 				align : 'center',
-				formatter: function(value,row,index)
-				{
-						var alink =  "<a data-toggle='modal' data-target='#updateModal'";
-						alink += "onclick='UpdateCleanList(";
-						alink += row.id +",";
-						alink += "\',"+row.disinfectIdentification+"\',";
-						alink += "\'"+row.disinfectProgram+"\',";
-						alink += "\'"+row.startDateStr+"\',";
-						alink += "\'"+row.endDateStr+"\',";
-						
-						alink += ")'>";
-						alink += "<span class='glyphicon glyphicon-asterisk' ></span></a>";
-						return   alink;
-				},
-			}, 
-			{
-				title : '清洗参数',
-				field : 'washDataAmount',
-				align : 'center'
-			},
-			{
-				title : '清洗总数',
-				field : 'washMaterialAmount',
-				align : 'center',
-				sortable: true
-			},
+			} 
 		];
-		var InitTable =function(url){
-				//先销毁表格
-			$('#washMainTable').bootstrapTable("destroy");
-				//添加表格
-			$('#washMainTable').bootstrapTable({
-				url:url,
-				method:'post',		//请求方式
-				contentType: "application/x-www-form-urlencoded",//请求数据内容格式 默认是 application/json 自己根据格式自行服务端处理
-				height: alltablefirst,
-				search: true,			//是否搜索
-				pagination: true,	//是否分页
-				pageList: [5, 10, 20, 50],//分页步进值
-				sidePagination: "server",	//服务端分页
-				queryParamsType: "limit",	//查询参数组织方式
-				onColumnSwitch:onColumnSwitch,
-				queryParams : queryParams, 
-				searchOnEnterKey: "true",	//回车搜索
-				showRefresh: "true",			//刷新按钮
-				showColumns: true,				//列选择按钮
-				minimumCountColumns: 1,		//最少允许的列数
-				clickToSelect: true,			//是否启用点击选中行
-				uniqueId: "ID",						//每一行的唯一标识，一般为主键列
-				cardView: false,          //是否显示详细视图
-				detailView: false,				//是否显示父子表
-				showExport: true,
-				exportDataType: "selected",//导出checkbox选中的行数
-				paginationLoop: false, 		//是否无限循环
-				columns: columnArray,
-				responseHandler:function(res){
-					console.log("ass:"+res.rows[0].operator);
-					if(res.rows[0].operator){
-						var operator = res.rows[0].operator;
-						$("#updateArr").val(operator);
-					}
-					return res;
-				},
+		for(var i=0; i<=100;i++)
+		{
+			cleanInstrumentTableData.push({
+				instrumentName:'手术刀',
+				count:20,
+				handle:'<a><span class="glyphicon glyphicon-trash"></span></a>' 
 			});
-			return InitTable;
 		}
-		InitTable("/disinfectSystem/grid/gridController/getGrid.mhtml");
-		$(".fixed-table-pagination").css("top",$(".main").height()-47);
-		//jq过滤事件
-		var addArray= new Array();
-		var array=[];
-		for (var i = 0; i < columnArray.length; i++) {
-			if(!columnArray[i].field)
-			{
-				//console.log("no create field:"+columnArray[i].field);
-			}
-			if(columnArray[i].field==null)
-			{ 
-				//console.log("null field:"+columnArray[i].field);
-			}
-			else
-			{
-					array.push(columnArray[i].field);
-			}
-		}
-		
-		$('#hiddens').val(JSON.stringify(array));
-		//列筛选
-		function onColumnSwitch(field,checked){
-			var str ={'Name':field,'states':checked}
-			addArray.push(str);
-			Array.prototype.indexOf = function(val) {
-				for (var i = 0; i < this.length; i++) {
-					if (this[i] == val) return i;
-				}
-				return -1;
-			};
-			Array.prototype.remove = function(val) {
-				var index = this.indexOf(val);
-				if (index > -1) {
-					this.splice(index, 1);
-				}
-			};
-			for(var i=0;i<addArray.length;i++){
-				if(addArray[i].states===false){
-					array.remove(addArray[i].Name);
-				}
-				if(addArray[i].states===true){
-					array.push(addArray[i].Name);
-				}
-			}
-			$('#hiddens').val(JSON.stringify(array));
-		}
-		
-		function queryParams(params,searchName) {
-			if(params.search==null||params.search==""){
-				var filtersValue = [];
-			}
-			else{
-				//搜索
-				console.log( "search type:" + typeof(params.search) );
-				var hiddenArr = JSON.parse($("#hiddens").val());
-				var filtersValue = [];
-				
-				for(var i=0;i<hiddenArr.length;i++){//hiddenArr.length
-					if(hiddenArr[i]=="startDateStr"||hiddenArr[i]=="endDateStr"||hiddenArr[i]=="cycleCounter"||hiddenArr[i]=="washDataAmount"||hiddenArr[i]=="washMaterialAmount"){
-						
-					} 
-					else{
-						var filtersAppend = {
-							columnLabel: hiddenArr[i],
-							propFullName: "",
-							value: params.search,
-							operator: "like"
-						};
-						filtersValue[i]=filtersAppend;
-					}
-				}
-			};
-			var temp = {   
-				//这里的键的名字和控制器的变量名必须一直，这边改动，控制器也需要改成一样的
-				offset: params.offset, //页码
-				limit: params.limit,   //页面大小
-				filters: filtersValue,
-				logicalOperator : "OR",
-				gridId: "com.forgon.disinfectsystem.washanddisinfectmanager.washanddisinfectrecord.findWashAndDisinfectRecordList",
-			}; 
-			return {gridParams:JSON.stringify(temp)};
-		} 
-		// 主表 end 
-		
-		// 器械参数
-		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 cleanInstrument(){
-			var cleanInstrumentTableData =new Array();
-			var cleanInstrumentTableHeaderColumns = [ 
-				{
-					title : '名称',
-					field : 'instrumentName',
-					align : 'center',
-				},
-				{
-					title : '数量',
-					field : 'count',
-					align : 'center',
-					sortable: true
-				},
-				{
-					title : '操作',
-					field : 'handle',
-					align : 'center',
-				} 
-			];
-			for(var i=0; i<=100;i++)
-			{
-				cleanInstrumentTableData.push({
-					 instrumentName:'手术刀',
-					 count:20,
-					 handle:'<a><span class="glyphicon glyphicon-trash"></span></a>' 
-				});
-			}
-	// 
-			$("#addCleanUpdate-top-tools").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,              
-				uniqueId: "id",                   
-				cardView: false,                  
-				detailView: false,                
-				removeByUniqueId:1,
-				columns: cleanInstrumentTableHeaderColumns,
-				data: cleanInstrumentTableData,
-			});
-		}
+// 
+		$("#addCleanUpdate-top-tools").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,              
+			uniqueId: "id",                   
+			cardView: false,                  
+			detailView: false,                
+			removeByUniqueId:1,
+			columns: cleanInstrumentTableHeaderColumns,
+			data: cleanInstrumentTableData,
+		});
+	}
+	//清洗器械end
+	//添加
+	$("#addHandle").click(function(){
 		cleanInstrument();
-		//清洗器械end
+	});
+	
+	//添加报损
+	$("#addBad").click(function(){
+		$(".addBad-bottom-handle-table .fixed-table-container").css("padding-bottom","40px");
 		//器械报损明细
 		var instrumentDamageReportTableData =new Array();
 		var instrumentDamageReportTableHeaderColumns = [ 
@@ -421,7 +369,6 @@
 				deleteHadle:'<a><span class="glyphicon glyphicon-trash"></span></a>'
 			});
 		}
-
 		$("#addBad-bottom-handle-table").bootstrapTable({
 			striped: true,                   
 			cache: false,                    
@@ -445,253 +392,859 @@
 			columns: instrumentDamageReportTableHeaderColumns,
 			data: instrumentDamageReportTableData,
 		});
-		//器械报损明细 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)
+		//器械报损明细 end
+	});
+	
+	//修改——清洗器械
+	function UpdateInstrument(){
+		var UpdateInstrumentTableData =new Array();
+		var UpdateInstrumentTableHeaderColumns = [ 
+			{
+				title : '名称',
+				field : 'instrumentName',
+				align : 'center',
+			},
+			{
+				title : '数量',
+				field : 'count',
+				align : 'center',
+				sortable: true
+			},
+			{
+				title : '操作',
+				field : 'handle',
+				align : 'center',
+			} 
+		];
+		for(var i=0; i<=100;i++){
+			UpdateInstrumentTableData.push({
+				instrumentName:'手术刀',
+				count:20,
+				handle:'<a><span class="glyphicon glyphicon-trash"></span></a>' 
+			});
+		}
+		// 
+		$("#UpdateClean-top-tools").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,           
+			uniqueId: "id",                
+			cardView: false,               
+			detailView: false,             
+			removeByUniqueId:1,
+			columns: UpdateInstrumentTableHeaderColumns,
+			data: UpdateInstrumentTableData,
+		});
+	}	
+	//修改——清洗器械 end
+	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 () {
+		// 执行一些动作...
+		//保存成功后关闭模态框并清理模态框以及隐藏域里面的数据
+		$('#hiddenss').val("");
+		$("#addCleanGetCode1").val("");
+		$("#addCleanStartDateStr").val("");
+		$("#addCleanOrgWashEndTime").val("");
+		uBaskets([]);
+	})
+	//清洗记录修改 篮筐的删除
+	function updateBasketDelete(cbi){
+		var cbiArrNew=[];
+		var cbiArrHide = $("#updateListBasketArr").val();
+		cbiArrHide = JSON.parse(cbiArrHide);
+		newCbiArrHide = cbiArrHide;
+		cbiArrHide =  cbiArrHide.baskets;
+		cbi = cbi.replace("cbi","");
+		cbi = parseInt(cbi);
+		for(var i=0; i<cbiArrHide.length; i++){
+			var classifyBasketId = cbiArrHide[i].classifyBasketId;
+			if(classifyBasketId == cbi){
+				
+			}
+			else{
+				cbiArrNew.push(cbiArrHide[i]);
+			}
+		}
+		newCbiArrHide.baskets = cbiArrNew;
+		$("#updateListBasketArr").val(JSON.stringify(newCbiArrHide)); 
+		updateDetailBaskets(newCbiArrHide.baskets,cbi);
+	}
+	//清洗记录修改
+	function updateDetailBaskets(arrData,UpId){
+		var BasketsTableData =new Array();
+		var BasketsTableHeaderColumns = [
+			{
+				title : '名称',
+				field : 'containerName',
+				align : 'center',
+				sortable: true
+			},
+			{
+				title : '数量',
+				field : 'amount',
+				align : 'center',
+				sortable: true
+			},
+			{
+				title : '条形码',
+				field : 'containerBarcode',
+				align : 'center',
+				sortable: true
+			},
+			{
+				title : '操作',
+				field : 'handle',
+				align : 'center',
+				formatter: function(value,row,index){
+					return "<a  id='bc"+row.barcode+"' onclick='updateBasketDelete(\"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',
+					
+			}
+		]; 
+		$('#UpdateCleanBaskets').bootstrapTable("destroy");
+		$("#UpdateCleanBaskets").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');
+			
+			
+			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/findWashMaterialByWashId.mhtml",
+				type:'post',
+				async: false,           //很重要，这里要使用同步请求
+				data:{id:UpId},
+				dataType:"json",
+				success:function(data){
+					var childTable = data.baskets[0].items;
+					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>"+"</td>";
+						html += "<td>" +"</td>";
+						html += "<td>"+"</td>";
+						html += "<td>"+childTable[i].recyclingDept+"</td>"; 
+						html += "<td>"+childTable[i].recyclingTime+"</td>";
+						html += "</tr>"; 
 					}
-        });
-        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);
-						}
-					})
+					html += "</table>";
+					cur_table.html(html);
 				}
-		}	
-		//添加待清洗篮筐子表 end
-		//修改——清洗器械
-		function UpdateInstrument(){
-		 	var UpdateInstrumentTableData =new Array();
-			var UpdateInstrumentTableHeaderColumns = [ 
-				{
-					title : '名称',
-					field : 'instrumentName',
-					align : 'center',
+			})
+			
+		}
+			
+	}
+
+	function UpdateCleanList(UpId,sealNum,disIden,disPro,startDS,endDS){
+		$("#updateSerialNumber").val(sealNum);
+		$.ajax({
+			url: "/disinfectSystem/washAndDisinfect/washAndDisinfectRecordController/findWashMaterialByWashId.mhtml",
+			type: "post",
+			data:{id: UpId},
+			success(res){ 
+				var operator = $("#updateArr").val();
+				$("#updateOperator").val(operator);
+				console.log("rreess:"+res);
+				var resArr = res;
+				updateDetailBaskets(res.baskets,UpId);
+				$("#updateListBasketArr").val(JSON.stringify(res));
+			}
+		})
+	}
+	var arrData = new Array();
+	//添加  清洗篮筐
+	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 : 'count',
-					align : 'center',
-					sortable: true
-				},
-				{
-					title : '操作',
-					field : 'handle',
-					align : 'center',
-				} 
-			];
-			for(var i=0; i<=100;i++)
+			},
 			{
-				UpdateInstrumentTableData.push({
-					 instrumentName:'手术刀',
-					 count:20,
-					 handle:'<a><span class="glyphicon glyphicon-trash"></span></a>' 
-				});
+				title : '责任人',
+				field : 'personInCharge',
+				align : 'center',
+					
+			},
+			{
+				title : '回收科室',
+				field : 'recyclingDept',
+				align : 'center',
+					
+			},
+			{
+				title : '回收时间',
+				field : 'recyclingTime',
+				align : 'center',
+					
 			}
-			// 
-			$("#UpdateClean-top-tools").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,           
-				uniqueId: "id",                
-				cardView: false,               
-				detailView: false,             
-				removeByUniqueId:1,
-				columns: UpdateInstrumentTableHeaderColumns,
-				data: UpdateInstrumentTableData,
-			});
+		]; 
+		$('#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);
+				}
+			})
 		}	
-		UpdateInstrument();
-		//修改——清洗器械 end
-		//添加——清洗篮筐
-		function addBaskets(){
-			var BasketsTableData =new Array();
-			var BasketsTableHeaderColumns = [
+	}
+	
+	// 解决谷歌下输入框不能输入的问题
+	$.fn.modal.Constructor.prototype.enforceFocus = function () {};
+	
+	$("#instrumentName").select2({
+		language: "zh-CN",//汉化
+		placeholder:'请选择',//默认文字提示
+		minimumInputLength:1,
+		maximumSelectionLength:10,
+		ajax:{
+			url: "/disinfectSystem/baseData/materialDefinitionController/getMaterialDefinitionDataForDamage.mhtml",
+			contentType:"application/json",//"application/x-www-form-urlencoded",
+			type: "get",
+			delay:500,
+			data: function(params){
+					$("#instr").val(params.term);
+					return {   
+						spell:params.term,
+						title:params.term,
+						limit:100,
+						page: params.page||1,
+						offset: (params.page||1)*100
+					};
+			},
+			processResults: function(data,params){
+				data = JSON.parse(data);
+				var res=[];
+				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);
+				} 
+				return {
+					results: res,
+					"pagination":{"more":true}
+				}
+			}
+		},
+	})
+	var basketArray = new Array();
+	//时间插件
+	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();
+
+	// 添加清洗扫码
+	//警告框
+	function warnTips(title,info){
+		$(".errorTips-title").text(title);
+		$(".errorTips-info").text(info);
+		var eTC = $("#errorTips").clone(); 
+		$('.alert-warning').removeClass('hide').addClass('in');
+		
+		$(".close").click(function(){
+			$(".alert").alert('close');
+			$(".main").append(eTC);	
+		});
+	}
+	//添加清洗的条码扫描
+	var abArr = new Array();
+	$('#addCleanGetCode1').bind('keyup', function(event) {
+		var  hiddenss =$(this).val();
+		if(event.keyCode == "13"){
+			var ruid = $('#addCleanGetCode1').val();
+			var codeData = {barcode:ruid};
+			//判断是否输入条码
+			if($("#addCleanGetCode1").val()=="")
+			{
+				window.alert("请输入条码");
+				return 0;
+			}
+			//判断是否重复条码
+			if(!$('#hiddenss').val())
+			{
+				var hival = [];
+			}
+			else{
+				var hival = JSON.parse($('#hiddenss').val());
+			}
+			var tf = 0;
+			for(var i=0 ;i<hival.length;i++)
+			{
+				if(ruid == hival[i].barcode)
 				{
-				   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',
-				    
+					window.alert('篮筐已载入，请勿重复操作！'); 
+					tf = 11;
+					return 0;
 				}
-		 	]; 
-			$("#Baskets").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, 
-			});
+			}
+			if(tf == 11)
+			{
+				return 0;
+			}
+			$.ajax({
+				url:"/disinfectSystem/washAndDisinfect/washAndDisinfectRecordController/loadContainerContentOfJSON.mhtml",
+				type:"post",
+				dataType:"json",
+				data: codeData,
+				success: function(data){
+					var bei = data;
+					if(data.success===true){
+						var nnArr = [{
+							name:data.name,
+							barcode:data.barcode,
+							amount:data.amount,
+							classifyBasketId:data.classifyBasketId,
+							personInCharge:"admin",
+							personInChargeCode:"1212",
+						}]; 
+						if($('#hiddenss').val()=='')
+						{ 
+							$('#Baskets').bootstrapTable('append',nnArr);
+							$('#hiddenss').val(JSON.stringify(nnArr));
+						}
+						else
+						{
+							var bArrif = 0;
+							var bArr = JSON.parse($('#hiddenss').val())
+							bArr.push(nnArr[0]);
+							$('#hiddenss').val(JSON.stringify(bArr));
+							uBaskets(JSON.parse($('#hiddenss').val()));
+						}
+					} 
+					else{
+						window.alert("没有该篮筐");
+					}
+				}
+			})
+		}
+	})
+	//清洗器械
+	$("#addInstrument").click(function(){
+		var aN = $("#addInstrumentName").val();
+		var aC = $("#addInstrumentCount").val();
+		console.log("ru:"+aN+";"+aC);
+	});
+	//添加清洗的提交保存		
+	$("#addCleanRefer").click(function(){
+		var ifajax = 11;
+		if($("#addCleanDisinfectIdentification").val()=="")
+		{
+			window.alert('清洗机名称不能为空');
+			ifajax = 12;
+		}
+		if($("#addCleanDisinfectProgram").val()=="")
+		{
+			window.alert('清洗程序不能为空');
+			ifajax = 12;
+		}
+		if($("#addCleanOrgWashEndTime").val()=="")
+		{
+			window.alert('结束时间不能为空');
+			ifajax = 12;
+		}
+		if($("#addCleanOperator").val()=="")
+		{
+			window.alert('操作员不能为空');
+			ifajax = 12;
+		}
+		if($("#addCleanStartDateStr").val()=="")
+		{
+			window.alert('开始时间不能为空');
+			ifajax = 12;
 		} 
+		if($("#hiddenss").val()==""||$("#hiddenss").val()=="[]")
+		{
+			window.alert('清洗篮筐不能为空');
+			ifajax = 12;
+		}
+		if(ifajax == 12)
+		{
+			return 0;
+		} 
+		$.ajax({
+			url: "/disinfectSystem/washAndDisinfect/washAndDisinfectRecordController/saveWashAndDisinfectRecord.mhtml",
+			type: "post",
+			dataType: "json",
+			data:{
+				cycleCounter 						: 0,
+				disinfectIdentification :$("#addCleanDisinfectIdentification").val(),
+				disinfectProgram 				:$("#addCleanDisinfectProgram").val(),
+				endDateStr 							:$("#addCleanOrgWashEndTime").val(),
+				operator 								:$("#addCleanOperator").val(),
+				startDateStr 						:$("#addCleanStartDateStr").val(),
+				serialNumber						: "",
+				classifyBasketInfo			:$('#hiddenss').val()
+			},
+			success:function(result){  
+				//保存成功后清理模态框以及隐藏域里面的数据
+				$('#hiddenss').val("");
+				$("#addCleanGetCode1").val("");
+				$("#addCleanStartDateStr").val("");
+				$("#addCleanOrgWashEndTime").val("");
+				uBaskets([]);
+				
+				window.alert(result.message);
+				$("#addModal").modal('hide');
+				$("#allApplication_table").bootstrapTable('refresh'); 
+			},
+			error:function(result){ 
+				console.log(result.message);
+			},
+		});
 
-		//修改——清洗篮筐
-		
-		
-		//高度自适应，分页条的定位 
-		$(window).resize(function () {
-				$("#washMainTable").bootstrapTable('resetView', { 
-					height : $(window).height()  - parentHead.height() - navbar.height() - mainNavHeight
-				}); 
-				$(".fixed-table-pagination").css("top",$(".main").height());
+	});
+	//修改
+	$("#updateHandle").click(function(){
+		var a= $("#allApplication_table").bootstrapTable('getSelections');
+		if(a.length!=1){
+						warnTips("警告：","修改信息请不要乱选"); 
+		}
+		else{
+			$("#updateModal").modal('show');
+		}
+	});
+	//清洗完成
+	$("#finishHandle").click(function(){
+		var a= $("#allApplication_table").bootstrapTable('getSelections');
+		if(a.length<=0){
+						warnTips("警告","至少选择一条"); 
+		}
+		else{
+			$("#cleanFinishModal").modal('show');
+		}
+	});	
+	//清洗失败
+	$("#failedHandle").click(function(){
+		var a= $("#allApplication_table").bootstrapTable('getSelections');
+		if(a.length<=0){
+			warnTips("警告","至少选择一条"); 
+		}
+		else{
+			$("#cleanFalseModal").modal('show');
+		}	
+	});			
+	//删除
+	$("#deleteHandle").click(function(){
+		var a= $("#allApplication_table").bootstrapTable('getSelections');
+		if(a.length<=0){
+			warnTips("警告：","至少选择一条"); 
+		}
+		else{
+			$("#deleteModal").modal('show');
+		}		
+	});
+
+	//inputPrint end
+});
+
+	// 器械参数
+	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,
 		});
-		$(window).resize(function () {
-				$("#addCleanUpdate-top-tools").bootstrapTable('resetView');
-		}); 
-		//父页面的头部收缩
-		parentHeadIf.click(function(){
-				$("#washMainTable").bootstrapTable('resetView', { 
-					height : $(window).height()  - parentHead.height() - navbar.height() - mainNavHeight
-				}); 
-				$(".washMain .fixed-table-pagination").css("top",$(".washMain").height());
+	}
+	// 器械参数 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',
+					
+			}
+		]; 
+		$("#Baskets").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, 
 		});
-		//添加报损底部表格的底部边距  #addBad-bottom-handle-table
-		$(".addBad-bottom-handle-table .fixed-table-container").css("padding-bottom","40px");
+	} 
+	//修改——清洗篮筐
+	
+	//添加报损底部表格的底部边距  #addBad-bottom-handle-table
+	
 		
-		
-}); 
-$(document).ready(function(){
-			$(".mainTable .fixed-table-toolbar").append($(".mainNav-shop"));
-});
 
+