Index: ssts-web/src/main/webapp/disinfectsystem/invoice/customInvoiceForm.js =================================================================== diff -u -r30401 -r32061 --- ssts-web/src/main/webapp/disinfectsystem/invoice/customInvoiceForm.js (.../customInvoiceForm.js) (revision 30401) +++ ssts-web/src/main/webapp/disinfectsystem/invoice/customInvoiceForm.js (.../customInvoiceForm.js) (revision 32061) @@ -362,6 +362,47 @@ } return true; } +var timeOut; +//150毫秒播放一次,随时停止播放 +function setTime(time){ + if(time > 0){ + timeOut = setTimeout(function(){ + if(isIE()){ + document.getElementById('invoicePlanAudioIE').setAttribute('src',WWWROOT+'/common/audio/beep.wav'); + }else { + var myAudio = new Audio(); + myAudio.preload = true; + myAudio.controls = true; + myAudio.src = WWWROOT+'/common/audio/beep.ogg'; + myAudio.play(); + myAudio.loop = false; + } + time --; + setTime(time); + }, 150); + } +} +//先播放报警声后弹出提示 +function loadBeep(resultMsg) { + setTime(33); + var timeOut2 = setTimeout(function() { + speakMessage(resultMsg); + }, 5000); + top.Ext.MessageBox.confirm = function(title, msg, fn) { + this.show({ + title : title, + msg : msg, + buttons:{yes:'确认'}, + fn : fn, + icon : this.QUESTION + }); + return this; + } + top.Ext.MessageBox.confirm('提示',resultMsg,function(btn){ + clearTimeout(timeOut); + clearTimeout(timeOut2); + }) +} //扫描发货物品 function loadGoodsByBarcode() { var orgUnitCoding = top.Ext.getCmp("orgUnitCoding").getValue() @@ -396,7 +437,11 @@ var noticeMessage = result.errMsg || result.error || result.message; // 首先处理错误信息 if(!isUndefinedOrNullOrEmpty(noticeMessage)){ - showResult(noticeMessage); + if(sstsConfig.enableTheAlarmConfirmationDialogBoxPopsUpWhenTheShipmentScansAbnormalItems){ + loadBeep(noticeMessage); + }else { + showResult(noticeMessage); + } return; } if(result.data.length == 0){ @@ -426,7 +471,11 @@ // 是否有错误信息 if (goods.errorMsg){ - showResult(goods.errorMsg); + if(sstsConfig.enableTheAlarmConfirmationDialogBoxPopsUpWhenTheShipmentScansAbnormalItems){ + loadBeep(goods.errorMsg); + }else { + showResult(goods.errorMsg); + } continue; } // 是否到继续下一个循环 Index: ssts-web/src/main/webapp/disinfectsystem/invoice/invoicePlanExtractedForm.js =================================================================== diff -u -r32026 -r32061 --- ssts-web/src/main/webapp/disinfectsystem/invoice/invoicePlanExtractedForm.js (.../invoicePlanExtractedForm.js) (revision 32026) +++ ssts-web/src/main/webapp/disinfectsystem/invoice/invoicePlanExtractedForm.js (.../invoicePlanExtractedForm.js) (revision 32061) @@ -1104,12 +1104,16 @@ function setTime(time){ if(time > 0){ timeOut = setTimeout(function(){ - var myAudio = new Audio(); - myAudio.preload = true; - myAudio.controls = true; - myAudio.src = WWWROOT+'/common/audio/beep.ogg'; - myAudio.play(); - myAudio.loop = false; + if(isIE()){ + document.getElementById('invoicePlanAudioIE').setAttribute('src',WWWROOT+'/common/audio/beep.wav'); + }else { + var myAudio = new Audio(); + myAudio.preload = true; + myAudio.controls = true; + myAudio.src = WWWROOT+'/common/audio/beep.ogg'; + myAudio.play(); + myAudio.loop = false; + } time --; setTime(time); }, 150); @@ -1132,10 +1136,8 @@ return this; } top.Ext.MessageBox.confirm('提示',resultMsg,function(btn){ - if(btn =='yes'){ - clearTimeout(timeOut); - clearTimeout(timeOut2); - } + clearTimeout(timeOut); + clearTimeout(timeOut2); }) } //扫描发货物品