Index: ssts-web/src/main/webapp/disinfectsystem/sterilizationmanager/sterilizationrecord/foreignProxyDisinfectionView.js =================================================================== diff -u -r14759 -r14760 --- ssts-web/src/main/webapp/disinfectsystem/sterilizationmanager/sterilizationrecord/foreignProxyDisinfectionView.js (.../foreignProxyDisinfectionView.js) (revision 14759) +++ ssts-web/src/main/webapp/disinfectsystem/sterilizationmanager/sterilizationrecord/foreignProxyDisinfectionView.js (.../foreignProxyDisinfectionView.js) (revision 14760) @@ -287,6 +287,11 @@ var depart = null; for ( var i = 0, len = records.length; i < len; i++) { var curDepart = records[i].data['depart']; + var hasPacked = records[i].data['hasPacked']; + if(hasPacked=='否'){ + showResult("流水号为【"+records[i].data['serialNumber']+"】的单还未装配,不能打印!"); + return false; + } if(depart == null){ depart = curDepart; }else{ @@ -301,7 +306,7 @@ ids = ids + ',' + records[i].data['id']; } } - top.Ext.MessageBox.confirm("请确认", "要打印本申请单吗?", + top.Ext.MessageBox.confirm("请确认", "要打印申请单吗?", function(btn) { if (btn == 'yes') { batchPrintForeignProxyDisinfectionApplications(ids,depart ,0);