Index: ssts-web/src/main/webapp/expensivegoodshomepage/portalPage.js =================================================================== diff -u -r23529 -r23638 --- ssts-web/src/main/webapp/expensivegoodshomepage/portalPage.js (.../portalPage.js) (revision 23529) +++ ssts-web/src/main/webapp/expensivegoodshomepage/portalPage.js (.../portalPage.js) (revision 23638) @@ -137,21 +137,23 @@ windowOnLoaded = true;//console.log('time20=' + new Date().format('y-m-d H:i:s') + '.' + new Date().getMilliseconds()); /** - * ajax异步请求后台,当前用户是否已经修改密码 + * ajax异步请求后台,当前用户是否已经修改密码(如果项目有开启用户第一次需要修改密码时) */ - Ext.Ajax.request({ - url : WWWROOT + '/systemmanage/user/userAction!isModifiedPwdByUser.do', - success : function(response, options){ - var result = Ext.decode(response.responseText, true); - //没有修改 - //if(!result) - //showModifyPWDWindowByUnmodified(); - }, - failure : function(response, options){ - }, - method : 'POST', - params : {} - });//console.log('time21=' + new Date().format('y-m-d H:i:s') + '.' + new Date().getMilliseconds()); + if(sstsConfig.needForceModifyPwdWhenFirstTime){ + Ext.Ajax.request({ + url : WWWROOT + '/systemmanage/user/userAction!isModifiedPwdByUser.do', + success : function(response, options){ + var result = Ext.decode(response.responseText, true); + //没有修改 + //if(!result) + //showModifyPWDWindowByUnmodified(); + }, + failure : function(response, options){ + }, + method : 'POST', + params : {} + }); + } //待办任务 var myUnFinishedTaskObj = document.getElementById('myUnFinishedTask'); Index: ssts-web/src/main/webapp/expensivegoodshomepage/menuconfigure.js =================================================================== diff -u -r23471 -r23638 --- ssts-web/src/main/webapp/expensivegoodshomepage/menuconfigure.js (.../menuconfigure.js) (revision 23471) +++ ssts-web/src/main/webapp/expensivegoodshomepage/menuconfigure.js (.../menuconfigure.js) (revision 23638) @@ -33,6 +33,14 @@ {hidden :SSTS_ExpensiveGoods_Hidden_Menu || SSTS_ExpensiveGoodsWorkFlowApprovalTask_Hidden_Manager,text:"我的待办任务",href:encodeURI(WWWROOT+'/systemmanage/workFlow/workFlowApprovalTask.jsp?FormType=高值耗材申请单'),hrefTarget:linkTarget,leaf:true}, {hidden :SSTS_ExpensiveGoods_Hidden_Menu || SSTS_ExpensiveGoodsWorkFlowFinishedApprovalTask_Hidden_Manager,text:"我的已办任务",href:WWWROOT+'/systemmanage/workFlow/workFlowFinishedApprovalTask.jsp',hrefTarget:linkTarget,leaf:true} ] +},{ + text:"财务核算及物品发放报表", + singleClickExpand:singleClickExpandTree, + hidden:SSTS_DepartmentMonthly_Menu, + children:[ + {hidden :SSTS_DepartmentMonthly,text:"核算月报",href:WWWROOT+'/disinfectsystem/reportforms/departmentMonthlyView.jsp',hrefTarget:linkTarget,leaf:true}, + {hidden :SSTS_DepartmentMonthlyDetail,text:"明细核算月报",href:WWWROOT+'/disinfectsystem/reportforms/departmentMonthlyDetailDSInvoiceItemView.jsp',hrefTarget:linkTarget,leaf:true} + ] }]; //控制面版菜单