Index: ssts-web/src/main/webapp/disinfectsystem/touchScreen/recycle/expressRecycleForTouchScreen.jsp
===================================================================
diff -u -r23244 -r23251
--- ssts-web/src/main/webapp/disinfectsystem/touchScreen/recycle/expressRecycleForTouchScreen.jsp	(.../expressRecycleForTouchScreen.jsp)	(revision 23244)
+++ ssts-web/src/main/webapp/disinfectsystem/touchScreen/recycle/expressRecycleForTouchScreen.jsp	(.../expressRecycleForTouchScreen.jsp)	(revision 23251)
@@ -24,7 +24,7 @@
 <script src="alertDiv/AlertBox.js"></script>
 <script type="text/javascript" src="js/jquery-min.js"></script>
 <script type="text/javascript" src="js/message-box.js"></script>
-<script type="text/javascript" src="layer/layer.min.js"></script>
+<script type="text/javascript" src="layer-v3.0.3/layer/layer.js"></script>
 <script type="text/javascript" src="${ctx}/jquery/jquery-ui-1.10.2/js/jquery-ui-1.10.2.custom.js"></script>
 <script type="text/javascript" src="${ctx}/dwr/interface/TousseDefinitionTableManager.js"></script>
 <script type="text/javascript" src="${ctx}/dwr/interface/RecyclingApplicationTableManager.js"></script>
@@ -118,7 +118,6 @@
         <br/>
         <center>
             <input type="button" onclick="closeDiv();" style="width:100px;text-align:center;height:50px;font-size:18px;" value=" X " id="idBoxClose" />
-            <input id="idRefreshButton" type="button" onclick="closeDiv();refresh();" style="width:100px;text-align:center;height:50px;font-size:18px;" value="关闭并刷新"/>
         </center>
     </dd>
 </dl>
@@ -197,6 +196,11 @@
 </div>
 
  <script>
