Index: ssts-web/src/main/webapp/disinfectsystem/touchScreen/recycle/addDepart.jsp =================================================================== diff -u -r25452 -r25457 --- ssts-web/src/main/webapp/disinfectsystem/touchScreen/recycle/addDepart.jsp (.../addDepart.jsp) (revision 25452) +++ ssts-web/src/main/webapp/disinfectsystem/touchScreen/recycle/addDepart.jsp (.../addDepart.jsp) (revision 25457) @@ -134,7 +134,7 @@ closeLayer(); }else{ window.parent.selectDepart(departName,departCode); - window.parent.openDepart(departCode); + window.parent.openDepart(departCode,departName); closeLayer(); } Index: ssts-web/src/main/webapp/disinfectsystem/touchScreen/recycle/recycleForTouchScreen.js =================================================================== diff -u -r25451 -r25457 --- ssts-web/src/main/webapp/disinfectsystem/touchScreen/recycle/recycleForTouchScreen.js (.../recycleForTouchScreen.js) (revision 25451) +++ ssts-web/src/main/webapp/disinfectsystem/touchScreen/recycle/recycleForTouchScreen.js (.../recycleForTouchScreen.js) (revision 25457) @@ -114,7 +114,7 @@ //Annie 清点确认按钮权限 $(document).ready(function(){ - if(sstsConfig.isCheckIntoTheBox){ + if(sstsConfig.enbaleCheckToConfirm){ $('#isCheckIntoTheBox').show(); } }); @@ -3625,30 +3625,27 @@ return canEmpty; } -/*Annie 根据科室编码获取绑定的篮筐*/ -function openDepart(departCode){ - var openDepart=$('#depart').val() - if( openDepart || openDepart!=''){ - $.ajax({ - type:'get', - url: WWWROOT + '/disinfectSystem/baseData/containerAction!getWashContainerByBindDepartCode.do', - data:'bindDepartCode=' +departCode, - dataType:'json', - success:function(retuls){ - if(retuls != ''){ - $('#scanContainerBarcodeTipUl').hide(); - $("#basketsUl").empty(); - for (var i =0 ;i < retuls.length; i++){ - createBasketUiElement(retuls[i].barcode,retuls[i].id,retuls[i].containerName,retuls[i].washClassifyType); - loadBarcodeDevice(retuls[i].barcode); - } - }else{ - $("#basketsUl").empty(); - $('#scanContainerBarcodeTipUl').show(); - } - } - }) - } +/*根据科室编码获取绑定的篮筐*/ +function openDepart(departCode,departName){ + $.ajax({ + type:'get', + url: WWWROOT + '/disinfectSystem/baseData/containerAction!getWashContainerByBindDepartCode.do', + data:'bindDepartCode=' +departCode, + dataType:'json', + success:function(retuls){ + if(retuls != ''){ + $('#scanContainerBarcodeTipUl').hide(); + $("#basketsUl").empty(); + for (var i =0 ;i < retuls.length; i++){ + createBasketUiElement(retuls[i].barcode,retuls[i].id,retuls[i].containerName,retuls[i].washClassifyType); + loadBarcodeDevice(retuls[i].barcode); + } + }else{ + $("#basketsUl").empty(); + $('#scanContainerBarcodeTipUl').show(); + } + } + }) } function selectDepart(departName,departCode){ var oldValue = document.getElementById('departCode').value;