Index: ssts-web/src/main/webapp/disinfectsystem/sterilizationmanager/sterilizationrecord/foreignProxyDisinfectionView.js =================================================================== diff -u -r14778 -r14785 --- ssts-web/src/main/webapp/disinfectsystem/sterilizationmanager/sterilizationrecord/foreignProxyDisinfectionView.js (.../foreignProxyDisinfectionView.js) (revision 14778) +++ ssts-web/src/main/webapp/disinfectsystem/sterilizationmanager/sterilizationrecord/foreignProxyDisinfectionView.js (.../foreignProxyDisinfectionView.js) (revision 14785) @@ -323,7 +323,7 @@ var ids = null; for ( var i = 0, len = records.length; i < len; i++) { var hasPacked = records[i].data['hasPacked']; - if(hasPacked=='否'){ + if(hasPacked !='是'){ showResult("流水号为【"+records[i].data['serialNumber']+"】的单还未装配,不能打印标签!"); return false; } @@ -1739,7 +1739,7 @@ function printBarcode(data){ var hospitalName = ""; - if(data.tousseList){ + if(data.tousseList && data.tousseList.length > 0){ var newP = top.Ext.MessageBox.show({ title:'请等待', msg:'打印中……', @@ -1771,6 +1771,8 @@ defaultForeignPrintPackage(printSummaryObj); } hideMessageBox(true); + }else{ + showResult("包实例为空,请确认申请已装配!"); } }