+ layer.config({
+		extend: 'myskin/style.css', //加载您的扩展样式
+	  	skin: 'layer-ext-myskin'
+	});
+ 
  var progressbar = null;
  var progressLabel= null;
 $(function() {
@@ -227,7 +231,7 @@
 //高亮层不锁定
 function lockout(e){ e.stopPropagation(); }
 
-function alertDiv(alertWord, hideCloseButton,showRefreshButton){
+function alertDiv(alertWord, hideCloseButton){
     lock = true;
     document.getElementById ("showWord").innerHTML = alertWord;
     if(typeof(hideCloseButton) != 'undefined' && hideCloseButton){
@@ -238,14 +242,6 @@
     	$('#idBoxClose').show();
     	$("#progressbar").hide();
     }
-    if(showRefreshButton){
-    	$('#idRefreshButton').show();
-    	//显示刷新按钮就不要滚动条了
-    	$("#progressbar").hide();
-    }else{
-    	//滚动条由上面逻辑去显示或者隐藏
-    	$('#idRefreshButton').hide();
-    }
     ab = new AlertBox("idBox");
     ab.onShow = function(){
         if ( lock ) {
@@ -827,21 +823,28 @@
     
 }
 
+var layerIndex;
+function closeLayer(){
+	layer.close(layerIndex);
+	layerIndex = null;
+}
+
 var openElement;
 function openUpdateAmount(obj,row){
 	obj.blur();
 	var width = 750;
     var height = 400;
     openElement = obj;
-    $.layer({
-         type : 2,
-         title : ['修改数量',true],
-         iframe : {src : 'updateAmount.jsp?resolution=1980&row='+row},
-         area : [width + 'px' , height + 'px'],
-         border : [5, 0.3, '#fff', true],
-         closeBtn : [2 , true],
-         offset : ['250px','']
-    });
+    layerIndex=layer.open({
+        type : 2,
+        title : ['修改数量',true],
+        content : 'updateAmount.jsp?resolution=1980&row='+row,
+        area : [width + 'px' , height + 'px'],
+        border : [5, 0.3, '#fff', true],
+        closeBtn : [2 , true],
+        offset : ['250px','']
+   });
+    
 }
 
 function addToussItem(row,tousseItemId,tousseName,applicationAmount,recycleAmount,loadedAmount,isApplyEntireTousse,isCleanedEntirely,
@@ -1101,7 +1104,17 @@
         success : function(msg) {
         	var json = JSON.parse(msg);
         	if(json.versionNotMatch){
-        		alertDiv(json.message,false,true);
+        		closeDiv();
+        		layer.open({
+  				  type: 1, 
+  				  content: '<span style="font-size:35px">' + json.message + '</span>', //这里content是一个普通的String
+  				  btn: ['<span style="font-size:18px">关闭</span>','<span style="font-size:18px">关闭并刷新</span>'],
+  				  area: ['600px', '400px'],
+  				  btnAlign: 'c',
+  				  btn2:function(){
+  					  refresh();
+  				  }
+  				});
         	}else{
         		updateProgressBar((i+1));
         	}
Index: ssts-web/src/main/webapp/disinfectsystem/touchScreen/recycle/recycleForTouchScreen.jsp
===================================================================
diff -u -r23244 -r23251
--- ssts-web/src/main/webapp/disinfectsystem/touchScreen/recycle/recycleForTouchScreen.jsp	(.../recycleForTouchScreen.jsp)	(revision 23244)
+++ ssts-web/src/main/webapp/disinfectsystem/touchScreen/recycle/recycleForTouchScreen.jsp	(.../recycleForTouchScreen.jsp)	(revision 23251)
@@ -203,7 +203,6 @@
         <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 id="idRefreshButton" type="button" onclick="closeDiv();refresh();" style="width:100px;text-align:center;height:50px;font-size:18px;" value="关闭并刷新"/>
         </center>
         <center id="idBoxCenterUserType" style="display:none;">
             <input type="button" onclick="selectRecyclingUser();closeDiv();" style="width:100px;text-align:center;height:50px;font-size:18px;" value="回收人员" />
Index: ssts-web/src/main/webapp/disinfectsystem/touchScreen/recycle/recycleForTouchScreen.js
===================================================================
diff -u -r23244 -r23251
--- ssts-web/src/main/webapp/disinfectsystem/touchScreen/recycle/recycleForTouchScreen.js	(.../recycleForTouchScreen.js)	(revision 23244)
+++ ssts-web/src/main/webapp/disinfectsystem/touchScreen/recycle/recycleForTouchScreen.js	(.../recycleForTouchScreen.js)	(revision 23251)
@@ -77,7 +77,7 @@
 //高亮层不锁定
 function lockout(e){ e.stopPropagation(); }
 
-function alertDiv(alertWord,hideCloseButton,showOtherButton,showRefreshButton){
+function alertDiv(alertWord,hideCloseButton,showOtherButton){
     lock = true;
     document.getElementById ("showWord").innerHTML = alertWord;
     if(typeof(hideCloseButton) != 'undefined' && hideCloseButton){
@@ -90,11 +90,6 @@
     }else{
     	$('#idBoxCenterUserType').hide();
     }
-    if(showRefreshButton){
-    	$('#idRefreshButton').show();
-    }else{
-    	$('#idRefreshButton').hide();
-    }
     ab = new AlertBox("idBox");
     ab.onShow = function(){
         if ( lock ) {
@@ -2808,7 +2803,17 @@
         		}
         	}else{
         		if(result.versionNotMatch){
-        			alertDiv(result.message,false,false,true);
+        			closeDiv();
+        			layer.open({
+        				  type: 1, 
+        				  content: '<span style="font-size:35px">' + result.message + '</span>', //这里content是一个普通的String
+        				  btn: ['<span style="font-size:18px">关闭</span>','<span style="font-size:18px">关闭并刷新</span>'],
+        				  area: ['600px', '400px'],
+        				  btnAlign: 'c',
+        				  btn2:function(){
+        					  refresh();
+        				  }
+        				});
         		}else{
         			alertDiv(result.message);
         		}