Index: ssts-web/src/main/webapp/disinfectsystem/config/gdsy/config.js =================================================================== diff -u -r13962 -r13972 --- ssts-web/src/main/webapp/disinfectsystem/config/gdsy/config.js (.../config.js) (revision 13962) +++ ssts-web/src/main/webapp/disinfectsystem/config/gdsy/config.js (.../config.js) (revision 13972) @@ -59,5 +59,7 @@ //使能设备接口 disableDeviceInterface : false, // 器械保养模块使能 - disabeleTousseMaintain : false + disabeleTousseMaintain : false, + //回收界面清点人默认是否为当前登录人(false表示回收清点人员不默认为当前登录人,即清点人默认为空,不配置或配置其它值则默认为当前登录人) + recyclePageCheckUserDefaultCurrentUser : false } \ No newline at end of file Index: ssts-web/src/main/webapp/disinfectsystem/touchScreen/recycle/recycleForTouchScreen.js =================================================================== diff -u -r13963 -r13972 --- ssts-web/src/main/webapp/disinfectsystem/touchScreen/recycle/recycleForTouchScreen.js (.../recycleForTouchScreen.js) (revision 13963) +++ ssts-web/src/main/webapp/disinfectsystem/touchScreen/recycle/recycleForTouchScreen.js (.../recycleForTouchScreen.js) (revision 13972) @@ -2131,10 +2131,18 @@ loadRecyclingRecordById(id); } $("#recyclingTime").val(today); - $("#operator").val(userName); - if(sessionRecyclingUser != null && sessionRecyclingUser != 'null'){ - $("#recyclingUser").val(sessionRecyclingUser); + + var recyclePageCheckUserDefaultCurrentUser = true; + if(sstsConfig.recyclePageCheckUserDefaultCurrentUser == false){ + recyclePageCheckUserDefaultCurrentUser = false; } + //如果配置为默认当前登录人为清点人,则赋值 + if(recyclePageCheckUserDefaultCurrentUser != false){ + $("#operator").val(userName); + if(sessionRecyclingUser != null && sessionRecyclingUser != 'null'){ + $("#recyclingUser").val(sessionRecyclingUser); + } + } if(isSecondSupplyRoom && id == "" && params_appId == ""){ //二级供应室回收时科室名称与编码改为也不赋值 //$("#depart").val(secondOrgUnitName);