Index: ssts-web/src/main/webapp/dx-disinfectsystem/js/washingApplication/inputPrint.js
===================================================================
diff -u -r24549 -r24554
--- ssts-web/src/main/webapp/dx-disinfectsystem/js/washingApplication/inputPrint.js	(.../inputPrint.js)	(revision 24549)
+++ ssts-web/src/main/webapp/dx-disinfectsystem/js/washingApplication/inputPrint.js	(.../inputPrint.js)	(revision 24554)
@@ -12,7 +12,6 @@
 	{
 		if(obhi[i].barcode==obid)
 		{
- 			//console.log("aaaaa");
 		}
 		else
 		{
@@ -22,10 +21,20 @@
 	$('#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([]);
+})
 
 
-	var arrData = new Array();
 
+	var arrData = new Array();
 	//添加  清洗篮筐
 	var oTableInit = new Object();
 	var oInit = new Object();
@@ -194,7 +203,6 @@
 							}
 					}
 					
-					
 				},
 		})
 
@@ -211,35 +219,35 @@
 		
 		// 添加清洗扫码
 		var ajaxIP = "http://localhost:8088";
+		
+		//警告框
 		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);	
+						$(".alert").alert('close');
+						$(".main").append(eTC);	
 				});
 		}
 		//添加清洗的条码扫描
 		var abArr = new Array();
     $('#addCleanGetCode1').bind('keyup', function(event) {
 				var  hiddenss =$(this).val();
-				
-				
-				if($(this).val()==''){
-					alert('请输入条码');
-					return false;
-				}
-				if($('#hiddenss').val()===hiddenss){
-					alert('不能输入同样的条码');
-					return ;
-				}
 				if(event.keyCode == "13"){
 								var ruid = $('#addCleanGetCode1').val();
 								var codeData = {barcode:ruid};
-								//var hival;
+								
+								//判断是否输入条码
+								if($("#addCleanGetCode1").val()=="")
+								{
+									window.alert("请输入条码");
+									return 0;
+								}
+								
 								//判断是否重复条码
 								if(!$('#hiddenss').val())
 								{
@@ -272,23 +280,29 @@
 											
 											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()=='')
-														{
-																	//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"}];
-																	$('#hiddenss').val(JSON.stringify(sarr));
+														{ 
+																$('#Baskets').bootstrapTable('append',nnArr);
+															
+																$('#hiddenss').val(JSON.stringify(nnArr));
 														}
 														else
 														{
-																	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]);
-																	$('#hiddenss').val(JSON.stringify(bArr));
-																	uBaskets(JSON.parse($('#hiddenss').val()));
+																
+																var bArrif = 0;
+																var bArr = JSON.parse($('#hiddenss').val())
+																bArr.push(nnArr[0]);
+																$('#hiddenss').val(JSON.stringify(bArr));
+																uBaskets(JSON.parse($('#hiddenss').val()));
 														}
 											} 
 											else{
@@ -310,44 +324,71 @@
 	
 //添加清洗的提交保存		
 		$("#addCleanRefer").click(function(){
-				if($("#addCleanDisinfectIdentification").val()==""||$("#addCleanDisinfectProgram").val()==""||$("#addCleanOrgWashEndTime").val()==""||$("#addCleanOperator").val()==""||$("#addCleanStartDateStr").val()=="")
+			  var ifajax = 11;
+				if($("#addCleanDisinfectIdentification").val()=="")
 				{
-					window.alert('不能为空');
+					window.alert('清洗机名称不能为空');
+					ifajax = 12;
 				}
-				else
+				if($("#addCleanDisinfectProgram").val()=="")
 				{
-					$.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){ 
-							//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);
-						},
-					});
+					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');
+					},
+					error:function(result){ 
+						console.log(result.message);
+					},
+				});
+		 
 				
 		});
 		
@@ -400,30 +441,4 @@
 })
 
 
-	
 
-		//提交添加清洗
-		/* 必填
-		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()
-// 				};
-// 
-
-	  
-
-
-