Index: ssts-web/src/main/webapp/disinfectsystem/print/print.js
===================================================================
diff -u -r15109 -r15200
--- ssts-web/src/main/webapp/disinfectsystem/print/print.js	(.../print.js)	(revision 15109)
+++ ssts-web/src/main/webapp/disinfectsystem/print/print.js	(.../print.js)	(revision 15200)
@@ -872,6 +872,21 @@
 	}
 	formTypeOfPrinted = formType;
 }
+function getFormTypeByPageType(tousseType,pageType){
+	var formType = pageTypeToFormTypeOfPrinted(tousseType,pageType);
+	if(formType == ''){
+		formType = "smallLabel";
+	}
+	return formType;
+}
+function getConfigObj(obj){
+	var formType = getFormTypeByPageType(obj.tousseType,obj.pageType);
+	var myObj = printConfig[formType];
+	if(isUndefinedOrNullOrEmpty(myObj)){
+		return null;
+	}
+	return myObj;
+}
 function pageTypeToFormTypeOfPrinted(tousseType,pageType){
 	var formType = '';
 	if(pageType == "加大标签"){
@@ -937,7 +952,9 @@
 			LODOP.SET_PRINTER_INDEX(printerName);
 		}
 		// jeff li 2015/6/26，增加选择打印机的功能
-		LODOP.PRINT();
+		if(isUndefinedOrNull(obj.noPrinting)){
+			LODOP.PRINT();
+		}
 //		LODOP.PRINT_DESIGN ();// 打印设计
 //		LODOP.PREVIEW();//打印预览
 	} else {