Index: ssts-web/src/main/webapp/disinfectsystem/sterilizationmanager/sterilizationrecord/sterilizationRecordForm.js =================================================================== diff -u -r13971 -r13988 --- ssts-web/src/main/webapp/disinfectsystem/sterilizationmanager/sterilizationrecord/sterilizationRecordForm.js (.../sterilizationRecordForm.js) (revision 13971) +++ ssts-web/src/main/webapp/disinfectsystem/sterilizationmanager/sterilizationrecord/sterilizationRecordForm.js (.../sterilizationRecordForm.js) (revision 13988) @@ -5,12 +5,14 @@ var sterilizationColumnTree; var tousseItemCountJsonStore; var pendingSterilizationColumnTree; +var scanUser = sstsConfig.hasOwnProperty('sterilizationScanUser') && sstsConfig.sterilizationScanUser; var SHELF = "灭菌架"; var BASKET = "灭菌筐"; var STERILIZER = "灭菌炉"; var STERILISATION = "灭菌程序"; var TOUSSEINSTANCE = "器械包"; +var USER = "用户"; //定义首篮筐的label变量 var beginBarcodeLabel = '扫描条码'; @@ -272,6 +274,20 @@ }); DWREngine.setAsync(true); } +//扫描灭菌员条码 +function loadSterilizationUser(barcode){ + if(barcode != null && barcode.length > 0){ + SterilizationRecordTableManager.getSterilizationUserByBarcode(barcode,function(response) { + var result = Ext.decode(response); + if (result.success == true) { + top.Ext.getCmp('sterilizationUser').setValue(result.fullName); + }else{ + showResult(result.message); + } + } + ); + } +} /** * 判断灭菌程序是否能添加器械包 * @param sterilizationName @@ -1373,6 +1389,13 @@ if(SHELF == result){//灭菌架 loadSterilizationShelf(barcode); top.Ext.getCmp('inputBarcode').setValue(""); + }else if(USER == result){ + if(scanUser == true){ + loadSterilizationUser(barcode); + }else{ + showResult("请输入正确的条码!"); + } + top.Ext.getCmp('inputBarcode').setValue(""); }else if(BASKET == result){ loadTousseInstance(barcode,recordID,removePendingSterilizationGoods(barcode)); if(hiddenEndBarcode || currentScanMode == 'single'){ @@ -1865,6 +1888,10 @@ top.Ext.getCmp('saveBtn').hide(); disableItems(); } + if(scanUser == true) + { + top.Ext.getCmp('sterilizationUser').setValue(''); + } }, failure : function(form, action) { }, @@ -2052,4 +2079,4 @@ function cancel() { saveBarcode = ""; sterilizationRecordWin.close(); -} +} \ No newline at end of file Index: ssts-web/src/main/webapp/disinfectsystem/config/gdsy/config.js =================================================================== diff -u -r13982 -r13988 --- ssts-web/src/main/webapp/disinfectsystem/config/gdsy/config.js (.../config.js) (revision 13982) +++ ssts-web/src/main/webapp/disinfectsystem/config/gdsy/config.js (.../config.js) (revision 13988) @@ -62,6 +62,8 @@ disabeleTousseMaintain : false, //回收界面清点人默认是否为当前登录人(false表示回收清点人员不默认为当前登录人,即清点人默认为空,不配置或配置其它值则默认为当前登录人) recyclePageCheckUserDefaultCurrentUser : false, - // 灭菌完成输入完成确认人 - needFinishComfirmer : true + // 灭菌完成输入完成确认人 + needFinishComfirmer : true, + // 灭菌是否扫描条码录入灭菌员信息 + sterilizationScanUser : true } \ No newline at end of file