Index: ssts-web/src/main/webapp/js/speaker.js =================================================================== diff -u -r27405 -r27819 --- ssts-web/src/main/webapp/js/speaker.js (.../speaker.js) (revision 27405) +++ ssts-web/src/main/webapp/js/speaker.js (.../speaker.js) (revision 27819) @@ -180,7 +180,9 @@ if(this.count() == 1){ ret = this.at(0).tousseName; if(ttamt > 0){ - ret = ret + ',数量为 ' + ttamt; + if(messagePromptType == '物品名称和数量提示'){ + ret = ret + ',数量为 ' + ttamt; + } } }else if(this.count() > 1){ ret = '有' + this.count() + '种物品'; @@ -311,28 +313,32 @@ for(var i = 0; i < this.baskets.length;++i){ tousseArray.addTousseArray(this.baskets[i].goods); } - return '精简提示' == messagePromptType ? tousseArray.toSimpleString() : tousseArray.toString(); //(cjr) + return '滴声提示' == messagePromptType ? tousseArray.toSimpleString() : tousseArray.toString(); //(cjr) } } function SmartSpeaker(){ var MESSAGE_PROMPT_TYPE_NONE = "不提示"; - var MESSAGE_PROMPT_TYPE_DETAIL = "详细提示"; - var MESSAGE_PROMPT_TYPE_SIMPLE = "精简提示"; + var MESSAGE_PROMPT_TYPE_DETAIL = "物品名称和数量提示"; + var MESSAGE_PROMPT_TYPE_NAME = "物品名称提示"; + var MESSAGE_PROMPT_TYPE_SIMPLE = "滴声提示"; this.type = MESSAGE_PROMPT_TYPE_NONE; /** * 发音提示,如果当前配置为详细提示,则发详细提示语音 - * 如果当前配置为精简提示,则发精简提示语音 - * @param detailMsg 详细语音内容 - * @param simpleMsg 精简语音内容 + * 如果当前配置为滴声提示,则发滴声提示语音 + * @param detailMsg 物品名称和数量提示内容 + * @param nameMsg 物品名称提示内容 + * @param simpleMsg 滴声提示语音内容 */ - this.speak = function(detailMsg,simpleMsg){ + this.speak = function(detailMsg,simpleMsg,nameMsg){ if(this.type == MESSAGE_PROMPT_TYPE_DETAIL){ speaker.speak(detailMsg); }else if(this.type == MESSAGE_PROMPT_TYPE_SIMPLE){ speaker.speak(simpleMsg); + }else if(this.type == MESSAGE_PROMPT_TYPE_NAME){ + speaker.speak(nameMsg); } } /** @@ -345,6 +351,8 @@ enable = true; }else if(this.type == MESSAGE_PROMPT_TYPE_SIMPLE){ enable = true; + }else if(this.type == MESSAGE_PROMPT_TYPE_NAME){ + enable = true; } speaker.enable(enable); } @@ -390,7 +398,7 @@ } /** - * 精简提示嘀的声音 + * 滴声提示嘀的声音 */ function simpleTipsAudio(ids){ if(!!window.ActiveXObject || "ActiveXObject" in window){ @@ -402,13 +410,13 @@ } /** - * 精简提示嘀的声音 + * 滴声提示嘀的声音 * ids 发出嘀声音标签的id * msg 目前主要是传入使用记录需要读的信息 * speakBasket 目前主要是传入发货、灭菌需要读的信息 */ function newAddAudioTips(ids,msg,speakBasket){ - if(smartSpeaker.type == "精简提示"){ + if(smartSpeaker.type == "滴声提示"){ simpleTipsAudio(ids); }else{ if(speakBasket && msg == ""){ Index: ssts-web/src/main/webapp/disinfectsystem/invoice/invoiceSign.jsp =================================================================== diff -u -r27440 -r27819 --- ssts-web/src/main/webapp/disinfectsystem/invoice/invoiceSign.jsp (.../invoiceSign.jsp) (revision 27440) +++ ssts-web/src/main/webapp/disinfectsystem/invoice/invoiceSign.jsp (.../invoiceSign.jsp) (revision 27819) @@ -375,7 +375,7 @@ //将包实例显示在页面上 displayTousseInstanceInfo(jsonArr[i],data.signType,data.barcode); if(!sstsConfig.donotSpeakTousseSignSuccessMessage){ - if(smartSpeaker.type == "精简提示"){ + if(smartSpeaker.type == "滴声提示"){ simpleTipsAudio("invoiceSignAudio"); }else{ speakSignedTousse(jsonArr[i]); Index: ssts-web/src/main/webapp/personalSetting/modifySearchMode.jsp =================================================================== diff -u -r15634 -r27819 --- ssts-web/src/main/webapp/personalSetting/modifySearchMode.jsp (.../modifySearchMode.jsp) (revision 15634) +++ ssts-web/src/main/webapp/personalSetting/modifySearchMode.jsp (.../modifySearchMode.jsp) (revision 27819) @@ -22,6 +22,7 @@ Index: ssts-web/src/main/webapp/personalSetting/modifySearchMode.js =================================================================== diff -u -r20147 -r27819 --- ssts-web/src/main/webapp/personalSetting/modifySearchMode.js (.../modifySearchMode.js) (revision 20147) +++ ssts-web/src/main/webapp/personalSetting/modifySearchMode.js (.../modifySearchMode.js) (revision 27819) @@ -15,6 +15,7 @@ fields : ['value','fontText'], data : [[MESSAGE_PROMPT_TYPE_NONE,MESSAGE_PROMPT_TYPE_NONE] , [MESSAGE_PROMPT_TYPE_DETAIL,MESSAGE_PROMPT_TYPE_DETAIL] + , [MESSAGE_PROMPT_TYPE_NAME,MESSAGE_PROMPT_TYPE_NAME] , [MESSAGE_PROMPT_TYPE_SIMPLE,MESSAGE_PROMPT_TYPE_SIMPLE]] }); Index: ssts-web/src/main/webapp/disinfectsystem/invoice/invoicePlanExtractedForm.js =================================================================== diff -u -r27812 -r27819 --- ssts-web/src/main/webapp/disinfectsystem/invoice/invoicePlanExtractedForm.js (.../invoicePlanExtractedForm.js) (revision 27812) +++ ssts-web/src/main/webapp/disinfectsystem/invoice/invoicePlanExtractedForm.js (.../invoicePlanExtractedForm.js) (revision 27819) @@ -1165,7 +1165,7 @@ continue; } if(!isUndefinedOrNullOrEmpty(goods.showResult)){ - if(smartSpeaker.type == "精简提示"){//一次性物品 + if(smartSpeaker.type == "滴声提示"){//一次性物品 simpleTipsAudio("invoicePlanAudio"); }else{ showResult(goods.showResult , null , sstsConfig.messagePauseTimeOnInvoiceplanPage);