Index: ssts-sterile/src/main/java/com/forgon/disinfectsystem/sterilizationmanager/foreignproxydisinfection/service/ForeignProxyDisinfectionManager.java =================================================================== diff -u -r14759 -r14773 --- ssts-sterile/src/main/java/com/forgon/disinfectsystem/sterilizationmanager/foreignproxydisinfection/service/ForeignProxyDisinfectionManager.java (.../ForeignProxyDisinfectionManager.java) (revision 14759) +++ ssts-sterile/src/main/java/com/forgon/disinfectsystem/sterilizationmanager/foreignproxydisinfection/service/ForeignProxyDisinfectionManager.java (.../ForeignProxyDisinfectionManager.java) (revision 14773) @@ -55,4 +55,6 @@ boolean checkToussesInForeignProxyItemHasSterileOrDelivered(Long id); public void loadToussePrintData(String[] invoiceIds,JSONObject jsonObject); + + public JSONArray getForeignProxyDisinfectionTousseInstancesByIds(String ids); } Index: ssts-web/src/main/webapp/disinfectsystem/sterilizationmanager/sterilizationrecord/foreignProxyDisinfectionView.js =================================================================== diff -u -r14772 -r14773 --- ssts-web/src/main/webapp/disinfectsystem/sterilizationmanager/sterilizationrecord/foreignProxyDisinfectionView.js (.../foreignProxyDisinfectionView.js) (revision 14772) +++ ssts-web/src/main/webapp/disinfectsystem/sterilizationmanager/sterilizationrecord/foreignProxyDisinfectionView.js (.../foreignProxyDisinfectionView.js) (revision 14773) @@ -313,6 +313,52 @@ } }); } +function printSelectedForeignProxyDisinfectionTousseInstances(grid) { + var records = grid.getSelectionModel().getSelections(); + if (records.length == 0) { + showResult("请选择要打印标签的申请单!"); + return false; + } + var ids = null; + for ( var i = 0, len = records.length; i < len; i++) { + var hasPacked = records[i].data['hasPacked']; + if(hasPacked=='否'){ + showResult("流水号为【"+records[i].data['serialNumber']+"】的单还未装配,不能打印标签!"); + return false; + } + if (ids == null) { + ids = records[i].data['id']; + } else { + ids = ids + ',' + records[i].data['id']; + } + } + top.Ext.MessageBox.confirm("请确认", "要打印选中申请单的标签吗?", + function(btn) { + if (btn == 'yes') { + Ext.Ajax.request({ + url : WWWROOT + '/disinfectSystem/foreignProxyDisinfectionAction!getForeignProxyDisinfectionTousseInstancesByIds.do', + params : {ids : ids}, + success : function(response, options) { + var result = Ext.decode(response.responseText); + if(result.success){ + //打印条码 + printBarcode(result); + }else{ + showResult(result.msg); + } + }, + failure : function(response, options) { + var result = Ext.decode(response.responseText); + if(!isUndefinedOrNullOrEmpty(result) && !isUndefinedOrNullOrEmpty(result.msg)){ + showResult(result.msg); + }else{ + showResult("操作失败!"); + } + } + }); + } + }); +} function removeGridItem(id){ var rows = top.Ext.getCmp('foreignProxyDisinfectionGrid').getSelectionModel().getSelections();// 返回值为 @@ -1686,10 +1732,6 @@ } function printBarcode(data){ var hospitalName = ""; - var sterilizer = top.Ext.getCmp('sterilizer').getValue(); - var frequency = top.Ext.getCmp('frequency').getValue(); - var applicant = top.Ext.getCmp('applicant').getValue(); - var depart = top.Ext.getCmp('depart').getValue(); if(data.tousseList){ var newP = top.Ext.MessageBox.show({ @@ -1700,6 +1742,10 @@ closable:false }); var arr = data.tousseList; + var sterilizer = arr[0].sterilizer; + var frequency = arr[0].frequency; + var applicant = arr[0].applicant; + var depart = arr[0].depart; for(var i=0;i