Index: ssts-web/src/main/webapp/disinfectsystem/touchScreen/recycle/setTousseUrgentAmount.jsp =================================================================== diff -u -r26370 -r26421 --- ssts-web/src/main/webapp/disinfectsystem/touchScreen/recycle/setTousseUrgentAmount.jsp (.../setTousseUrgentAmount.jsp) (revision 26370) +++ ssts-web/src/main/webapp/disinfectsystem/touchScreen/recycle/setTousseUrgentAmount.jsp (.../setTousseUrgentAmount.jsp) (revision 26421) @@ -55,7 +55,7 @@ var ulObj = getUrgentLevel(urgentLevel); if(sstsConfig.enableUrgentFunction){ if(ulObj){ - if(ulObj.urgent == '是'){ + //if(ulObj.urgent == '是'){ if(urgentAmount <= 0){ /* layer.alert(ulObj.name + '需要加急数量大于0',{ time: 2000 //2秒关闭(如果不配置,默认是3秒) @@ -65,23 +65,24 @@ }); return; } - }else{ - if(urgentAmount > 0){ + //}else{ + /* if(urgentAmount > 0){ layer.alert(ulObj.name + '需要加急数量为0',{ time: 2000 //2秒关闭(如果不配置,默认是3秒) }); return; + } */ + //} + if(urgentLevelSelectVal == "" || urgentLevelSelectVal == undefined || urgentLevelSelectVal == null){ + if(urgentAmount > 0){ + layer.alert('加急数量已经选择,请选择加急级别',{ + time: 2000 //2秒关闭(如果不配置,默认是3秒) + }); + return; } } } - if(urgentLevelSelectVal == "" || urgentLevelSelectVal == undefined || urgentLevelSelectVal == null){ - if(urgentAmount > 0){ - layer.alert('加急数量已经选择,请选择加急级别',{ - time: 2000 //2秒关闭(如果不配置,默认是3秒) - }); - return; - } - } + } window.parent.updateUrgentAmount(row,urgentAmount,urgentLevel); closeLayer();