Index: ssts-web/src/main/webapp/disinfectsystem/basedatamanager/tousse/idCardInstanceView.js =================================================================== diff -u -r17396 -r27271 --- ssts-web/src/main/webapp/disinfectsystem/basedatamanager/tousse/idCardInstanceView.js (.../idCardInstanceView.js) (revision 17396) +++ ssts-web/src/main/webapp/disinfectsystem/basedatamanager/tousse/idCardInstanceView.js (.../idCardInstanceView.js) (revision 27271) @@ -50,7 +50,13 @@ * 显示申请单终止原因 */ function showSelectTousseDiscardCauseWin(){ - return openModalWindow(WWWROOT+"/disinfectsystem/recyclingApplication/selectTousseDiscardCause.jsp?time="+new Date(), "选择回收员", "760", "400"); + var params = { + time:new Date().getTime() + } + + var endCase = openModalWindowForExt(WWWROOT+"/disinfectsystem/recyclingApplication/selectTousseDiscardCause.jsp",params, "选择回收员", "760", "400"); + + return endCase; } function compareDate(DateOne,DateTwo) { @@ -157,18 +163,33 @@ selections.push(row.data.id); }); if(selections.length>0){ - var remark = showSelectTousseDiscardCauseWin(); - if(remark != undefined && remark != ""){ - var ids = selections.join(';'); - Ext.Ajax.request({ - url : WWWROOT + '/disinfectSystem/tousseInstanceAction!deleteTousseGood.do', - params : {ids : ids,reason:remark}, - success : function(response, options) { - showResult("废弃成功!"); - grid.dwrReload(); - }, - failure : function(response, options) {} - }); + var remark = showSelectTousseDiscardCauseWin(); + + if(remark == undefined){ + return ''; + }else { + var loop = setInterval(function() { + if(remark.hidden) { + clearInterval(loop); + + var returnValue = remark.returnValue || ''; + + if(returnValue == ''){ + return ''; + } + + var ids = selections.join(';'); + Ext.Ajax.request({ + url : WWWROOT + '/disinfectSystem/tousseInstanceAction!deleteTousseGood.do', + params : {ids : ids,reason:returnValue}, + success : function(response, options) { + showResult("废弃成功!"); + grid.dwrReload(); + }, + failure : function(response, options) {} + }); + } + },500); } } }