Index: ssts-web/src/main/webapp/disinfectsystem/washanddisinfectmanager/washanddisinfectrecord/washForTouchScreen.jsp
===================================================================
diff -u -r14770 -r14794
--- ssts-web/src/main/webapp/disinfectsystem/washanddisinfectmanager/washanddisinfectrecord/washForTouchScreen.jsp	(.../washForTouchScreen.jsp)	(revision 14770)
+++ ssts-web/src/main/webapp/disinfectsystem/washanddisinfectmanager/washanddisinfectrecord/washForTouchScreen.jsp	(.../washForTouchScreen.jsp)	(revision 14794)
@@ -45,8 +45,18 @@
     request.setAttribute("today", dateFormat.format(new Date()));
     request.setAttribute("orgUnitCoding",orgUnitCoding);
     request.setAttribute("orgUnitName",orgUnitName);
+    
+    //是否开启语音提示
+    boolean isNewMsgPromptSound = false;
+    if(loginUser != null){
+    	isNewMsgPromptSound = loginUser.isNewMsgPromptSound();
+    }
 %>
 
+<script type="text/javascript">
+speaker.enable(<%=isNewMsgPromptSound%>);
+</script>
+
 <script>
 var WWWROOT = '${ctx}';
 
@@ -64,19 +74,19 @@
 
 <!-- alertDIV -->
 <style>
-.lightbox{width:400px;background:#FFFFFF;border:5px solid #ccc;line-height:35px;display:none; margin:0;}
+.lightbox{width:1600px;background:#FFFFFF;border:5px solid #ccc;line-height:185px;display:none; margin:0;}
 .lightbox dt{background:#f4f4f4;padding:5px;}
 .lightbox dd{ padding:20px; margin:0;}
 </style>
 
 <dl id="idBox" class="lightbox" style="top:10%;left:5%;">
-    <dt><b style="font-size:20px">提示信息</b> </dt>
+    <dt><b style="font-size:100px">提示信息</b> </dt>
     <dd>
-        <span id="showWord" style="font-size:35px">条码长度不符合规范！</span>
+        <span id="showWord" style="font-size:135px">条码长度不符合规范！</span>
         <br>
         </br>
         <center id="idBoxCenterClose">
-            <input type="button" onclick="closeDiv();" style="width:100px;text-align:center;height:50px;font-size:18px;" value=" X " id="idBoxClose" />
+            <input type="button" onclick="closeDiv();" style="width:100px;text-align:center;height:100px;font-size:88px;" value=" X " id="idBoxClose" />
         </center>
     </dd>
 </dl>
@@ -113,15 +123,15 @@
             <table width="50%" border="0" cellspacing="0" cellpadding="0">
               <tr>
                 <td id="saveBtnTd"><input type="button" value="保存" class="btn-e" onclick="doSaveAction();"/></td>
-                <td><input type="button" value="取消" class="btn-d" onclick="cancel();"/></td>
+                <td><input type="button" value="清空" class="btn-d" onclick="cancel();"/></td>
               </tr>
             </table>
         </div>
     </div>
     <!--待装载篮筐 start-->
     <div class="zhuangzai-table">
         <div class="box">
-        	<ul id="scanContainerBarcodeTipUl"><li style="background: url(null) no-repeat top center;padding: 8px 0px 7px 0;font-size: 82px;color: #CDCDCD;line-height: 658px;text-align: center;">请扫描篮筐条码</li></ul>
+        	<ul id="scanContainerBarcodeTipUl"><li style="background: url(null) no-repeat top center;padding: 8px 0px 7px 0;font-size: 152px;color: #CDCDCD;line-height: 658px;text-align: center;">请扫描篮筐条码</li></ul>
             <ul id="basketsUl" class="list-item clearfix">
             </ul>
         </div>
Index: ssts-web/src/main/webapp/disinfectsystem/washanddisinfectmanager/washanddisinfectrecord/washForTouchScreen.js
===================================================================
diff -u -r14770 -r14794
--- ssts-web/src/main/webapp/disinfectsystem/washanddisinfectmanager/washanddisinfectrecord/washForTouchScreen.js	(.../washForTouchScreen.js)	(revision 14770)
+++ ssts-web/src/main/webapp/disinfectsystem/washanddisinfectmanager/washanddisinfectrecord/washForTouchScreen.js	(.../washForTouchScreen.js)	(revision 14794)
@@ -7,9 +7,24 @@
 //高亮层不锁定
 function lockout(e){ e.stopPropagation(); }
 
-function alertDiv(alertWord,hideCloseButton,showOtherButton){
+/**
+ * 弹出消息框
+ * @param alertWord 消息文本
+ * @param hideCloseButton 是否延时自动隐藏提示框
+ * @param showOtherButton
+ * @param successful 是否成功消息,如为true,则背景用绿色,否则用红色
+ */
+function alertDiv(alertWord,hideCloseButton,showOtherButton,successful){
     lock = true;
+    speaker.speak(alertWord);
     document.getElementById ("showWord").innerHTML = alertWord;
+    //事先将背景色置为白色
+    $('#showWord').css("background","white");
+    if(successful == true){
+    	$('#showWord').css("background","green");
+    }else if(successful == false){
+    	$('#showWord').css("background","red");
+    }
     if(typeof(hideCloseButton) != 'undefined' && hideCloseButton){
     	$('#idBoxClose').hide();
     }
@@ -168,11 +183,11 @@
          		$("#startDate").val(result.startDateTime);
          		$("#endDate").val(result.endDateTime);
          	}else{
-         		alertDiv(result.message);
+         		alertDiv(result.message,false,false,false);
          	}
          },
          error:function(msg){
-         	alertDiv("加载出错，请联系管理员！");
+         	alertDiv("加载出错，请联系管理员！",false,false,false);
          }
      });
 }
