Index: ssts-web/src/main/webapp/disinfectsystem/print/print.js =================================================================== diff -u -r24571 -r24682 --- ssts-web/src/main/webapp/disinfectsystem/print/print.js (.../print.js) (revision 24571) +++ ssts-web/src/main/webapp/disinfectsystem/print/print.js (.../print.js) (revision 24682) @@ -5,7 +5,8 @@ var PRINT_FORM_TYPE_RECYCLINGRECORD = "recycling"; // 回收单 var PRINT_FORM_TYPE_BORROW = "borrow"; // 借物单 var PRINT_FORM_TYPE_INVOICE = "invoice"; // 发货单 - +var PRINT_TYPE_PREVIEW = 'preview'; +var PRINT_TYPE_PRINT = 'print'; var paperType = 1; var totalRows = 8; // 每页打印的行数 var totalColums = 7; Index: ssts-web/src/main/webapp/disinfectsystem/basedatamanager/container/containerView.jsp =================================================================== diff -u -r24253 -r24682 --- ssts-web/src/main/webapp/disinfectsystem/basedatamanager/container/containerView.jsp (.../containerView.jsp) (revision 24253) +++ ssts-web/src/main/webapp/disinfectsystem/basedatamanager/container/containerView.jsp (.../containerView.jsp) (revision 24682) @@ -12,8 +12,11 @@ <%@ 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/container/containerView.js =================================================================== diff -u -r17153 -r24682 --- ssts-web/src/main/webapp/disinfectsystem/basedatamanager/container/containerView.js (.../containerView.js) (revision 17153) +++ ssts-web/src/main/webapp/disinfectsystem/basedatamanager/container/containerView.js (.../containerView.js) (revision 24682) @@ -254,7 +254,7 @@ } }); DWREngine.setAsync(true); - defaultPrint(barcode,name,unitName2); + print_container(barcode,name,unitName2); } }else{ MsgTip.msg('提示','未选择打印的内容!',true,3); @@ -303,4 +303,23 @@ } ] }); - }); \ No newline at end of file + }); + +function print_container(barcode,name,unitName,printType) { + var obj = { + barcode:barcode, + name:name, + unitName:unitName, + defaultPrintFun: function(){ + if(printType == PRINT_TYPE_PREVIEW){ + preview(barcode,name,unitName); + }else{ + defaultPrint(barcode,name,unitName); + } + }, + dataSourceName: '篮筐', + styleName: '默认', + _printType: printType + } + printObjWithdefaultPrintFun(obj); +}; \ No newline at end of file Index: ssts-web/src/main/webapp/disinfectsystem/print/print.jsp =================================================================== diff -u -r15117 -r24682 --- ssts-web/src/main/webapp/disinfectsystem/print/print.jsp (.../print.jsp) (revision 15117) +++ ssts-web/src/main/webapp/disinfectsystem/print/print.jsp (.../print.jsp) (revision 24682) @@ -1,3 +1,4 @@ +<%@ page contentType="text/html; charset=UTF-8"%> <%@page import="java.util.LinkedList"%> <%@page import="org.apache.velocity.runtime.directive.Foreach"%> <%@page import="com.forgon.disinfectsystem.labeltemplate.service.*"%> Index: ssts-web/src/main/webapp/disinfectsystem/labelTemplateDesign/dataSource.js =================================================================== diff -u -r24656 -r24682 --- ssts-web/src/main/webapp/disinfectsystem/labelTemplateDesign/dataSource.js (.../dataSource.js) (revision 24656) +++ ssts-web/src/main/webapp/disinfectsystem/labelTemplateDesign/dataSource.js (.../dataSource.js) (revision 24682) @@ -651,4 +651,22 @@ textForPreview: '妇幼医院' })] }); -objectDataSourceManager.registerDataSource(sterilisationMethodDataSource); \ No newline at end of file +objectDataSourceManager.registerDataSource(sterilisationMethodDataSource); +// 篮筐 +var containerDataSource = new ObjectDataSource({ + name: '篮筐', + objectProperties: [new ObjectDataSourceProperty({ + propName: 'barcode', + displayName: '条码', + textForPreview: '010000110' + }),new ObjectDataSourceProperty({ + propName: 'name', + displayName: '名字', + textForPreview: '灭菌筐01' + }),new ObjectDataSourceProperty({ + propName: 'unitName', + displayName: '单位名称', + textForPreview: '妇幼医院' + })] +}); +objectDataSourceManager.registerDataSource(containerDataSource); \ No newline at end of file Index: ssts-web/src/main/webapp/disinfectsystem/basedatamanager/container/containerForm.js =================================================================== diff -u -r19820 -r24682 --- ssts-web/src/main/webapp/disinfectsystem/basedatamanager/container/containerForm.js (.../containerForm.js) (revision 19820) +++ ssts-web/src/main/webapp/disinfectsystem/basedatamanager/container/containerForm.js (.../containerForm.js) (revision 24682) @@ -207,7 +207,7 @@ } }); DWREngine.setAsync(true); - preview(barcode,name,unitName2); + print_container(barcode,name,unitName2,PRINT_TYPE_PREVIEW); } function containerDefaultPrint(barcodeStr){ @@ -219,7 +219,7 @@ unitName2 = unitName; } }); - defaultPrint(barcodeStr,name,unitName2);//打印条码 + print_container(barcodeStr,name,unitName2,PRINT_TYPE_PRINT);//打印条码 } function validateAndSubmit(print){