Index: ssts-web/src/main/webapp/disinfectsystem/config/gzspyqzyy/config.js =================================================================== diff -u -r13898 -r14546 --- ssts-web/src/main/webapp/disinfectsystem/config/gzspyqzyy/config.js (.../config.js) (revision 13898) +++ ssts-web/src/main/webapp/disinfectsystem/config/gzspyqzyy/config.js (.../config.js) (revision 14546) @@ -58,5 +58,7 @@ //装配界面显示灭菌炉和炉次 showSterilizer : true, //发货单是否合并打印，如果为true,则把一次性物品、消毒物品、器械包打印到一张单,false或者不配置，都是分三张单打印 - mergePrintInvoiceGoods:true + mergePrintInvoiceGoods:true, + //默认弹出切换科室选项 + defaultShowOrgChange:true } \ No newline at end of file Index: ssts-web/src/main/webapp/openSystemMainPage.jsp =================================================================== diff -u -r12331 -r14546 --- ssts-web/src/main/webapp/openSystemMainPage.jsp (.../openSystemMainPage.jsp) (revision 12331) +++ ssts-web/src/main/webapp/openSystemMainPage.jsp (.../openSystemMainPage.jsp) (revision 14546) @@ -11,6 +11,7 @@ SystemconfigureBean systemConfigureBean = ((SystemconfigureManager)SpringBeanManger.getBean("systemconfigureManager")).getSystemconfigure(); session.setAttribute("softName",systemConfigureBean.getCompanyShotName() + " "); session.setAttribute("title",systemConfigureBean.getCompanyShotName() + " 消毒供应质量追溯管理系统 用户:"+loginUserData.getUserFullName()); +session.setAttribute("openSelectOrgUnitWindow", "打开"); //决定要不要打切换科室的窗口 String ctx = request.getContextPath(); session.setAttribute("userOperationIds", loginUserData.getUserOperationIds()); Index: ssts-web/src/main/webapp/homepage/portalPage.js =================================================================== diff -u -r13699 -r14546 --- ssts-web/src/main/webapp/homepage/portalPage.js (.../portalPage.js) (revision 13699) +++ ssts-web/src/main/webapp/homepage/portalPage.js (.../portalPage.js) (revision 14546) @@ -1094,6 +1094,11 @@ hiddenSystemWarning(); } doSync = false; + if (sstsConfig.defaultShowOrgChange) { + if ("打开" == openFlag) { + openSelectOrgUnitWindow(); //打开切换的选择窗口 + } + } }, error : function(req, textStatus) { hiddenSystemWarning(); @@ -1178,6 +1183,7 @@ triggerAction: 'all', emptyText:'请选择科室', selectOnFocus:true, + value : departName, //默认选中当前科室（陈家儒改） listeners:{ scope:this, 'select': changeCurrentOrgUnit @@ -1198,6 +1204,10 @@ var contentFormWindow = Ext.getCmp('changeDepartWindow'); var currentOrgUnitId = record.data.orgUnitId; + if (currentOrgUnitId == dirOrgCode) { //如果选中的，就是当前科室，则不再重新请求后台 + return; + } + var myMask = new Ext.LoadMask(Ext.getBody(),{msg:"正在切换，请稍候..."}); myMask.show(); Index: ssts-web/src/main/webapp/homepage/portalPage.jsp =================================================================== diff -u -r14415 -r14546 --- ssts-web/src/main/webapp/homepage/portalPage.jsp (.../portalPage.jsp) (revision 14415) +++ ssts-web/src/main/webapp/homepage/portalPage.jsp (.../portalPage.jsp) (revision 14546) @@ -45,6 +45,10 @@ }else{ request.setAttribute("logoPath","themes/portalPage/img/logo_Forgon.png"); } + String openSelectOrgUnitWindow = (String)session.getAttribute("openSelectOrgUnitWindow"); //决定要不要显示切换科室的窗口 + if ("打开".equals(openSelectOrgUnitWindow)) { + session.setAttribute("openSelectOrgUnitWindow", "不打开"); + } %> @@ -137,6 +141,7 @@