@@ -182,8 +197,10 @@
 	var codeStr = barcodeTemp.substring(barcodeTemp.length-7,barcodeTemp.length);
 	if(codeStr == saveBarcode){
     	doSaveAction();
+    	barcodeGloble = '';//保存后清除条码记忆的全局变量
     }else if(codeStr == cancelBarcode){
     	cancel();
+    	barcodeGloble = '';//清空后清除条码记忆的全局变量
     }else{
     	if(barcodeTemp.length >= 9){
             var barcode = barcodeTemp.substring(barcodeTemp.length-9,barcodeTemp.length);
@@ -205,7 +222,7 @@
                 				createBasketUiElement(basketBarcode,classifyBasketId,basketName,itemsInfo);
                 				$("#scanContainerBarcodeTipUl").hide();
                 			}else{
-                				alertDiv(basketName + ",已扫描！");
+                				alertDiv(basketName + ",已扫描！",false,false,false);
                 			}
                     	}else if(type == "rinser"){
                     		var name = result.data.name;
@@ -220,15 +237,15 @@
                     	}
                     	
                 	}else{
-                		alertDiv(result.error);
+                		alertDiv(result.error,false,false,false);
                 	}
                 },
                 error:function(msg){
-                	alertDiv("加载出错，请联系管理员！");
+                	alertDiv("加载出错，请联系管理员！",false,false,false);
                 }
             });
         }else{
-        	alertDiv('条码长度不符合规范。');
+        	alertDiv('条码长度不符合规范。',false,false,false);
         }
     }
 }
@@ -249,33 +266,33 @@
 function submitCheck(){
 	var disinfectIdentification = $("#disinfectIdentification").val();
 	if(disinfectIdentification == ""){
-		alertDiv("清洗机名称不能为空！");
+		alertDiv("清洗机名称不能为空！",false,false,false);
 		return false;
 	}
 	var disinfectProgram = $("#disinfectProgram").val();
 	if(disinfectProgram == ""){
-		alertDiv("清洗程序不能为空！");
+		alertDiv("清洗程序不能为空！",false,false,false);
 		return false;
 	}
 	var startDate = $("#startDate").val();
 	if(startDate == ""){
-		alertDiv("清洗开始时间不能为空！");
+		alertDiv("清洗开始时间不能为空！",false,false,false);
 		return false;
 	}
 	var endDate = $("#endDate").val();
 	if(endDate == ""){
-		alertDiv("清洗结束时间不能为空！");
+		alertDiv("清洗结束时间不能为空！",false,false,false);
 		return false;
 	}
 	if($('#basketsUl').children().length == 0){
-		alertDiv("无篮筐清洗，不能保存！");
+		alertDiv("无篮筐清洗，不能保存！",false,false,false);
 		return false;
 	}
 	
 	if(!personInChargeAllowBlank){
 		var personInCharge = $("#personInCharge").val();
 		if(personInCharge == ""){
-			alertDiv("清洗责任人不能为空！");
+			alertDiv("清洗责任人不能为空！",false,false,false);
 			return false;
 		}
 	}
@@ -308,7 +325,7 @@
 
 function doSaveAction(){
 	if(submitCheck()){
-		alertDiv("保存中,请稍候......", true);
+		alertDiv("保存中,请稍候......", true,false,true);
 		
 		var classifyBasketInfo = getClassifyBasketInfo();
 		var disinfectIdentification = $("#disinfectIdentification").val();
@@ -334,15 +351,15 @@
 	        success : function(result) {
 	        	if(result.success){
 	        		cleanPage();
-	        		alertDiv(result.message, true);
+	        		alertDiv(result.message, true,false,true);
 	        		setTimeout("closeDiv()",1200);
 	        	}else{
-	        		alertDiv(result.message);
+	        		alertDiv(result.message,false,false,false);
 	        	}
 	        },
 	        error: function(x, t, m) {
 	            if(t == "timeout") {
-	            	alertDiv("提交超时，请重试");
+	            	alertDiv("提交超时，请重试",false,false,false);
 	            } else {
 	                alert(t);
 	            }