Index: ssts-web/src/main/webapp/dx-disinfectsystem/js/washingApplication/inputPrint.js
===================================================================
diff -u -r24628 -r24636
--- ssts-web/src/main/webapp/dx-disinfectsystem/js/washingApplication/inputPrint.js	(.../inputPrint.js)	(revision 24628)
+++ ssts-web/src/main/webapp/dx-disinfectsystem/js/washingApplication/inputPrint.js	(.../inputPrint.js)	(revision 24636)
@@ -224,7 +224,6 @@
 				window.alert("请输入条码");
 				return 0;
 			}
-			
 			//判断是否重复条码
 			if(!$('#hiddenss').val())
 			{
@@ -247,7 +246,6 @@
 			{
 				return 0;
 			}
-			
 			$.ajax({
 				url:"/disinfectSystem/washAndDisinfect/washAndDisinfectRecordController/loadContainerContentOfJSON.mhtml",
 				type:"post",
@@ -387,24 +385,23 @@
 	$("#failedHandle").click(function(){
 		var a= $("#allApplication_table").bootstrapTable('getSelections');
 		if(a.length<=0){
-					warnTips("警告","至少选择一条"); 
+			warnTips("警告","至少选择一条"); 
 		}
 		else{
-					$("#cleanFalseModal").modal('show');
+			$("#cleanFalseModal").modal('show');
 		}	
 	});			
 
 	//删除
 	$("#deleteHandle").click(function(){
 		var a= $("#allApplication_table").bootstrapTable('getSelections');
 		if(a.length<=0){
-					warnTips("警告：","至少选择一条"); 
+			warnTips("警告：","至少选择一条"); 
 		}
 		else{
-					$("#deleteModal").modal('show');
+			$("#deleteModal").modal('show');
 		}		
 	});
-
 })
 
 
Index: ssts-web/src/main/webapp/dx-disinfectsystem/js/washingApplication/washingApplication.js
===================================================================
diff -u -r24628 -r24636
--- ssts-web/src/main/webapp/dx-disinfectsystem/js/washingApplication/washingApplication.js	(.../washingApplication.js)	(revision 24628)
+++ ssts-web/src/main/webapp/dx-disinfectsystem/js/washingApplication/washingApplication.js	(.../washingApplication.js)	(revision 24636)
@@ -21,8 +21,8 @@
 				align : 'center',
 				sortable: true, 
 				formatter: function (value,row,index){
-				return '<a  class="mainFont" data-toggle="modal" data-target="#updateModal" onclick="ClickName('+row.id+')">'+row.serialNumber+'</a>';
-									},
+					return '<a  class="mainFont" data-toggle="modal" data-target="#updateModal" onclick="ClickName('+row.id+')">'+row.serialNumber+'</a>';
+				},
 			}, 
 			{
 				title : '操作员',
@@ -111,17 +111,14 @@
 				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, 
+				queryParams : queryParams, 
 				searchOnEnterKey: "true",	//回车搜索
 				showRefresh: "true",			//刷新按钮
 				showColumns: true,				//列选择按钮
@@ -134,6 +131,42 @@
 				exportDataType: "selected",//导出checkbox选中的行数
 				paginationLoop: false, 		//是否无限循环
 				columns: columnArray,
+				responseHandler: function(res){//ajax请求成功后，发放数据之前可以对返回的数据进行处理 
+					var hiddenArr = JSON.parse($("#hiddens").val());
+					for(var i=1;i<hiddenArr.length;i++){
+						var gridParams = {
+							filters:[
+								{
+									columnLabel: hiddenArr[i],
+									propFullName: "",
+									value: $('.search input').val(),
+									operator: "like"
+								}
+							],
+							columnLabel: "serialNumber",
+							gridId: "com.forgon.disinfectsystem.washanddisinfectmanager.washanddisinfectrecord.findWashAndDisinfectRecordList",
+						}
+						$.ajax({
+							url:"/disinfectSystem/grid/gridController/getGrid.mhtml",
+							type:"post",
+							dataType:"json",
+							data:{
+								gridParams:JSON.stringify(gridParams)
+							},
+							success:function(res2){
+								if(res2.rows == []){
+									
+								}
+								else{
+									res.rows = res.rows.concat(res2.rows);
+									$('#washMainTable').bootstrapTable('append',res.rows);
+								}
+								
+							}
+						})
+					}
+					return res;
+        },
 			});
 			return InitTable;
 		}
