Index: ssts-web/src/main/webapp/js/common.js =================================================================== diff -u -r32339 -r32381 --- ssts-web/src/main/webapp/js/common.js (.../common.js) (revision 32339) +++ ssts-web/src/main/webapp/js/common.js (.../common.js) (revision 32381) @@ -3461,36 +3461,50 @@ currentDateTime = currentDateTime.split(' ')[0]; } if (tousses != null && tousses.length > 0) { - top.Ext.Msg.show({ - title: '输入打印份数', - msg: '打印份数：', - width: 100, - buttons: Ext.MessageBox.OKCANCEL, - prompt: true, - fn: function (bu, txt) { - if (bu == 'ok') { - if (isNaN(txt) == false) { - Ext.MessageBox.progress('打印中', '请稍候...'); - var curNumber = 0; - var count = Number(txt) * tousses.length; - for (var j = 0; j < Number(txt); j++) { - for (var i = 0; i < tousses.length; i++) { - var toussedef = tousses[i]; - toussedef.currentDateTime = currentDateTime; - ++curNumber; - Ext.MessageBox.updateProgress((curNumber) / count, '第' + (curNumber) + '个,共' + count + '个'); - printTousseDefinitionMaterialsInTousseView(toussedef, 1); + if(sstsConfig.printBOMwhenPrintLabel){ + Ext.MessageBox.progress('打印中', '请稍候...'); + var curNumber = 0; + var count = tousses.length; + for (var i = 0; i < tousses.length; i++) { + var toussedef = tousses[i]; + toussedef.currentDateTime = currentDateTime; + ++curNumber; + Ext.MessageBox.updateProgress((curNumber) / count, '第' + (curNumber) + '个,共' + count + '个'); + printTousseDefinitionMaterialsInTousseView(toussedef, 0,'BOMprinter'); + } + hideMessageBox(false); + }else { + top.Ext.Msg.show({ + title: '输入打印份数', + msg: '打印份数：', + width: 100, + buttons: Ext.MessageBox.OKCANCEL, + prompt: true, + fn: function (bu, txt) { + if (bu == 'ok') { + if (isNaN(txt) == false) { + Ext.MessageBox.progress('打印中', '请稍候...'); + var curNumber = 0; + var count = Number(txt) * tousses.length; + for (var j = 0; j < Number(txt); j++) { + for (var i = 0; i < tousses.length; i++) { + var toussedef = tousses[i]; + toussedef.currentDateTime = currentDateTime; + ++curNumber; + Ext.MessageBox.updateProgress((curNumber) / count, '第' + (curNumber) + '个,共' + count + '个'); + printTousseDefinitionMaterialsInTousseView(toussedef, 1); + } } + hideMessageBox(false); + } else { + showResult("打印份数必须是数字，请重新输入!"); } - hideMessageBox(false); - } else { - showResult("打印份数必须是数字，请重新输入!"); } - } - }, - animEl: 'addAddressBtn', - value: '1' - }); + }, + animEl: 'addAddressBtn', + value: '1' + }); + } } } }); Index: ssts-web/src/main/webapp/disinfectsystem/config/szsdsrmyy/config.js =================================================================== diff -u -r31978 -r32381 --- ssts-web/src/main/webapp/disinfectsystem/config/szsdsrmyy/config.js (.../config.js) (revision 31978) +++ ssts-web/src/main/webapp/disinfectsystem/config/szsdsrmyy/config.js (.../config.js) (revision 32381) @@ -273,5 +273,7 @@ //使用记录表单的必填项配置 notAllowBlankFieldsOnUseRecordPage : ["operationRoom"], //是否限制同一个手术间只能登记一个未审核的使用记录 - limitOneOperationRoomCanOnlyRegistOneUnAuditedUseRecord:true + limitOneOperationRoomCanOnlyRegistOneUnAuditedUseRecord:true, + //打印标签同时打印包内清单 + printBOMwhenPrintLabel:true } \ No newline at end of file Index: ssts-web/src/main/webapp/disinfectsystem/print/print.js =================================================================== diff -u -r32372 -r32381 --- ssts-web/src/main/webapp/disinfectsystem/print/print.js (.../print.js) (revision 32372) +++ ssts-web/src/main/webapp/disinfectsystem/print/print.js (.../print.js) (revision 32381) @@ -3226,8 +3226,8 @@ * @param tousseDefinitionObj 器械包定义数据对象 * @param printType 打印类型:0为打印,其它为预览 */ -function printTousseDefinitionMaterialsInTousseView(tousseDefinitionObj,printType) { - formTypeOfPrinted = "tousseDefinitionMaterials"; +function printTousseDefinitionMaterialsInTousseView(tousseDefinitionObj,printType,printType) { + formTypeOfPrinted = printType || "tousseDefinitionMaterials"; tousseDefinitionObj.printConfigObj_default = tousseDefinitionMaterialsConfig_default;// doGetLodop(); LODOP.PRINT_INIT(""); Index: ssts-web/src/main/webapp/disinfectsystem/basedatamanager/tousse/tousseForm.js =================================================================== diff -u -r32296 -r32381 --- ssts-web/src/main/webapp/disinfectsystem/basedatamanager/tousse/tousseForm.js (.../tousseForm.js) (revision 32296) +++ ssts-web/src/main/webapp/disinfectsystem/basedatamanager/tousse/tousseForm.js (.../tousseForm.js) (revision 32381) @@ -2707,6 +2707,31 @@ anchor : '100%' }] },{ + columnWidth : colWidth, + layout : 'form', + labelWidth : 160, + hidden:!sstsConfig.printBOMwhenPrintLabel, + labelAlign:"right", + items:[{ + xtype : 'combo', + fieldLabel : '打印标签同时打印包内清单', + id : 'printBOMwhenPrintLabel', + name : 'printBOMwhenPrintLabel', + valueField : 'value', + displayField : 'value', + store : new Ext.data.SimpleStore( { + fields : [ 'value'], + data : [['是'],['否']] + }), + editable : false, + forceSelection : true, + allowBlank : false, + value : '否', + mode : 'local', + triggerAction : 'all', + anchor : '100%' + }] + },{ columnWidth : 1, layout : 'form', labelWidth : fontSize == 12 ? 90 : 100, @@ -3060,6 +3085,9 @@ top.Ext.getCmp('instrumentSetType').setValue(''); top.Ext.getCmp('instrumentSetTypeName').setValue(''); } + if(tousseDefinition.printBOMwhenPrintLabel == ''){ + top.Ext.getCmp('printBOMwhenPrintLabel').setValue('否'); + } } }); } else { Index: ssts-web/src/main/webapp/disinfectsystem/config/szsdsrmyy/print/printConfig.js =================================================================== diff -u -r29678 -r32381 --- ssts-web/src/main/webapp/disinfectsystem/config/szsdsrmyy/print/printConfig.js (.../printConfig.js) (revision 29678) +++ ssts-web/src/main/webapp/disinfectsystem/config/szsdsrmyy/print/printConfig.js (.../printConfig.js) (revision 32381) @@ -1233,4 +1233,8 @@ batchPrintInvoices : invoiceComboPrintConfig_2, //发货物品统计 invoiceItemSummary : invoiceItemSummaryConfig +}; +var printerNameMapping = { + //修改为自己的打印机 + 'BOMprinter' : 'Canon Inkjet MP530 FAX' }; \ No newline at end of file Index: ssts-web/src/main/webapp/disinfectsystem/packing/packingView.js =================================================================== diff -u -r32339 -r32381 --- ssts-web/src/main/webapp/disinfectsystem/packing/packingView.js (.../packingView.js) (revision 32339) +++ ssts-web/src/main/webapp/disinfectsystem/packing/packingView.js (.../packingView.js) (revision 32381) @@ -22,6 +22,9 @@ var idCardTaskNode = null; var MATERIAL_NAME_IDCARD = "器械包标识牌"; var packingBtnText = "装配并打印标签"; +if(sstsConfig.printBOMwhenPrintLabel == true){ + packingBtnText = "装配打印标签和材料清单"; +} if(sstsConfig.printLabelWhenSterilizing == true){ packingBtnText = "装配无菌物品"; } @@ -4402,12 +4405,7 @@ var printGroupType = Ext4.getCmp('printGroupType').getValue(); var cfg = createPrintLabelsConfig(printGroupType); if(tousseesToPrint.length > 0){ -// if(!Ext4.isIE){ -// showResult("目前只支持IE浏览器进行打印!" , null , sstsConfig.messagePauseTimeOnPackingPage); -// return; -// }else{ -// doPrintLabels(tousseesToPrint,cfg); -// } + DWREngine.setAsync(false); doPrintLabels(tousseesToPrint,cfg); if(sstsConfig.enableConfirmNoticeAfterPackingPrint){ @@ -4433,6 +4431,18 @@ } }); } + DWREngine.setAsync(true); + + //SZSDSRMYY-68:打印材料清单 + if(sstsConfig.printBOMwhenPrintLabel){ + var ids = []; + for(var i=0;i 0){ + printTousseDefinitionMaterial(ids.join(';')); + } + } } } function printLabelsAfterConfirmPacking(curTousseesToPrint){