Index: ssts-web/src/main/webapp/disinfectsystem/touchScreen/recycle/expressRecycleForTouchScreen.jsp
===================================================================
diff -u -r27482 -r27485
--- ssts-web/src/main/webapp/disinfectsystem/touchScreen/recycle/expressRecycleForTouchScreen.jsp (.../expressRecycleForTouchScreen.jsp) (revision 27482)
+++ ssts-web/src/main/webapp/disinfectsystem/touchScreen/recycle/expressRecycleForTouchScreen.jsp (.../expressRecycleForTouchScreen.jsp) (revision 27485)
@@ -1249,25 +1249,26 @@
data : {params:"" + JSON.stringify(array[i]) + ""},
success : function(msg) {
var json = JSON.parse(msg);
- if(json.success){
- if(json.versionNotMatch){
- closeDiv();
- layer.open({
- type: 1,
- content: '' + json.message + '', //这里content是一个普通的String
- btn: ['关闭','关闭并刷新'],
- area: ['600px', '400px'],
- btnAlign: 'c',
- btn2:function(){
- refresh();
- }
- });
- }else{
- updateProgressBar((i+1));
- }
- }else {
+
+ if(!json.success){
alertDiv(json.msg);
}
+
+ if(json.versionNotMatch){
+ closeDiv();
+ layer.open({
+ type: 1,
+ content: '' + json.message + '', //这里content是一个普通的String
+ btn: ['关闭','关闭并刷新'],
+ area: ['600px', '400px'],
+ btnAlign: 'c',
+ btn2:function(){
+ refresh();
+ }
+ });
+ }else{
+ updateProgressBar((i+1));
+ }
},
error: function(x, t, m) {
if(t == "timeout") {
@@ -1285,7 +1286,6 @@
if(parseInt(val) < maxLen){
setTimeout("submintApplication(" + parseInt(val) + ")",50);
}else{
- closeDiv();
var selectDepartGroupId = $("#inputselect").val(); //科室分组过滤
var tousseGroupSelect = $('#tousseGroupSelect').val(); //器械包分组过滤
loadItem(tousseGroupSelect,selectDepartGroupId);