Index: ssts-web/src/main/webapp/dx-disinfectsystem/js/washingApplication/inputPrint.js
===================================================================
diff -u -r24519 -r24543
--- ssts-web/src/main/webapp/dx-disinfectsystem/js/washingApplication/inputPrint.js	(.../inputPrint.js)	(revision 24519)
+++ ssts-web/src/main/webapp/dx-disinfectsystem/js/washingApplication/inputPrint.js	(.../inputPrint.js)	(revision 24543)
@@ -12,7 +12,7 @@
 	{
 		if(obhi[i].barcode==obid)
 		{
- 			console.log("aaaaa");
+ 			//console.log("aaaaa");
 		}
 		else
 		{
@@ -101,7 +101,7 @@
 				showRefresh: false,                  //是否显示刷新按钮
 				minimumCountColumns: 2,             //最少允许的列数
 				clickToSelect: true,                //是否启用点击选中行
-				// height: 185,                                //行高，如果没有设置height属性，表格自动根据记录条数觉得表格高度
+				height: 185,                                //行高，如果没有设置height属性，表格自动根据记录条数觉得表格高度
 				//uniqueId: "id",                     //每一行的唯一标识，一般为主键列
 				// showToggle:true,                    //是否显示详细视图和列表视图的切换按钮
 				cardView: false,                    //是否显示详细视图
@@ -156,35 +156,46 @@
 	
 $(function(){	
 	uBaskets();
-	//报损下拉框
-	var dataList = [
-	{ id: 0, text: 'ljiong.com(老囧博客)' },
-	{ id: 1, text: 'Ants(蚂蚁)' },
-	{ id: 2, text: 'can you speak javascript(你能讲JavaScript嘛)' },
-	{ id: 3, text: 'vae(许嵩)' },
-	{ id: 4, text: 'Badminton(羽毛球)' }
-	];
-	$("#instrumentName").select2({
-// 		data: dataList,
-// 		placeholder:'请选择',//默认文字提示
-// 		language: "zh-CN",//汉化
-// 		allowClear: true//允许清空
-			 ajax: {
-					url: 'http://rap2api.taobao.org/app/mock/85153/disinfectSystem/baseData/materialDefinitionController/getMaterialDefinitionDataForDamage.mhtml',
-					data: function (params) {
-						var query = {
-							search: params._root_.displayName,
-							page: params.page || 1
-						}
 
-						// Query parameters will be ?search=[term]&page=[page]
-						return query;
+//添加报损的材料输入框
+		$("#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:2000,
+					data: function(params){
+							return {    //JSON.stringify()
+								spell:params.term,//search
+								title:params.term,
+								limit:100,
+								page: params.page||1,
+								offset: (params.page||1)*100
+							};
+					},
+					processResults: function(data,params){
+							data = JSON.parse(data);
+							var res=[];
+							for(var i=0; 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();
@@ -208,7 +219,7 @@
 					$(".main").append(eTC);	
 				});
 		}
-		//添加清洗扫描
+		//添加清洗的条码扫描
 		var abArr = new Array();
     $('#addCleanGetCode1').bind('keyup', function(event) {
 				var  hiddenss =$(this).val();
@@ -255,11 +266,12 @@
 										dataType:"json",
 										data: codeData,
 										success: function(data){
+											
 											var bei = data;
 											if(data.success===true){
 														if($('#hiddenss').val()=='')
 														{
-																	console.log("初始化数组："+JSON.stringify($('#hiddenss').val()));
+																	//console.log("初始化数组："+JSON.stringify($('#hiddenss').val()));
 																	var nnArr = {name:data.name,barcode:data.barcode,amount:data.amount,classifyBasketId:data.classifyBasketId,personInCharge:"admin",personInChargeCode:"1212"}; 
 																	$('#Baskets').bootstrapTable('append',nnArr);
 																	var sarr = [{"name":data.name,"barcode":data.barcode,"amount":data.amount,"classifyBasketID":data.classifyBasketId,"personInCharge":"admin","personInChargeCode":"1212"}];
@@ -269,7 +281,6 @@
 														{
 																	var bArr = JSON.parse($('#hiddenss').val());
 																	var bArrif = 0;
-																	//条码的判断尚未添加
 																	var karr =[{"name":data.name,"barcode":data.barcode,"amount":data.amount,"classifyBasketID":data.classifyBasketId,"personInCharge":"admin","personInChargeCode":"1212"}];
 																	var bArr = JSON.parse($('#hiddenss').val())
 																	bArr.push(karr[0]);
@@ -280,6 +291,7 @@
 											else{
 												window.alert("没有该篮筐");
 											}
+											
 										}
 								})
 				}
@@ -292,29 +304,8 @@
 			console.log("ru:"+aN+";"+aC);
 			
 		});
-		
-		
-
-		//提交添加清洗
-		/* 必填
-		cycleCounter 						循环次数
-		disinfectIdentification 清洗机名称
-		disinfectProgram 				清洗程序名称
-		endDateStr 							结束时间
-		operator 								操作员
-		startDateStr 						开始时间
-		*/
-// 		var addData = {  
-// 								cycleCounter 						: 0,
-// 								disinfectIdentification :$("#addCleanDisinfectIdentification").val(),
-// 								disinfectProgram 				:$("#addCleanDisinfectProgram").val(),
-// 								endDateStr 							:$("#addCleanOrgWashEndTime").val(),
-// 								operator 								:$("#addCleanOperator").val(),
-// 								startDateStr 						:$("#addCleanStartDateStr").val(),
-// 								serialNumber						: "",
-// 								classifyBasketInfo			:$('#hiddenss').val()
-// 				};
-// 		
+	
+//添加清洗的提交保存		
 		$("#addCleanRefer").click(function(){
 				if($("#addCleanDisinfectIdentification").val()==""||$("#addCleanDisinfectProgram").val()==""||$("#addCleanOrgWashEndTime").val()==""||$("#addCleanOperator").val()==""||$("#addCleanStartDateStr").val()=="")
 				{
@@ -337,7 +328,17 @@
 							classifyBasketInfo			:$('#hiddenss').val()
 						},
 						success:function(result){ 
-							console.log(result.message);
+							//console.log(result.message);
+							//保存成功后清理模态框以及隐藏域里面的数据
+							$('#hiddenss').val("");
+							$("#addCleanGetCode1").val("");
+							$("#addCleanStartDateStr").val("");
+							$("#addCleanOrgWashEndTime").val("");
+							uBaskets([]);
+							
+							window.alert(result.message);
+							 $("#addModal").modal('hide');
+						  //	$("#addModal").css("display","none");
 						},
 						error:function(result){ 
 							console.log(result.message);
@@ -379,21 +380,7 @@
 				}
 				
 		});			
-		//添加报损 材料名称 下拉列表
-		$("#instrumentName").select({
-				  ajax:{
-						url: function(params){ return "/disinfectSystem/baseData/materialDefinitionController/getMaterialDefinitionDataForDamage.mhtml"},
-						dataType: 'json',
-						type: 'get',
-						delay: 250,//在多少毫秒内没有输入时则开始请求服务器
-						data: function (params) {
-								return {
-                        q: params.term, // 搜索参数
-                        page: params.page
-                    };
-						}
-					},
-		});
+
 		//删除
 		$("#deleteHandle").click(function(){
 					var a= $("#allApplication_table").bootstrapTable('getSelections');
@@ -409,52 +396,30 @@
 		//
 })
 
-//
-//  var oneReq = [];
-//  var dataList=[];
-//  var ddt=[];
-//  $.ajax({
-//      type:"get",
-//      url:"http://rap2api.taobao.org/app/mock/85153/disinfectSystem/baseData/materialDefinitionController/getMaterialDefinitionDataForDamage.mhtml",
-//      dataType:"json",
-//      contentType:"application/json",
-//      success:function(data){
-//          oneReq = data._root_;
-// 				 console.log("id:"+oneReq[0].id);
-// 				 console.log("Name:"+oneReq[0].displayName);
-// 				 dataList=[{id: 0, text: oneReq[0].displayName}];
-// 				 $("#cleanMachineName1").select2({
-// 				 		data: dataList,
-// 				 		placeholder:'请选择',//默认文字提示
-// 				 		language: "zh-CN",//汉化
-// 				 		allowClear: true//允许清空
-// 				 });
-// 				 
-//      },
-//      error:function(data){
-//  
-//      }
-//  });
-//  console.log("waidata:"+oneReq);
 
-
-
-// 						$.ajax({
-// 								url: ajaxIP+"/WashingApplication/php/readyBasket.php?ruId="+$('#addCleanGetCode1').val(), 
-// 								type:'get',
-// 								dataType: "json",
-// 								//data:data,
-// 								success: function(){
-// 										console.log("ja:"+$('#addCleanGetCode1').val());
-// 										$("#readyBaskets").bootstrapTable("refresh");
-// 										$("#Baskets").bootstrapTable("refresh");
-// //											console.log("data:"+data);
-// 								}
-// 						});
 	
 
+		//提交添加清洗
+		/* 必填
+		cycleCounter 						循环次数
+		disinfectIdentification 清洗机名称
+		disinfectProgram 				清洗程序名称
+		endDateStr 							结束时间
+		operator 								操作员
+		startDateStr 						开始时间
+		*/
+// 		var addData = {  
+// 								cycleCounter 						: 0,
+// 								disinfectIdentification :$("#addCleanDisinfectIdentification").val(),
+// 								disinfectProgram 				:$("#addCleanDisinfectProgram").val(),
+// 								endDateStr 							:$("#addCleanOrgWashEndTime").val(),
+// 								operator 								:$("#addCleanOperator").val(),
+// 								startDateStr 						:$("#addCleanStartDateStr").val(),
+// 								serialNumber						: "",
+// 								classifyBasketInfo			:$('#hiddenss').val()
+// 				};
+// 
 
-
 	  
 
 
Index: ssts-web/src/main/webapp/dx-disinfectsystem/js/washingApplication/washingApplication.js
===================================================================
diff -u -r24522 -r24543
--- ssts-web/src/main/webapp/dx-disinfectsystem/js/washingApplication/washingApplication.js	(.../washingApplication.js)	(revision 24522)
+++ ssts-web/src/main/webapp/dx-disinfectsystem/js/washingApplication/washingApplication.js	(.../washingApplication.js)	(revision 24543)
@@ -8,24 +8,26 @@
 		
 		var jindu = "aasdas";
 		var caozuo = "adsf";
-
+		
+		//添加 待清洗篮筐的调用
+		addCleanBaskets("","#readyBaskets");
 		// 主表
 			
 		var mainTableData =new Array();
 		var columnArray = [
 							{
-									checkbox:true,
-									visible:true 
+								checkbox : true,
+								visible : true 
 							},
 							{
-									 title : '流水号',
-									 field : 'serialNumber',
-									 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>';
- 															},
-								}, 
+								title : '流水号',
+								field : 'serialNumber',
+								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>';
+													},
+							}, 
 							{
 								title : '操作员',
 								field : 'operator',
@@ -70,7 +72,6 @@
 													ws += "</div></div>";
 											 return  ws;
 										}
-		
 								},
 							}, 
 							{
@@ -79,27 +80,25 @@
 								align : 'center',
 								sortable: true
 							},
-								{
-									title : '结束时间',
-									field : 'endDateStr',
-									align : 'center',
-									sortable: true
+							{
+								title : '结束时间',
+								field : 'endDateStr',
+								align : 'center',
+								sortable: true
 							},
+							{
+								title : '操作',
+								field : 'cycleCounter',
+								align : 'center',
+								formatter: function(value,row,index)
 								{
-									title : '操作',
-									field : 'cycleCounter',
-									align : 'center',
-									//<a><span class='glyphicon glyphicon-asterisk'></span></a>onclick="ClickName('+row.id+')"
-									formatter: function(value,row,index)
-									{
-										//return "";
-											return "<a data-toggle='modal' data-target='#updateModal' onclick='ClickName("+row.id+")'><span class='glyphicon glyphicon-asterisk' ></span></a>";
-									},
+										return "<a data-toggle='modal' data-target='#updateModal' onclick='ClickName("+row.id+")'><span class='glyphicon glyphicon-asterisk' ></span></a>";
+							},
 							}, 
 							{
-									title : '清洗参数',
-									field : 'washDataAmount',
-									align : 'center'
+								title : '清洗参数',
+								field : 'washDataAmount',
+								align : 'center'
 							},
 							{
 								title : '清洗总数',
@@ -214,8 +213,8 @@
 
 
 				};
-				console.log("pageSize:"+temp.pageSize);
-				console.log("pageNumber:"+temp.pageNumber);
+				//console.log("pageSize:"+temp.pageSize);
+				//console.log("pageNumber:"+temp.pageNumber);
 				return {gridParams:JSON.stringify(temp)};
 				 
 		} 
@@ -228,38 +227,37 @@
 		{
 		var instrumentInfoTableData =new Array();
 				var instrumentInfoTableHeaderColumns = [ 
-					 {
+						{
 							title : '材料名称',
 							field : 'packageName',
 							align : 'center',
-							 
-					 },
-					 {
+						},
+						{
 							title : '数量名称',
 							field : 'materialName',
 							align : 'center',
 							sortable: true
-					 },
-					 {
+						},
+						{
 							title : '是否可拆',
 							field : 'badCount',
 							align : 'center', 
-					 }, 
-					 {
-						title : '清洗方式',
+						}, 
+						{
+							title : '清洗方式',
 							field : 'supplementMan',
 							align : 'center', 
-					 },
-					 {
-						title : '清洗质量检查关注点',
+						},
+						{
+							title : '清洗质量检查关注点',
 							field : 'supplementCount',
 							align : 'center', 
-					 },
-					 {
-						title : '功能检查',
+						},
+						{
+							title : '功能检查',
 							field : 'supplementTime',
 							align : 'center', 
-					 } 
+						} 
 					 
 				 ];
 				 for(var i=0; i<=100;i++)
@@ -316,7 +314,6 @@
 			    title : '名称',
 			    field : 'instrumentName',
 			    align : 'center',
-			     
 			 },
 			 {
 			    title : '数量',
@@ -328,7 +325,6 @@
 			    title : '操作',
 			    field : 'handle',
 			    align : 'center',
-			    
 			 } 
 			 
 		 ];
@@ -379,42 +375,42 @@
 		//器械报损明细
 		var instrumentDamageReportTableData =new Array();
 		var instrumentDamageReportTableHeaderColumns = [ 
-			 {
-			    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', 
-			 },{
-			 	title : '删除',
-			    field : 'deleteHadle',
-			    align : 'center', 
-			 }
+					{
+						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', 
+					},
+					{
+						title : '删除',
+						field : 'deleteHadle',
+						align : 'center', 
+					}
 			 
 		 ];
 		 for(var i=0; i<=100;i++)
@@ -482,59 +478,59 @@
 // 						responseHandler: function(res){
 // 							return res.attributes.data;
 // 						},
-            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)
-            }
+					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');