Index: ssts-web/src/main/webapp/disinfectsystem/common/terminateInvoicePlan.js =================================================================== diff -u -r27259 -r27263 --- ssts-web/src/main/webapp/disinfectsystem/common/terminateInvoicePlan.js (.../terminateInvoicePlan.js) (revision 27259) +++ ssts-web/src/main/webapp/disinfectsystem/common/terminateInvoicePlan.js (.../terminateInvoicePlan.js) (revision 27263) @@ -52,43 +52,16 @@ return false; } } - var params = { - time:new Date() - } - var endCase = openModalWindow(WWWROOT+"/disinfectsystem/recyclingApplication/selectEndCause.jsp", params, "760", "400"); + var endCase = openModalWindowForExt(WWWROOT+"/disinfectsystem/recyclingApplication/selectEndCause.jsp", '','请选择终止原因', "760", "400"); if(endCase == undefined){ return; - }else if(typeof endCase == 'string'){ - Ext.Ajax.request({ - url: WWWROOT + url, - params: { recyclingAppId : id ,endCause:endCase}, - success: function(response, options){ - var result = JSON.parse(response.responseText); - if(isUndefinedOrNull(result)){ - showResult("系统异常,请联系管理员!"); - }else{ - if(result.success){ - showResult("终止成功!"); - }else{ - showResult(result.errMsg); - } - } - if(refreshCallback){ - refreshCallback(); - }else{ - grid.dwrReload(); - } - }, - failure: function(response, options) { - showResult("终止失败,请联系管理员!"); - } - }); }else { var loop = setInterval(function() { - if(endCase.closed) { + if(endCase.hidden) { clearInterval(loop); + var returnValue = endCase.returnValue || ''; if(returnValue == ''){ @@ -120,7 +93,7 @@ } }); } - }); + },500); } }