Index: ssts-web/src/main/webapp/disinfectsystem/touchScreen/recycle/recyclingErrors.jsp =================================================================== diff -u -r30104 -r30315 --- ssts-web/src/main/webapp/disinfectsystem/touchScreen/recycle/recyclingErrors.jsp (.../recyclingErrors.jsp) (revision 30104) +++ ssts-web/src/main/webapp/disinfectsystem/touchScreen/recycle/recyclingErrors.jsp (.../recyclingErrors.jsp) (revision 30315) @@ -488,8 +488,8 @@ optionType:'error' } - var endCase = openModalWindowForExt(WWWROOT+"/disinfectsystem/recyclingApplication/selectEndCause.jsp",params, "选择报损备注", "760", "400"); - + var endCase = openModalWindow(WWWROOT+"/disinfectsystem/recyclingApplication/selectEndCause.jsp",params, "选择报损备注", "760", "400"); + if(endCase == undefined){ return; }else { @@ -502,11 +502,11 @@ if(returnValue == ''){ return; } - + if(!isUndefinedOrNullOrEmpty(returnValue)){ - $(this).val(returnValue); + $('#errorRemark').val(returnValue); }else if(returnValue == ""){ - $(this).val(""); + $('#errorRemark').val(""); } } },500); Index: ssts-web/src/main/webapp/disinfectsystem/recyclingApplication/selectEndCause.jsp =================================================================== diff -u -r29513 -r30315 --- ssts-web/src/main/webapp/disinfectsystem/recyclingApplication/selectEndCause.jsp (.../selectEndCause.jsp) (revision 29513) +++ ssts-web/src/main/webapp/disinfectsystem/recyclingApplication/selectEndCause.jsp (.../selectEndCause.jsp) (revision 30315) @@ -62,9 +62,15 @@ alert("请选择" + optionTip); return false; } - var win = parent.Ext.getCmp('extWindow'); - win.returnValue = returnVal; - win.close(); + if(parent.Ext){ + var win = parent.Ext.getCmp('extWindow'); + win.returnValue = returnVal; + win.close(); + }else { + self.returnValue = returnVal; + self.hidden = true; + self.close(); + } }); $("#tem").on("keyup",function(){ if($("#tem").val().length >= 2000){ @@ -77,9 +83,15 @@ if($("#tem").val() != ""){ $("#tem").text(""); } - var win = parent.Ext.getCmp('extWindow'); - win.returnValue = returnVal; - win.close(); + if(parent.Ext){ + var win = parent.Ext.getCmp('extWindow'); + win.returnValue = returnVal; + win.close(); + }else { + self.returnValue = ''; + self.hidden = true; + self.close(); + } }); }); Index: ssts-web/src/main/webapp/disinfectsystem/touchScreen/recycle/recyclingDamage.jsp =================================================================== diff -u -r30104 -r30315 --- ssts-web/src/main/webapp/disinfectsystem/touchScreen/recycle/recyclingDamage.jsp (.../recyclingDamage.jsp) (revision 30104) +++ ssts-web/src/main/webapp/disinfectsystem/touchScreen/recycle/recyclingDamage.jsp (.../recyclingDamage.jsp) (revision 30315) @@ -409,28 +409,28 @@ optionType:'damage' } - var endCase = openModalWindowForExt(WWWROOT+"/disinfectsystem/recyclingApplication/selectEndCause.jsp",params, "选择报损备注", "760", "400"); + var endCase = openModalWindow(WWWROOT+"/disinfectsystem/recyclingApplication/selectEndCause.jsp",params, "选择报损备注", "760", "400"); if(endCase == undefined){ return; }else { var loop = setInterval(function() { - if(endCase.hidden) { - clearInterval(loop); + if(endCase.hidden) { + clearInterval(loop); var returnValue = endCase.returnValue || ''; if(returnValue == ''){ return; } - - if(!isUndefinedOrNullOrEmpty(returnValue)){ - $(this).val(returnValue); - }else if(returnValue == ""){ - $(this).val(""); + + if(!isUndefinedOrNullOrEmpty(returnValue)){ + $('#damageRemark').val(returnValue); + }else if(returnValue == ""){ + $('#damageRemark').val(""); } - } - },500); + } + },500); } } });