Index: ssts-web/src/main/webapp/js/common.js =================================================================== diff -u -r27618 -r27686 --- ssts-web/src/main/webapp/js/common.js (.../common.js) (revision 27618) +++ ssts-web/src/main/webapp/js/common.js (.../common.js) (revision 27686) @@ -389,8 +389,8 @@ function openModalWindowForExt(pageUrl,varArgIn,title,width,height) { - width = parseInt(width,10); - height = parseInt(height,10); + width = width || window.screen.width-250; + height = height || window.screen.height-200; var url = ''; var tab1GroupMgr = new Ext.WindowGroup(); Index: ssts-web/src/main/webapp/disinfectsystem/recyclingApplication/selectTousseGroup.jsp =================================================================== diff -u -r27685 -r27686 --- ssts-web/src/main/webapp/disinfectsystem/recyclingApplication/selectTousseGroup.jsp (.../selectTousseGroup.jsp) (revision 27685) +++ ssts-web/src/main/webapp/disinfectsystem/recyclingApplication/selectTousseGroup.jsp (.../selectTousseGroup.jsp) (revision 27686) @@ -47,6 +47,8 @@ $(function(){ $('a').on('click',function(){ var id = $(this).attr('id'); + var win = parent.Ext.getCmp('extWindow'); + if(id=='submit'){ var ids = []; var inputs=document.getElementsByTagName("input"); @@ -55,10 +57,10 @@ ids.push(inputs[i].value); } } - self.returnValue = ids.join(";"); - self.close(); + win.returnValue = ids.join(";"); + win.close(); }else if(id=='cancel'){ - self.close(); + win.close(); }else{ $('#chckbox_' + id).attr("checked","checked"); } Index: ssts-web/src/main/webapp/disinfectsystem/recyclingApplication/goodsApplicationView.js =================================================================== diff -u -r27684 -r27686 --- ssts-web/src/main/webapp/disinfectsystem/recyclingApplication/goodsApplicationView.js (.../goodsApplicationView.js) (revision 27684) +++ ssts-web/src/main/webapp/disinfectsystem/recyclingApplication/goodsApplicationView.js (.../goodsApplicationView.js) (revision 27686) @@ -312,7 +312,7 @@ var url = WWWROOT+"/disinfectsystem/recyclingApplication/selectTousseGroup.jsp"; - return openFullSizeWindow(url,params, "选择器械包分组", "1000", "750"); + return openModalWindowForExt(url,params, "选择器械包分组"); } /** * 选择器械包分组,根据分组进行发货计划的打印 @@ -326,7 +326,7 @@ var url = WWWROOT+"/disinfectsystem/recyclingApplication/selectDepartGroup.jsp"; - return openModalWindowForExt(url,params, "选择回收科室分组", "1000", "750"); + return openModalWindowForExt(url,params, "选择回收科室分组"); } function sumTotal(store){ if(store.getCount()!=0){