Index: ssts-web/src/main/webapp/disinfectsystem/touchScreen/recycle/recycleForTouchScreen.js =================================================================== diff -u -r28766 -r28768 --- ssts-web/src/main/webapp/disinfectsystem/touchScreen/recycle/recycleForTouchScreen.js (.../recycleForTouchScreen.js) (revision 28766) +++ ssts-web/src/main/webapp/disinfectsystem/touchScreen/recycle/recycleForTouchScreen.js (.../recycleForTouchScreen.js) (revision 28768) @@ -1569,6 +1569,7 @@ data:'recyclingRecordId=' + encodeURI($('#id').val()) + '&formType=' + encodeURI($('#appType').val()), dataType:'json', success:function(msg){ + var speakBasket = new SpeakBasket(); if(msg.errorMessage != null ){ if(msg.unfinishedPackingTask!=null){ showUnfinishedPackingTask(msg); @@ -1628,6 +1629,14 @@ alertDiv("已有回收单不可更改科室"); } }else if(msg.basket != null){ + if(smartSpeaker.type == "滴声提示"){ + simpleTipsAudio("recycleForTouchScreenAudio"); + }else{ + if(speakBasket){ + speakBasket.addGoods(msg.basket.containerName,'',''); + speakBasket.speakContent(); + } + } // 没有完成装配的篮筐要确认是否用于回收 var containerStatus = msg.containerStatus; if(containerStatus == "清洗完成" || containerStatus == "清洗中"){ @@ -1819,7 +1828,14 @@ userNameByBarcode = msg.user.fullName; var departCode = $('#departCode').val(); var orgUnits = msg.user.orgUnits; - + if(smartSpeaker.type == "滴声提示"){ + simpleTipsAudio("recycleForTouchScreenAudio"); + }else{ + if(speakBasket){ + speakBasket.addGoods(userNameByBarcode,'',''); + speakBasket.speakContent(); + } + } //点击选中回收人员或是清点人员或者自送人 if(currentUserType == userType_recycling){ $('#recyclingUser').val(userNameByBarcode); @@ -2801,6 +2817,15 @@ } } } + var speakBasket = new SpeakBasket(); + if(smartSpeaker.type == "滴声提示"){ + simpleTipsAudio("recycleForTouchScreenAudio"); + }else{ + if(speakBasket){ + speakBasket.addGoods('',tousseName,loadedAmount); + speakBasket.speakContent(); + } + } if(isCleanedEntirely == "否"){ var materials = data.materials; if(materials == null){ Index: ssts-web/src/main/webapp/disinfectsystem/touchScreen/recycle/recycleForTouchScreen.jsp =================================================================== diff -u -r28507 -r28768 --- ssts-web/src/main/webapp/disinfectsystem/touchScreen/recycle/recycleForTouchScreen.jsp (.../recycleForTouchScreen.jsp) (revision 28507) +++ ssts-web/src/main/webapp/disinfectsystem/touchScreen/recycle/recycleForTouchScreen.jsp (.../recycleForTouchScreen.jsp) (revision 28768) @@ -169,7 +169,7 @@ %>