@@ -155,7 +188,7 @@
 					array.push(columnArray[i].field);
 			}
 		}
-		console.log(columnArray);
+		
 		$('#hiddens').val(JSON.stringify(array));
 		//列筛选
 		function onColumnSwitch(field,checked){
@@ -183,14 +216,17 @@
 			}
 			$('#hiddens').val(JSON.stringify(array));
 		}
+		
 		function queryParams(params,searchName) {
+			var hiddenArr = JSON.parse($("#hiddens").val());
+			
 			var temp = {   
 				//这里的键的名字和控制器的变量名必须一直，这边改动，控制器也需要改成一样的
-				offset: params.offset,  //页码
+				offset: params.offset, //页码
 				limit: params.limit,   //页面大小
 				filters:[
 					{
-						columnLabel: "disinfectProgram",
+						columnLabel: hiddenArr[0],
 						propFullName: "",
 						value: params.search,
 						operator: "like"
@@ -199,7 +235,7 @@
 				columnLabel: "serialNumber",
 				gridId: "com.forgon.disinfectsystem.washanddisinfectmanager.washanddisinfectrecord.findWashAndDisinfectRecordList",
 			};
-			console.log("param.search::"+params.search);
+			//console.log("param.search::"+params.search);
 			return {gridParams:JSON.stringify(temp)};
 		} 
 		InitTable("/disinfectSystem/grid/gridController/getGrid.mhtml");
Index: ssts-web/src/main/webapp/dx-disinfectsystem/js/deliveryManagementApplication/deliveryManagementApplication.js
===================================================================
diff -u -r24628 -r24636
--- ssts-web/src/main/webapp/dx-disinfectsystem/js/deliveryManagementApplication/deliveryManagementApplication.js	(.../deliveryManagementApplication.js)	(revision 24628)
+++ ssts-web/src/main/webapp/dx-disinfectsystem/js/deliveryManagementApplication/deliveryManagementApplication.js	(.../deliveryManagementApplication.js)	(revision 24636)
@@ -132,13 +132,13 @@
 				pagination: true,                
 				sortable: true,                  
 				sortOrder: "asc",                
-				toolbar: true,
-				sidePagination: "client",        
+				toolbar: true,        
 				pageNumber:1,                    
 				pageSize: 15,                    
 				pageList: [10, 25, 50, 100],     
 				search: true,                    
 				strictSearch: true,
+				searchOnEnterKey: "true",	
 				showColumns: true,               
 				showRefresh: true,               
 				minimumCountColumns: 2,          
@@ -150,19 +150,64 @@
 				detailView: false,               
 				removeByUniqueId:1,
 				columns: maintableHeaderColumns, 
-				queryParams :queryParams
+				queryParams :queryParams,
+				queryParamsType: "limit", 
 			});
 
 		}
 		$(".fixed-table-pagination").css("top",$(".main").height());
 		// 主表 end 
