Index: ssts-web/src/main/webapp/disinfectsystem/basedatamanager/sterilizer/sterilizerView.jsp =================================================================== diff -u -r24204 -r24239 --- ssts-web/src/main/webapp/disinfectsystem/basedatamanager/sterilizer/sterilizerView.jsp (.../sterilizerView.jsp) (revision 24204) +++ ssts-web/src/main/webapp/disinfectsystem/basedatamanager/sterilizer/sterilizerView.jsp (.../sterilizerView.jsp) (revision 24239) @@ -27,8 +27,12 @@ <%@ include file="/common/includeExtJsAndCss.jsp"%> +<%@ include file="/common/include_Ext42_Js.jsp"%> +<%@ include file="/disinfectsystem/print/print.jsp"%> + + Index: ssts-web/src/main/webapp/disinfectsystem/basedatamanager/rinser/rinserView.js =================================================================== diff -u -r12331 -r24239 --- ssts-web/src/main/webapp/disinfectsystem/basedatamanager/rinser/rinserView.js (.../rinserView.js) (revision 12331) +++ ssts-web/src/main/webapp/disinfectsystem/basedatamanager/rinser/rinserView.js (.../rinserView.js) (revision 24239) @@ -162,7 +162,7 @@ } }); DWREngine.setAsync(true); - defaultPrint(barcode,name,unit); + print_rinser(barcode,name,unit); } }else{ MsgTip.msg('提示','未选择打印的内容!',true,3); @@ -200,4 +200,19 @@ items : grid }] }); -}); \ No newline at end of file +}); + +function print_rinser(barcode,name,unitName,printType) { + var obj = { + barcode:barcode, + name:name, + unitName:unitName, + defaultPrintFun: function(){ + defaultPrint(barcode,name,unitName); + }, + dataSourceName: '清洗机', + styleName: '默认', + _printType: printType + } + printObjWithdefaultPrintFun(obj); +}; \ No newline at end of file Index: ssts-web/src/main/webapp/disinfectsystem/basedatamanager/rinser/rinserForm.js =================================================================== diff -u -r19620 -r24239 --- ssts-web/src/main/webapp/disinfectsystem/basedatamanager/rinser/rinserForm.js (.../rinserForm.js) (revision 19620) +++ ssts-web/src/main/webapp/disinfectsystem/basedatamanager/rinser/rinserForm.js (.../rinserForm.js) (revision 24239) @@ -621,10 +621,10 @@ }); DWREngine.setAsync(true); if(type == 0){//直接打印 - defaultPrint(barcodeStr,name,unit); + print_rinser(barcodeStr,name,unit,'print'); }else{//打印预览 var barcode = top.Ext.getCmp('barcode').getValue(); - preview(barcode,name,unit); + print_rinser(barcode,name,unit,'preview'); } } Index: ssts-web/src/main/webapp/disinfectsystem/basedatamanager/tousse/tousseForm.js =================================================================== diff -u -r24096 -r24239 --- ssts-web/src/main/webapp/disinfectsystem/basedatamanager/tousse/tousseForm.js (.../tousseForm.js) (revision 24096) +++ ssts-web/src/main/webapp/disinfectsystem/basedatamanager/tousse/tousseForm.js (.../tousseForm.js) (revision 24239) @@ -2863,7 +2863,7 @@ } }); DWREngine.setAsync(true); - preview(barcode,name,unitName2); + preview_fixedBarcode(barcode,name,unitName2); } }, failure : function(response, options) { @@ -2872,4 +2872,20 @@ } }); } -} \ No newline at end of file +} + +// 打印预览 +function preview_fixedBarcode(barcode,name,unitName) { + var obj = { + barcode:barcode, + name:name, + unitName:unitName, + defaultPrintFun: function(){ + preview_fixedBarcode(barcode,name,unitName); + }, + dataSourceName: '固定条码', + styleName: '默认', + _printType: 'preview' + } + printObjWithdefaultPrintFun(obj); +}; \ No newline at end of file Index: ssts-web/src/main/webapp/disinfectsystem/basedatamanager/rinser/rinserView.jsp =================================================================== diff -u -r24206 -r24239 --- ssts-web/src/main/webapp/disinfectsystem/basedatamanager/rinser/rinserView.jsp (.../rinserView.jsp) (revision 24206) +++ ssts-web/src/main/webapp/disinfectsystem/basedatamanager/rinser/rinserView.jsp (.../rinserView.jsp) (revision 24239) @@ -10,8 +10,12 @@ <%@ include file="/common/includeExtJsAndCss.jsp"%> +<%@ include file="/common/include_Ext42_Js.jsp"%> +<%@ include file="/disinfectsystem/print/print.jsp"%> + + Index: ssts-web/src/main/webapp/disinfectsystem/basedatamanager/sterilizer/sterilizerView.js =================================================================== diff -u -r21632 -r24239 --- ssts-web/src/main/webapp/disinfectsystem/basedatamanager/sterilizer/sterilizerView.js (.../sterilizerView.js) (revision 21632) +++ ssts-web/src/main/webapp/disinfectsystem/basedatamanager/sterilizer/sterilizerView.js (.../sterilizerView.js) (revision 24239) @@ -238,7 +238,7 @@ } }); DWREngine.setAsync(true); - defaultPrint(barcode,name,unit); + print_sterilizer(barcode,name,unit,'preview'); } }else{ MsgTip.msg('提示','未选择打印的内容!',true,3); @@ -279,4 +279,18 @@ } ] }); - }); \ No newline at end of file + }); +function print_sterilizer(barcode,name,unitName,printType) { + var obj = { + barcode:barcode, + name:name, + unitName:unitName, + defaultPrintFun: function(){ + defaultPrint(barcode,name,unitName); + }, + dataSourceName: '灭菌炉', + styleName: '默认', + _printType: printType + } + printObjWithdefaultPrintFun(obj); +}; \ No newline at end of file Index: ssts-web/src/main/webapp/disinfectsystem/basedatamanager/sterilizer/sterilizerForm.js =================================================================== diff -u -r21632 -r24239 --- ssts-web/src/main/webapp/disinfectsystem/basedatamanager/sterilizer/sterilizerForm.js (.../sterilizerForm.js) (revision 21632) +++ ssts-web/src/main/webapp/disinfectsystem/basedatamanager/sterilizer/sterilizerForm.js (.../sterilizerForm.js) (revision 24239) @@ -984,10 +984,10 @@ }); DWREngine.setAsync(true); if(type == 0){//直接打印 - defaultPrint(barcodeStr,name,unit); + print_sterilizer(barcodeStr,name,unit,'print'); }else{//打印预览 var barcode = top.Ext.getCmp('barcode').getValue(); - preview(barcode,name,unit); + print_sterilizer(barcode,name,unit,'preview'); } }