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();