Index: ssts-web/src/main/webapp/disinfectsystem/config/cdlqyq1yy/config.js =================================================================== diff -u -r17943 -r18572 --- ssts-web/src/main/webapp/disinfectsystem/config/cdlqyq1yy/config.js (.../config.js) (revision 17943) +++ ssts-web/src/main/webapp/disinfectsystem/config/cdlqyq1yy/config.js (.../config.js) (revision 18572) @@ -62,10 +62,12 @@ showWrapperField : true, //生物监测结束时是否需要提示:true:表示要提示 false或者没有配置:都不提示 biologicalMonitoringWarning : true, - //自定义装配界面是否显示选择申请科室:true:显示选择申请科室,但不是必须选择的 false或者没有配置:不显示 - selectDepartInCustomPacking : true, + //自定义装配界面是否显示选择申请科室:true:显示选择申请科室,但不是必须选择的 false或者没有配置:不显示 + selectDepartInCustomPacking : true, //触摸屏清洗默认清洗机条码 defaultDisinfectIdentificationBarcode : "010013572", //触摸屏清洗默认清洗程序条码 - defaultDisinfectProgramBarcode : "010013548" + defaultDisinfectProgramBarcode : "010013548", + //外来器械申请单"医生"是否不能为空,默认可以为空,true表示不能为空,false表示可以为空 + doctorOfForeignTousseApplicationNotBlank:true } \ No newline at end of file Index: ssts-web/src/main/webapp/disinfectsystem/foreigntousseapplication/foreignTousseInfoForm.js =================================================================== diff -u -r18538 -r18572 --- ssts-web/src/main/webapp/disinfectsystem/foreigntousseapplication/foreignTousseInfoForm.js (.../foreignTousseInfoForm.js) (revision 18538) +++ ssts-web/src/main/webapp/disinfectsystem/foreigntousseapplication/foreignTousseInfoForm.js (.../foreignTousseInfoForm.js) (revision 18572) @@ -462,6 +462,12 @@ top.Ext4.getCmp('departCoding').setValue(deptCoding); top.Ext4.getCmp('settleAccountsDepartCoding').setValue(deptCoding2); + if(sstsConfig.doctorOfForeignTousseApplicationNotBlank && top.Ext4.getCmp('doctor').getValue() == ''){ + showResult("医生不能为空!"); + top.Ext4.getCmp('doctor').focus(); + return false; + } + //当外来器械未归还时能否申请 var canApplyForForeignTousseNotReturn = getObjValueFromJs('sstsConfig.canApplyForForeignTousseNotReturn',true); if(!canApplyForForeignTousseNotReturn){