Index: ssts-web/src/main/webapp/disinfectsystem/print/print.jsp
===================================================================
diff -u
--- ssts-web/src/main/webapp/disinfectsystem/print/print.jsp	(revision 0)
+++ ssts-web/src/main/webapp/disinfectsystem/print/print.jsp	(revision 15109)
@@ -0,0 +1,55 @@
+<%@page import="java.util.LinkedList"%>
+<%@page import="org.apache.velocity.runtime.directive.Foreach"%>
+<%@page import="com.forgon.disinfectsystem.labeltemplate.service.*"%>
+<%@page import="com.forgon.disinfectsystem.entity.labeltemplate.*"%>
+<%@page import="java.util.Map"%>
+<%@page import="java.util.Date"%>
+<%
+	LabelTemplateManager labelTemplateManager = (LabelTemplateManager)SpringBeanManger.getBean("labelTemplateManager");
+	String allTemplateInfoJsonStr = labelTemplateManager.getAllTemplateInfoJsonStr();
+	List<LabelTemplate> allTemplateList = labelTemplateManager.getAllTemplate();
+	List<String> allTemplateJson = new LinkedList<String>();
+	if(allTemplateList != null){
+		for(int i=0;i<allTemplateList.size();++i){
+			allTemplateJson.add(labelTemplateManager.toJsonStr(allTemplateList.get(i)));
+		}
+	}
+	request.setAttribute("allTemplateJson",allTemplateJson);
+	request.setAttribute("TEMPLATE_NAME_PREFIX",LabelTemplate.TEMPLATE_NAME_PREFIX);
+	request.setAttribute("allTemplateInfoJsonStr",allTemplateInfoJsonStr);
+	request.setAttribute("allTemplateList",allTemplateList);
+%>
+<script language="javascript" src="${ctx}/disinfectsystem/labelTemplateDesign/dataSource.js"></script>
+<script language="javascript" src="${ctx}/disinfectsystem/labelTemplateDesign/configObj.js"></script>
+<script type="text/javascript">
+var PRINT_TEMPLATE_NAME_PREFIX = '${TEMPLATE_NAME_PREFIX}';
+var allTemplate = {};
+var allTemplateArray = ${allTemplateInfoJsonStr};
+
+Ext4.onReady(function() {
+	for(var i=0;i<allTemplateArray.length;++i){
+		var t = allTemplateArray[i];
+		allTemplate[t.name] = transformTemplateConfigObjs(t);
+	}
+});
+
+<c:forEach items="${allTemplateList}" var="printTemplate" varStatus="status">
+function printTemplate_${printTemplate.name}(obj){
+	doGetLodop();
+	var templateName = '${printTemplate.name}';
+	var template = allTemplate[templateName];
+	${printTemplate.programCodes}
+	// 根据配置打印表格
+	var tableConfigs = template.templateInfo.tableConfigs;
+	for(var i=0;i<tableConfigs.length;++i){
+		var tableConfig = tableConfigs[i];
+		var itemName = 'table_'+tableConfig.tableDataSourceName;
+		var tableHtml = createTableHtmlByConfig(tableConfig,obj);
+		LODOP.ADD_PRINT_TABLE(tableConfig.topforPrint,tableConfig.leftforPrint,tableConfig.widthforPrint,tableConfig.heightforPrint,tableHtml);
+		LODOP.SET_PRINT_STYLEA(0, "ItemType",4);// 多页项
+		LODOP.SET_PRINT_STYLEA(0, "ItemName",'table1');// 多页项
+	}
+}
+</c:forEach>
+</script>
+
Index: ssts-web/src/main/webapp/disinfectsystem/print/print.js
===================================================================
diff -u -r15031 -r15109
--- ssts-web/src/main/webapp/disinfectsystem/print/print.js	(.../print.js)	(revision 15031)
+++ ssts-web/src/main/webapp/disinfectsystem/print/print.js	(.../print.js)	(revision 15109)
@@ -916,10 +916,14 @@
 	return true;
 }
 
-//打印装配包
+// 打印普通器械包
 function defaultPrintPackage(obj) {
-	
 	var pageType = obj.pageType;
+	if(isTemplatePageType(pageType)){
+		if(invokeTemplatePrintFunction(pageType,obj)){
+			return;
+		}
+	}
 	if (!isUndefinedOrNullOrEmpty(obj.barcode)) {
 		setFormTypeOfPrintedByPageType(obj.tousseType,pageType);
 		print(obj);
@@ -1063,9 +1067,12 @@
 	}
 }
 function setPrinterByConfig(){
+	setPrinterByConfigName(formTypeOfPrinted);
+}
+function setPrinterByConfigName(name){
 	// 读取配置，如果没有获取到对应的打印机，则会用默认打印机打印。
 	doGetLodop();
-	var printerName = getPrinterNameByType(formTypeOfPrinted);
+	var printerName = getPrinterNameByType(name);
 	if(printerName == null){
 		// 未配置，设置为默认打印机
 		LODOP.SET_PRINTER_INDEX(-1);
@@ -2791,17 +2798,34 @@
 }
 // 用obj中的属性填充到字符串str的变量中，变量格式为${propertyName}
 function fillPropertiesFromObj(obj, str) {
-	var reg = /\$\{[\w]*\}/g;
+	var reg = /\$\{[\w\.]*\}/g;
 	var str2 = str.replace(reg, function(substr, submatch) {
 		var proName = substr.substring(2,substr.length-1);
-		if(proName == '' || isUndefinedOrNull(obj[proName])){
-			return'';
+		var v = getLeafValue(obj,proName);
+		if(proName == '' || isUndefinedOrNull(v)){
+			return '';
 		}else{
-			return obj[proName];
+			return v;
 		}
 	})
 	return str2;
 }
+function getLeafValue(obj,path) {
+	if(path.indexOf('.') == -1){
+		return obj[path];
+	}else{
+		var paths = path.split('.');
+		var res = obj;
+		for (var i=0;i<paths.length;i++){
+			if(!isUndefinedOrNull(res[paths[i]])){
+				res = res[paths[i]];
+			}else{
+				return undefined;
+			}
+		}
+		return res;
+	}
+}
 // 根据包名获取是第几个包，默认是1
 function deleteTousseNumber(tousseName) {
 	var name = tousseName;
@@ -2889,3 +2913,42 @@
 		invoicesInfo.disinfectGoods = newGoods;
 	}
 }
+
+// 是否模板标签类型
+function isTemplatePageType(pageType){
+	pageType = pageType+'';
+	if(pageType.indexOf(PRINT_TEMPLATE_NAME_PREFIX) == 0){
+		return true;
+	}
+	return false;
+}
+function getRawTemplateName(pageType){
+	if(isTemplatePageType(pageType)){
+		return pageType.substr(PRINT_TEMPLATE_NAME_PREFIX.length);
+	}
+	return null;
+}
+// 获取模板标签打印方法名
+function getTemplatePrintFunName(pageType){
+	if(isTemplatePageType(pageType)){
+		var templateName = getRawTemplateName(pageType);
+//		alert(templateName)
+		if(templateName != null){
+			return 'printTemplate_'+templateName;
+		}
+	}
+	return null;
+}
+
+function invokeTemplatePrintFunction(pageType,obj){
+	var funName = getTemplatePrintFunName(pageType);
+	if(funName != null && !isUndefinedOrNull(window[funName])){
+		doGetLodop();
+//		alert(window[funName])
+		window[funName](obj);
+		setPrinterByConfigName(pageType);
+		LODOP.PRINT();
+		return true;
+	}
+	return false;
+}
\ No newline at end of file