Index: ssts-web/src/main/webapp/disinfectsystem/packing/packingView.js =================================================================== diff -u -r28500 -r28510 --- ssts-web/src/main/webapp/disinfectsystem/packing/packingView.js (.../packingView.js) (revision 28500) +++ ssts-web/src/main/webapp/disinfectsystem/packing/packingView.js (.../packingView.js) (revision 28510) @@ -1,5 +1,6 @@ Ext4.require('Ext4.tab.*'); Ext4.require(['Ext4.data.*', 'Ext4.grid.*']); +var basketColumnTreeGrid; var basketBarcodeArr2 = []; var splitForeignTousseFlag = false;//拆包 //记住最后选择的器械包图片名称、类型、视频名称、包定义id;用于查看材料图片后再次查询器械包 @@ -4052,7 +4053,7 @@ } } -var basketColumnTreeGrid = Ext4.create('columnTreeGrid', { +basketColumnTreeGrid = Ext4.create('columnTreeGrid', { id : 'basketTreeGrid', height: (document.body.clientHeight - 30)/2, border : false, @@ -4161,12 +4162,15 @@ } var taskList = jsonObj.data; var nLength = taskList?taskList.length:0; - if(nLength == 0){ - showResult('该篮筐在'+taskGroup+'内无装配任务!' , null , sstsConfig.messagePauseTimeOnPackingPage); - } + if(jsonObj.notWashedInfo !== ''){ showResult(jsonObj.notWashedInfo); + }else { + if(nLength == 0){ + showResult('该篮筐在'+taskGroup+'内无装配任务!' , null , sstsConfig.messagePauseTimeOnPackingPage); + } } + var speakBasket = new SpeakBasket(); for(var n = 0;n < nLength; n++){