Index: ssts-web/src/main/webapp/disinfectsystem/labelTemplateDesign/printCustomDesign.js
===================================================================
diff -u -r15199 -r15476
--- ssts-web/src/main/webapp/disinfectsystem/labelTemplateDesign/printCustomDesign.js	(.../printCustomDesign.js)	(revision 15199)
+++ ssts-web/src/main/webapp/disinfectsystem/labelTemplateDesign/printCustomDesign.js	(.../printCustomDesign.js)	(revision 15476)
@@ -31,6 +31,17 @@
 	};
 var obj = templateObj;
 
+
+function getTemplateObj(dataSourceByName){
+	var ods = objectDataSourceManager.getDataSourceByName(currentConfig.dataSourceName);
+	obj =  ods.getTemplateObj();
+}
+function getPreviewObj(){
+	var ods = objectDataSourceManager.getDataSourceByName(currentConfig.dataSourceName);
+	obj =  ods.getPreviewObj();
+}
+
+
 function getLODOP2(){
 	LODOP = getLodop(document.getElementById('LODOP2'), document
 			.getElementById('LODOP_EM2'));
@@ -68,7 +79,7 @@
 	LODOP.SET_PRINT_MODE("PROGRAM_CONTENT_BYVAR", true);// 生成程序时，内容参数有变量用变量，无变量用具体值
 };
 function DisplayDesign() {
-	obj = templateObj;
+	getTemplateObj();
 	CreatePage();
 	if(!isUndefinedOrNullOrEmpty(currentConfig.programCodes)){
 //		alert(currentConfig.programCodes)
@@ -238,7 +249,7 @@
 function prn_Preview() {
 	getLODOP2();
 	getProgram();
-	obj = previewObj;
+	getPreviewObj();
 	if(!isUndefinedOrNullOrEmpty(currentConfig.programCodes)){
 //		alert(currentConfig.programCodes)
 		eval(currentConfig.programCodes);// 执行eval方法，装载模板