Index: ssts-web/src/main/webapp/disinfectsystem/recyclingApplication/goodsTemplateApplicationView.js =================================================================== diff -u -r13683 -r13710 --- ssts-web/src/main/webapp/disinfectsystem/recyclingApplication/goodsTemplateApplicationView.js (.../goodsTemplateApplicationView.js) (revision 13683) +++ ssts-web/src/main/webapp/disinfectsystem/recyclingApplication/goodsTemplateApplicationView.js (.../goodsTemplateApplicationView.js) (revision 13710) @@ -1161,6 +1161,15 @@ return; } + var deptName = top.Ext4.ComponentQuery.query("#recyclingApplicationForm #depart")[0].getValue(); + //如果菜单中已启用申领一次性物品增加项目选项功能并且申请科室为课教项目经费时,则判断项目是否已选,如果未选则进行提示 + if(sstsConfig.showProjectNameSelectWhenApplyDiposableGoods == true && deptName == '科教项目经费'){ + if(!top.Ext4.getCmp('projCode').getValue() || top.Ext4.getCmp('projCode').getValue() == ''){ + showResult("请选择项目!"); + return; + } + } + function submitRecyclingApplication(autoReturnTheBorrowingTousse){ form.form.submit({ url : WWWROOT + '/disinfectSystem/recyclingApplicationAction!saveRecyclingApplication.do', @@ -2202,6 +2211,16 @@ var departCodingComp = top.Ext4.ComponentQuery.query("#recyclingApplicationForm #departCoding")[0]; departCodingComp.setValue($Id('departCoding').value); + if(sstsConfig.showProjectNameSelectWhenApplyDiposableGoods == true){ + if($Id('depart').value == '科教项目经费'){ + top.Ext4.getCmp('projCode').setVisible(true); + projectStore.reload();//加载项目数据 + }else{ + top.Ext4.getCmp('projCode').setVisible(false); + top.Ext4.getCmp('projCode').setValue(''); + } + } + if(!id || id == 0){ //选择申请科室后,根据申请科室及单类型加载处理科室,如果加载后的数量为1,则进行默认处理科室赋值 handleDepartStore.proxy.extraParams.applyDepartCode = $Id('departCoding').value;