+		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) {
+			var hiddenArr = JSON.parse($("#hiddens").val());
 			var temp = {   //这里的键的名字和控制器的变量名必须一直，这边改动，控制器也需要改成一样的
 				limit: params.limit,   //页面大小
 				offset: params.offset,  //页码
-				pageSize: this.pageSize,
-				pageNumber: this.pageNumber,
-
 				sorters : [],
 				filters : [],
 				columnLabel: "t.id",
Index: ssts-web/src/main/webapp/dx-disinfectsystem/js/washingApplication/washingApplication.min.js
===================================================================
diff -u -r24628 -r24636
--- ssts-web/src/main/webapp/dx-disinfectsystem/js/washingApplication/washingApplication.min.js	(.../washingApplication.min.js)	(revision 24628)
+++ ssts-web/src/main/webapp/dx-disinfectsystem/js/washingApplication/washingApplication.min.js	(.../washingApplication.min.js)	(revision 24636)
@@ -1 +1 @@
-function addInstrument(){$(".addCheck-kitinfo").append($(".addCheck-kitinfo-instrument").clone().attr("id","aI"))}$(function(){function e(e,t){var a={Name:e,states:t};c.push(a),Array.prototype.indexOf=function(e){for(var t=0;t<this.length;t++)if(this[t]==e)return t;return-1},Array.prototype.remove=function(e){var t=this.indexOf(e);t>-1&&this.splice(t,1)};for(var i=0;i<c.length;i++)!1===c[i].states&&p.remove(c[i].Name),!0===c[i].states&&p.push(c[i].Name);$("#hiddens").val(JSON.stringify(p))}function t(e,t){var a={offset:e.offset,limit:e.limit,filters:[{columnLabel:"disinfectProgram",propFullName:"",value:e.search,operator:"like"}],columnLabel:"serialNumber",gridId:"com.forgon.disinfectsystem.washanddisinfectmanager.washanddisinfectrecord.findWashAndDisinfectRecordList"};return console.log("param.search::"+e.search),{gridParams:JSON.stringify(a)}}var a="2018-08-05  12:30",i=window.parent.$(".head-index"),n=window.parent.$(".content-index"),l=window.parent.$(".content-index-toggle-off"),r=$(".mainNav").height(),s=$(window).height()-i.height()-n.height()-r;!function(e,t){var a=new Object;new Object,$(t).bootstrapTable({detailView:!0,striped:!0,sortOrder:"asc",pageNumber:1,height:200,url:e,columns:[{title:"名称",field:"name",align:"center",sortable:!0},{title:"数量",field:"amount",align:"center",sortable:!0},{title:"条形码",field:"barcode",align:"center",sortable:!0},{title:"操作",field:"handle",align:"center",formatter:function(e,t,a){return"<a><span class='glyphicon glyphicon-trash' id='"+t.classifyBasketId+"'onclick='addBasketDelete("+t.classifyBasketId+")'></span></a>"}},{title:"责任人",field:"personInCharge",align:"center"},{title:"回收科室",field:"recyclingDept",align:"center"},{title:"回收时间",field:"recyclingTime",align:"center"}],onExpandRow:function(e,t,i){a.InitSubTable(e,t,i)}}),a.InitSubTable=function(t,a,i){console.log(t);var n=i.html("<table></table>").find("table");console.log(a.children);var l="";console.log("index:"+t+";row:"+a+";$detail:"+i+";"),l+="<table class='table childTable'>",$.ajax({url:e,type:"get",async:!1,success:function(e){var a=e.data[t].children;console.log(a);for(var i=0;i<a.length;i++)l+="<tr><td>"+a[i].name+"</td>",l+="<td>"+a[i].count+"</td>",l+="<td>"+a[i].code+"</td>",l+="<td>"+a[i].handle+"</td>",l+="<td>"+a[i].dutyMan+"</td>",l+="<td>"+a[i].recoveryRoom+"</td>",l+="<td>"+a[i].recoveryTime+"</td>",l+="</tr>";l+="</table>",n.html(l)}})}}("","#readyBaskets");new Array;var o=[{checkbox:!0,visible:!0},{title:"流水号",field:"serialNumber",align:"center",sortable:!0,formatter:function(e,t,a){return'<a  class="mainFont" data-toggle="modal" data-target="#updateModal" onclick="ClickName('+t.id+')">'+t.serialNumber+"</a>"}},{title:"操作员",field:"operator",align:"center"},{title:"清洗机名称",field:"disinfectIdentification",align:"center"},{title:"清洗程序",field:"disinfectProgram",align:"center"},{title:"清洗状态",field:"washStatus",align:"center",formatter:function(e,t,a){if("清洗完成"==t.washStatus){i="<div class='progress'><div class='progress-bar progress-bar-success' role='progressbar' aria-valuenow='100'";return i+="aria-valuemin='0' aria-valuemax='100' style='width: 100%'><span class='sr-only'>100% Complete</span>",i+=t.washStatus,i+="</div></div>"}if("清洗中"==t.washStatus){i="<div class='progress'><div class='progress-bar progress-bar-info progress-bar-striped' role='progressbar' aria-valuenow='50'";return i+="aria-valuemin='0' aria-valuemax='50' style='width: 50%'><span class='sr-only'>50% Complete</span>",i+=t.washStatus,i+="</div></div>"}if("清洗失败"==t.washStatus){var i="<div class='progress'><div class='progress-bar progress-bar-danger progress-bar-striped' role='progressbar' aria-valuenow='100'";return i+="aria-valuemin='0' aria-valuemax='100' style='width: 100%'><span class='sr-only'>100% Complete</span>",i+=t.washStatus,i+="</div></div>"}}},{title:"开始时间",field:"startDateStr",align:"center",sortable:!0},{title:"结束时间",field:"endDateStr",align:"center",sortable:!0},{title:"操作",field:"cycleCounter",align:"center",formatter:function(e,t,a){return"<a data-toggle='modal' data-target='#updateModal' onclick='ClickName("+t.id+")'><span class='glyphicon glyphicon-asterisk' ></span></a>"}},{title:"清洗参数",field:"washDataAmount",align:"center"},{title:"清洗总数",field:"washMaterialAmount",align:"center",sortable:!0}],d=function(a){return $("#washMainTable").bootstrapTable("destroy"),$("#washMainTable").bootstrapTable({url:a,method:"post",contentType:"application/x-www-form-urlencoded",height:s,search:!0,pagination:!0,pageList:[5,10,20,50],sidePagination:"server",queryParamsType:"limit",onColumnSwitch:e,queryParams:t,searchOnEnterKey:"true",showRefresh:"true",showColumns:!0,minimumCountColumns:1,clickToSelect:!0,uniqueId:"ID",cardView:!1,detailView:!1,showExport:!0,exportDataType:"selected",paginationLoop:!1,columns:o}),d};$(".fixed-table-pagination").css("top",$(".main").height());for(var c=new Array,p=[],g=0;g<o.length;g++)o[g].field||console.log("no create field:"+o[g].field),null==o[g].field?console.log("null field:"+o[g].field):p.push(o[g].field);console.log(o),$("#hiddens").val(JSON.stringify(p)),d("/disinfectSystem/grid/gridController/getGrid.mhtml"),function(){for(var e=new Array,t=0;t<=100;t++)e.push({instrumentName:"手术刀",count:20,handle:'<a><span class="glyphicon glyphicon-trash"></span></a>'});$("#addCleanUpdate-top-tools").bootstrapTable({striped:!0,cache:!1,pagination:!1,sortable:!1,sortOrder:"asc",sidePagination:"client",pageNumber:1,pageSize:15,pageList:[10,25,50,100],search:!1,strictSearch:!0,showRefresh:!1,minimumCountColumns:2,clickToSelect:!0,uniqueId:"id",cardView:!1,detailView:!1,removeByUniqueId:1,columns:[{title:"名称",field:"instrumentName",align:"center"},{title:"数量",field:"count",align:"center",sortable:!0},{title:"操作",field:"handle",align:"center"}],data:e})}();for(var u=new Array,g=0;g<=100;g++)u.push({packageName:"器械包",materialName:"手术刀",badCount:20,supplementMan:"李秀",supplementCount:20,supplementTime:a,deleteHadle:'<a><span class="glyphicon glyphicon-trash"></span></a>'});$("#addBad-bottom-handle-table").bootstrapTable({striped:!0,cache:!1,pagination:!1,sortable:!1,sortOrder:"asc",sidePagination:"client",pageNumber:1,pageSize:15,pageList:[10,25,50,100],search:!1,strictSearch:!0,showRefresh:!1,minimumCountColumns:2,clickToSelect:!0,height:250,uniqueId:"id",cardView:!1,detailView:!1,removeByUniqueId:1,columns:[{title:"包名称",field:"packageName",align:"center"},{title:"材料名称",field:"materialName",align:"center",sortable:!0},{title:"损坏数量",field:"badCount",align:"center"},{title:"补充人",field:"supplementMan",align:"center"},{title:"补充数量",field:"supplementCount",align:"center"},{title:"补充时间",field:"supplementTime",align:"center"},{title:"删除",field:"deleteHadle",align:"center"}],data:u}),function(){for(var e=new Array,t=0;t<=100;t++)e.push({instrumentName:"手术刀",count:20,handle:'<a><span class="glyphicon glyphicon-trash"></span></a>'});$("#UpdateClean-top-tools").bootstrapTable({striped:!0,cache:!1,pagination:!1,sortable:!1,sortOrder:"asc",sidePagination:"client",pageNumber:1,pageSize:15,pageList:[10,25,50,100],search:!1,strictSearch:!0,showRefresh:!1,minimumCountColumns:2,clickToSelect:!0,uniqueId:"id",cardView:!1,detailView:!1,removeByUniqueId:1,columns:[{title:"名称",field:"instrumentName",align:"center"},{title:"数量",field:"count",align:"center",sortable:!0},{title:"操作",field:"handle",align:"center"}],data:e})}(),$(window).resize(function(){$("#washMainTable").bootstrapTable("resetView",{height:$(window).height()-i.height()-n.height()-r}),$(".fixed-table-pagination").css("top",$(".main").height())}),$(window).resize(function(){$("#addCleanUpdate-top-tools").bootstrapTable("resetView")}),l.click(function(){$("#washMainTable").bootstrapTable("resetView",{height:$(window).height()-i.height()-n.height()-r}),$(".washMain .fixed-table-pagination").css("top",$(".washMain").height()),console.log("wash aan:"+$(".mainNav").height())}),$(".addBad-bottom-handle-table .fixed-table-container").css("padding-bottom","40px")}),$(document).ready(function(){$(".mainTable .fixed-table-toolbar").append($(".mainNav-shop"))});
\ No newline at end of file
+function addInstrument(){$(".addCheck-kitinfo").append($(".addCheck-kitinfo-instrument").clone().attr("id","aI"))}$(function(){function e(e,a){var t={Name:e,states:a};c.push(t),Array.prototype.indexOf=function(e){for(var a=0;a<this.length;a++)if(this[a]==e)return a;return-1},Array.prototype.remove=function(e){var a=this.indexOf(e);a>-1&&this.splice(a,1)};for(var i=0;i<c.length;i++)!1===c[i].states&&p.remove(c[i].Name),!0===c[i].states&&p.push(c[i].Name);$("#hiddens").val(JSON.stringify(p))}function a(e,a){var t=JSON.parse($("#hiddens").val()),i={offset:e.offset,limit:e.limit,filters:[{columnLabel:t[0],propFullName:"",value:e.search,operator:"like"}],columnLabel:"serialNumber",gridId:"com.forgon.disinfectsystem.washanddisinfectmanager.washanddisinfectrecord.findWashAndDisinfectRecordList"};return{gridParams:JSON.stringify(i)}}var t="2018-08-05  12:30",i=window.parent.$(".head-index"),n=window.parent.$(".content-index"),r=window.parent.$(".content-index-toggle-off"),l=$(".mainNav").height(),s=$(window).height()-i.height()-n.height()-l;!function(e,a){var t=new Object;new Object,$(a).bootstrapTable({detailView:!0,striped:!0,sortOrder:"asc",pageNumber:1,height:200,url:e,columns:[{title:"名称",field:"name",align:"center",sortable:!0},{title:"数量",field:"amount",align:"center",sortable:!0},{title:"条形码",field:"barcode",align:"center",sortable:!0},{title:"操作",field:"handle",align:"center",formatter:function(e,a,t){return"<a><span class='glyphicon glyphicon-trash' id='"+a.classifyBasketId+"'onclick='addBasketDelete("+a.classifyBasketId+")'></span></a>"}},{title:"责任人",field:"personInCharge",align:"center"},{title:"回收科室",field:"recyclingDept",align:"center"},{title:"回收时间",field:"recyclingTime",align:"center"}],onExpandRow:function(e,a,i){t.InitSubTable(e,a,i)}}),t.InitSubTable=function(a,t,i){console.log(a);var n=i.html("<table></table>").find("table");console.log(t.children);var r="";console.log("index:"+a+";row:"+t+";$detail:"+i+";"),r+="<table class='table childTable'>",$.ajax({url:e,type:"get",async:!1,success:function(e){var t=e.data[a].children;console.log(t);for(var i=0;i<t.length;i++)r+="<tr><td>"+t[i].name+"</td>",r+="<td>"+t[i].count+"</td>",r+="<td>"+t[i].code+"</td>",r+="<td>"+t[i].handle+"</td>",r+="<td>"+t[i].dutyMan+"</td>",r+="<td>"+t[i].recoveryRoom+"</td>",r+="<td>"+t[i].recoveryTime+"</td>",r+="</tr>";r+="</table>",n.html(r)}})}}("","#readyBaskets");new Array;var o=[{checkbox:!0,visible:!0},{title:"流水号",field:"serialNumber",align:"center",sortable:!0,formatter:function(e,a,t){return'<a  class="mainFont" data-toggle="modal" data-target="#updateModal" onclick="ClickName('+a.id+')">'+a.serialNumber+"</a>"}},{title:"操作员",field:"operator",align:"center"},{title:"清洗机名称",field:"disinfectIdentification",align:"center"},{title:"清洗程序",field:"disinfectProgram",align:"center"},{title:"清洗状态",field:"washStatus",align:"center",formatter:function(e,a,t){if("清洗完成"==a.washStatus){i="<div class='progress'><div class='progress-bar progress-bar-success' role='progressbar' aria-valuenow='100'";return i+="aria-valuemin='0' aria-valuemax='100' style='width: 100%'><span class='sr-only'>100% Complete</span>",i+=a.washStatus,i+="</div></div>"}if("清洗中"==a.washStatus){i="<div class='progress'><div class='progress-bar progress-bar-info progress-bar-striped' role='progressbar' aria-valuenow='50'";return i+="aria-valuemin='0' aria-valuemax='50' style='width: 50%'><span class='sr-only'>50% Complete</span>",i+=a.washStatus,i+="</div></div>"}if("清洗失败"==a.washStatus){var i="<div class='progress'><div class='progress-bar progress-bar-danger progress-bar-striped' role='progressbar' aria-valuenow='100'";return i+="aria-valuemin='0' aria-valuemax='100' style='width: 100%'><span class='sr-only'>100% Complete</span>",i+=a.washStatus,i+="</div></div>"}}},{title:"开始时间",field:"startDateStr",align:"center",sortable:!0},{title:"结束时间",field:"endDateStr",align:"center",sortable:!0},{title:"操作",field:"cycleCounter",align:"center",formatter:function(e,a,t){return"<a data-toggle='modal' data-target='#updateModal' onclick='ClickName("+a.id+")'><span class='glyphicon glyphicon-asterisk' ></span></a>"}},{title:"清洗参数",field:"washDataAmount",align:"center"},{title:"清洗总数",field:"washMaterialAmount",align:"center",sortable:!0}],d=function(t){return $("#washMainTable").bootstrapTable("destroy"),$("#washMainTable").bootstrapTable({url:t,method:"post",contentType:"application/x-www-form-urlencoded",height:s,search:!0,pagination:!0,pageList:[5,10,20,50],sidePagination:"server",queryParamsType:"limit",onColumnSwitch:e,queryParams:a,searchOnEnterKey:"true",showRefresh:"true",showColumns:!0,minimumCountColumns:1,clickToSelect:!0,uniqueId:"ID",cardView:!1,detailView:!1,showExport:!0,exportDataType:"selected",paginationLoop:!1,columns:o,responseHandler:function(e){for(var a=JSON.parse($("#hiddens").val()),t=1;t<a.length;t++){var i={filters:[{columnLabel:a[t],propFullName:"",value:$(".search input").val(),operator:"like"}],columnLabel:"serialNumber",gridId:"com.forgon.disinfectsystem.washanddisinfectmanager.washanddisinfectrecord.findWashAndDisinfectRecordList"};$.ajax({url:"/disinfectSystem/grid/gridController/getGrid.mhtml",type:"post",dataType:"json",data:{gridParams:JSON.stringify(i)},success:function(a){a.rows==[]||(e.rows=e.rows.concat(a.rows),$("#washMainTable").bootstrapTable("append",e.rows))}})}return e}}),d};$(".fixed-table-pagination").css("top",$(".main").height());for(var c=new Array,p=[],u=0;u<o.length;u++)o[u].field||console.log("no create field:"+o[u].field),null==o[u].field?console.log("null field:"+o[u].field):p.push(o[u].field);console.log(o),$("#hiddens").val(JSON.stringify(p)),d("/disinfectSystem/grid/gridController/getGrid.mhtml"),function(){for(var e=new Array,a=0;a<=100;a++)e.push({instrumentName:"手术刀",count:20,handle:'<a><span class="glyphicon glyphicon-trash"></span></a>'});$("#addCleanUpdate-top-tools").bootstrapTable({striped:!0,cache:!1,pagination:!1,sortable:!1,sortOrder:"asc",sidePagination:"client",pageNumber:1,pageSize:15,pageList:[10,25,50,100],search:!1,strictSearch:!0,showRefresh:!1,minimumCountColumns:2,clickToSelect:!0,uniqueId:"id",cardView:!1,detailView:!1,removeByUniqueId:1,columns:[{title:"名称",field:"instrumentName",align:"center"},{title:"数量",field:"count",align:"center",sortable:!0},{title:"操作",field:"handle",align:"center"}],data:e})}();for(var g=new Array,u=0;u<=100;u++)g.push({packageName:"器械包",materialName:"手术刀",badCount:20,supplementMan:"李秀",supplementCount:20,supplementTime:t,deleteHadle:'<a><span class="glyphicon glyphicon-trash"></span></a>'});$("#addBad-bottom-handle-table").bootstrapTable({striped:!0,cache:!1,pagination:!1,sortable:!1,sortOrder:"asc",sidePagination:"client",pageNumber:1,pageSize:15,pageList:[10,25,50,100],search:!1,strictSearch:!0,showRefresh:!1,minimumCountColumns:2,clickToSelect:!0,height:250,uniqueId:"id",cardView:!1,detailView:!1,removeByUniqueId:1,columns:[{title:"包名称",field:"packageName",align:"center"},{title:"材料名称",field:"materialName",align:"center",sortable:!0},{title:"损坏数量",field:"badCount",align:"center"},{title:"补充人",field:"supplementMan",align:"center"},{title:"补充数量",field:"supplementCount",align:"center"},{title:"补充时间",field:"supplementTime",align:"center"},{title:"删除",field:"deleteHadle",align:"center"}],data:g}),function(){for(var e=new Array,a=0;a<=100;a++)e.push({instrumentName:"手术刀",count:20,handle:'<a><span class="glyphicon glyphicon-trash"></span></a>'});$("#UpdateClean-top-tools").bootstrapTable({striped:!0,cache:!1,pagination:!1,sortable:!1,sortOrder:"asc",sidePagination:"client",pageNumber:1,pageSize:15,pageList:[10,25,50,100],search:!1,strictSearch:!0,showRefresh:!1,minimumCountColumns:2,clickToSelect:!0,uniqueId:"id",cardView:!1,detailView:!1,removeByUniqueId:1,columns:[{title:"名称",field:"instrumentName",align:"center"},{title:"数量",field:"count",align:"center",sortable:!0},{title:"操作",field:"handle",align:"center"}],data:e})}(),$(window).resize(function(){$("#washMainTable").bootstrapTable("resetView",{height:$(window).height()-i.height()-n.height()-l}),$(".fixed-table-pagination").css("top",$(".main").height())}),$(window).resize(function(){$("#addCleanUpdate-top-tools").bootstrapTable("resetView")}),r.click(function(){$("#washMainTable").bootstrapTable("resetView",{height:$(window).height()-i.height()-n.height()-l}),$(".washMain .fixed-table-pagination").css("top",$(".washMain").height()),console.log("wash aan:"+$(".mainNav").height())}),$(".addBad-bottom-handle-table .fixed-table-container").css("padding-bottom","40px")}),$(document).ready(function(){$(".mainTable .fixed-table-toolbar").append($(".mainNav-shop"))});
\ No newline at end of file