Index: ssts-web/src/main/webapp/disinfectsystem/print/print2.jsp
===================================================================
diff -u
--- ssts-web/src/main/webapp/disinfectsystem/print/print2.jsp	(revision 0)
+++ ssts-web/src/main/webapp/disinfectsystem/print/print2.jsp	(revision 24571)
@@ -0,0 +1,76 @@
+<%@ 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.*"%>
+<%@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 type="text/javascript" src="${ctx}/disinfectsystem/labelTemplateDesign/dataSource2.js"></script>
+<script type="text/javascript" src="${ctx}/disinfectsystem/labelTemplateDesign/configObj2.js"></script>
+<script type="text/javascript" src="${ctx}/dwr/interface/LabelTemplateTableManager.js"></script>
+<script type="text/javascript">
+
+var PRINT_TEMPLATE_NAME_PREFIX = '${TEMPLATE_NAME_PREFIX}';
+var allTemplate = {};
+var allTemplateArray = [];
+
+$(function() {
+	$.ajax({
+		url:"/disinfectSystem/print/labelTemplateController/getAllTemplatesJSONArray.mhtml",
+		dataType: "json", 
+	    async: false, 
+	    //data: {"barcode":barcode}, 
+	    type: "post", 
+	    success:function(result){
+	    	 allTemplateArray = result;
+	    	 //if(result.success == true){
+	    		// allTemplateArray = JSON.parse(result);
+	    	 //}else{
+	    		// alert(result.message);
+	    	 //}
+	    }
+	})
+	
+	for(var i=0;i<allTemplateArray.length;++i){
+		var t = allTemplateArray[i];
+		//alert(t.name)
+		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/labelTemplateDesign/dataSource2.js
===================================================================
diff -u
--- ssts-web/src/main/webapp/disinfectsystem/labelTemplateDesign/dataSource2.js	(revision 0)
+++ ssts-web/src/main/webapp/disinfectsystem/labelTemplateDesign/dataSource2.js	(revision 24571)
@@ -0,0 +1,672 @@
+function dingxiang_apply(object, config, defaults) {
+        if (defaults) {
+        	dingxiang_apply(object, defaults);
+        }
+
+        if (object && config && typeof config === 'object') {
+        	var property;
+
+        	for (property in config) {
+        		object[property] = config[property];
+            }
+        }
+        return object;
+}
+
+function dingxiang_applyIf(object, config) {
+    var property;
+
+    if (object) {
+        for (property in config) {
+            if (object[property] === undefined) {
+                object[property] = config[property];
+            }
+        }
+    }
+
+    return object;
+}
+
+function dingxiang_setConfig(object, config){
+	var property;
+    if (object && config) {
+        for (property in config) {
+        	object[property] = config[property];
+        }
+    }
+    return object;
+}
+// 表格数据源
+function TableDataSourceItem(config){
+	dingxiang_apply(this,config,{
+		propName:'',
+		displayName:''
+	})
+}
+TableDataSourceItem.prototype.getVariableStr = function(){
+	return '${'+ this.propName +'}';
+}
+
+function TableDataSource(config){
+	dingxiang_apply(this,config,{
+		name: '',
+		itemsPropName: 'dataItems',
+		dataSourceItems: []
+	})
+}
+TableDataSource.prototype.getDataSourceItemNamesForCombo = function(itemsPerRow){
+	var s = [];
+	for(var t=1;t<=itemsPerRow;++t){
+		for(var i=0;i<this.dataSourceItems.length;++i){
+    		var dataSourceItem = this.dataSourceItems[i];
+//    		var o = {
+//    				variableStr: dataSourceItem.getVariableStr(),
+//					displayName: dataSourceItem.displayName
+//    		}
+    		var o = [dataSourceItem.displayName+t,'${item' + t+'.' + dataSourceItem.propName +'}'];
+    		s.push(o);
+    	}
+	}
+	
+	return s;
+}
+function TableDataSourceManager(config){
+	dingxiang_apply(this,config,{
+		tableDataSources: {}
+	})
+}
+TableDataSourceManager.prototype.getTableDataSourceByName = function(name){
+	return this.tableDataSources[name];
+}
+TableDataSourceManager.prototype.registerTableDataSource = function(tableDataSource){
+	this.tableDataSources[tableDataSource.name] = tableDataSource;
+}
+TableDataSourceManager.prototype.getDataSourceNamesForCombo = function(){
+	var s = [];
+	for(var p in this.tableDataSources){
+		if(this.tableDataSources.hasOwnProperty(p)){
+			var o = [this.tableDataSources[p].name];
+//			alert(o.name)
+    		s.push(o);
+		 }
+	}
+	return s;
+}	
+//对象数据源
+function ObjectDataSourceProperty(config){
+	dingxiang_apply(this,config,{
+		propName:'',
+		displayName:'',
+		textForPreview:''
+	})
+}
+ObjectDataSourceProperty.prototype.getVariableStr = function(){
+	return '${'+ this.propName +'}';
+}
+
+function ObjectDataSource(config){
+	dingxiang_apply(this,config,{
+		name: '',
+		objectProperties: []
+	})
+}
+ObjectDataSource.prototype.getTemplateObj = function(){
+	var obj = {};
+	for(var i=0;i<this.objectProperties.length;++i){
+		var dataSourceItem = this.objectProperties[i];
+		obj[dataSourceItem.propName] = dataSourceItem.displayName;
+	}
+	// 固定属性
+	obj['barcode'] = '条码文本';
+	return obj;
+}
+ObjectDataSource.prototype.getPreviewObj = function(){
+	var obj = {};
+	for(var i=0;i<this.objectProperties.length;++i){
+		var dataSourceItem = this.objectProperties[i];
+		obj[dataSourceItem.propName] = dataSourceItem.textForPreview;
+	}
+	// 固定属性
+	obj['barcode'] = '010000001';
+	return obj;
+}
+function ObjectDataSourceManager(config){
+	dingxiang_apply(this,config,{
+		dataSources: {}
+	})
+}
+ObjectDataSourceManager.prototype.getDataSourceByName = function(name){
+	return this.dataSources[name];
+}
+ObjectDataSourceManager.prototype.registerDataSource = function(dataSource){
+	this.dataSources[dataSource.name] = dataSource;
+}
+ObjectDataSourceManager.prototype.getDataSourceNamesForCombo = function(){
+	var s = [];
+	for(var p in this.dataSources){
+		if(this.dataSources.hasOwnProperty(p)){
+			var o = [this.dataSources[p].name];
+    		s.push(o);
+		 }
+	}
+	return s;
+}
+
+var tableDataSourceManager = new TableDataSourceManager();
+// 器械包材料表格的数据源
+var tableDataSource = new TableDataSource({
+	name: '器械包材料',
+	itemsPropName: 'materials',
+	dataSourceItems: [new TableDataSourceItem({
+		propName: 'name',
+		displayName: '材料名称'
+	}),new TableDataSourceItem({
+		propName: 'count',
+		displayName: '材料数量'
+	}),new TableDataSourceItem({
+		propName: 'price',
+		displayName: '材料单价'
+	}),new TableDataSourceItem({
+		propName: 'specification',
+		displayName: '材料规格'
+	})]
+});
+tableDataSourceManager.registerTableDataSource(tableDataSource);
+// 聚合包明细表格的数据源
+var tableDataSource_comboTousseDetails = new TableDataSource({
+	name: '聚合包明细',
+	itemsPropName: 'comboTousseNameAmountInfo',
+	dataSourceItems: [new TableDataSourceItem({
+		propName: 'name',
+		displayName: '包名'
+	}),new TableDataSourceItem({
+		propName: 'count',
+		displayName: '数量'
+	})]
+});
+tableDataSourceManager.registerTableDataSource(tableDataSource_comboTousseDetails);
+// 注册对象数据源
+var objectDataSourceManager = new ObjectDataSourceManager();
+var normalTousseDataSource = new ObjectDataSource({
+	name: '普通器械包',
+	objectProperties: [new ObjectDataSourceProperty({
+		propName: 'name',
+		displayName: '(科室)包名',
+		textForPreview: '(急诊科)缝合包'
+	}),new ObjectDataSourceProperty({
+		propName: 'tousseNameWithoutDepart',
+		displayName: '包名',
+		textForPreview: '缝合包'
+	}),new ObjectDataSourceProperty({
+		propName: 'operator',
+		displayName: '配包人',
+		textForPreview: '张三'
+	}),new ObjectDataSourceProperty({
+		propName: 'wrapperForPrint',
+		displayName: '包装人',
+		textForPreview: '张三'
+	}),new ObjectDataSourceProperty({
+		propName: 'reviewer',
+		displayName: '审核人',
+		textForPreview: '李四'
+	}),new ObjectDataSourceProperty({
+		propName: 'sterilizationDate',
+		displayName: '灭菌日期',
+		textForPreview: '2016-09-10'
+	}),new ObjectDataSourceProperty({
+		propName: 'validDate',
+		displayName: '失效日期',
+		textForPreview: '2016-09-17'
+	}),new ObjectDataSourceProperty({
+		propName: 'sterileDateTime2',
+		displayName: '灭菌日期2',
+		textForPreview: '2016-09-10 12:00'
+	}),new ObjectDataSourceProperty({
+		propName: 'expirationDateTime2',
+		displayName: '失效日期2',
+		textForPreview: '2016-09-17 23:50'
+	}),new ObjectDataSourceProperty({
+		propName: 'sterilizationUser',
+		displayName: '灭菌员',
+		textForPreview: '张三'
+	}),new ObjectDataSourceProperty({
+		propName: 'sterilingType',
+		displayName: '灭菌程序',
+		textForPreview: 'P1'
+	}),new ObjectDataSourceProperty({
+		propName: 'sterilisationAbbreviation',
+		displayName: '灭菌程序简称',
+		textForPreview: 'P'
+	}),new ObjectDataSourceProperty({
+		propName: 'virtualBasketSeqNum',
+		displayName: '虚拟篮筐号',
+		textForPreview: '026'
+	}),new ObjectDataSourceProperty({
+		propName: 'depart',
+		displayName: '科室',
+		textForPreview: '急诊科'
+	}),new ObjectDataSourceProperty({
+		propName: 'sterilizer',
+		displayName: '炉号',
+		textForPreview: '1号灭菌炉'
+	}),new ObjectDataSourceProperty({
+		propName: 'frequency',
+		displayName: '炉次',
+		textForPreview: '2'
+	}),new ObjectDataSourceProperty({
+		propName: 'hospitalName',
+		displayName: '医院名称',
+		textForPreview: '广东省人民医院'
+	}),new ObjectDataSourceProperty({
+		propName: 'remark',
+		displayName: '备注',
+		textForPreview: '缺一把剪刀'
+	}),new ObjectDataSourceProperty({
+		propName: 'materialAmount',
+		displayName: '器械总数',
+		textForPreview: '5'
+	}),new ObjectDataSourceProperty({
+		propName: 'totalAmount',
+		displayName: '材料总数',
+		textForPreview: '10'
+	}),new ObjectDataSourceProperty({
+		propName: 'includedTousseAmount',
+		displayName: '聚合包总个数',
+		textForPreview: '10'
+	}),new ObjectDataSourceProperty({
+		propName: 'reduceDescription',
+		displayName: '丢失材料描述',
+		textForPreview: '剪刀x1'
+	}),new ObjectDataSourceProperty({
+		propName: 'damageDescription',
+		displayName: '报损材料描述',
+		textForPreview: '镊子x1'
+	}),new ObjectDataSourceProperty({
+		propName: 'packageType',
+		displayName: '包装类型',
+		textForPreview: '无纺布'
+	})]
+});
+objectDataSourceManager.registerDataSource(normalTousseDataSource);
+//外来器械包
+var foreignTousseDataSource = new ObjectDataSource({
+	name: '外来器械包',
+	objectProperties: [new ObjectDataSourceProperty({
+		propName: 'name',
+		displayName: '(科室)包名',
+		textForPreview: '(急诊科)缝合包'
+	}),new ObjectDataSourceProperty({
+		propName: 'tousseNameWithoutDepart',
+		displayName: '包名',
+		textForPreview: '缝合包'
+	}),new ObjectDataSourceProperty({
+		propName: 'operator',
+		displayName: '配包人',
+		textForPreview: '张三'
+	}),new ObjectDataSourceProperty({
+		propName: 'reviewer',
+		displayName: '审核人',
+		textForPreview: '李四'
+	}),new ObjectDataSourceProperty({
+		propName: 'sterilizationDate',
+		displayName: '灭菌日期',
+		textForPreview: '2016-09-10'
+	}),new ObjectDataSourceProperty({
+		propName: 'validDate',
+		displayName: '失效日期',
+		textForPreview: '2016-09-17'
+	}),new ObjectDataSourceProperty({
+		propName: 'sterilizationUser',
+		displayName: '灭菌员',
+		textForPreview: '张三'
+	}),new ObjectDataSourceProperty({
+		propName: 'sterilingType',
+		displayName: '灭菌程序',
+		textForPreview: 'P1'
+	}),new ObjectDataSourceProperty({
+		propName: 'sterilisationAbbreviation',
+		displayName: '灭菌程序简称',
+		textForPreview: 'P'
+	}),new ObjectDataSourceProperty({
+		propName: 'virtualBasketSeqNum',
+		displayName: '虚拟篮筐号',
+		textForPreview: '026'
+	}),new ObjectDataSourceProperty({
+		propName: 'depart',
+		displayName: '科室',
+		textForPreview: '急诊科'
+	}),new ObjectDataSourceProperty({
+		propName: 'invoicePlanDepart',
+		displayName: '申请科室',
+		textForPreview: '急诊科'
+	}),new ObjectDataSourceProperty({
+		propName: 'processType',
+		displayName: '处理方式',
+		textForPreview: '加急'
+	}),new ObjectDataSourceProperty({
+		propName: 'sterilizer',
+		displayName: '炉号',
+		textForPreview: '1号灭菌炉'
+	}),new ObjectDataSourceProperty({
+		propName: 'frequency',
+		displayName: '炉次',
+		textForPreview: '2'
+	}),new ObjectDataSourceProperty({
+		propName: 'hospitalName',
+		displayName: '医院名称',
+		textForPreview: '广东省人民医院'
+	}),new ObjectDataSourceProperty({
+		propName: 'hospitalNumber',
+		displayName: '住院号',
+		textForPreview: '001'
+	}),new ObjectDataSourceProperty({
+		propName: 'patientArea',
+		displayName: '病区',
+		textForPreview: '10'
+	}),new ObjectDataSourceProperty({
+		propName: 'patient',
+		displayName: '病人',
+		textForPreview: '张三'
+	}),new ObjectDataSourceProperty({
+		propName: 'patientAge',
+		displayName: '病人年龄',
+		textForPreview: '22'
+	}),new ObjectDataSourceProperty({
+		propName: 'patientSex',
+		displayName: '病人性别',
+		textForPreview: '男'
+	}),new ObjectDataSourceProperty({
+		propName: 'bedNumber',
+		displayName: '床位号',
+		textForPreview: '1'
+	}),new ObjectDataSourceProperty({
+		propName: 'roomNumber',
+		displayName: '病室',
+		textForPreview: '601'
+	}),new ObjectDataSourceProperty({
+		propName: 'ascriptionDepartment',
+		displayName: '病人所属科室',
+		textForPreview: '口腔科'
+	}),new ObjectDataSourceProperty({
+		propName: 'doctor',
+		displayName: '手术医生',
+		textForPreview: '孙逸仙'
+	}),new ObjectDataSourceProperty({
+		propName: 'supplierName',
+		displayName: '外来器械供应商',
+		textForPreview: '康复'
+	}),new ObjectDataSourceProperty({
+		propName: 'supplierContactName',
+		displayName: '供应商联系人',
+		textForPreview: '张三'
+	}),new ObjectDataSourceProperty({
+		propName: 'supplierPhoneNumber',
+		displayName: '供应商联系人电话',
+		textForPreview: '18912345678'
+	}),new ObjectDataSourceProperty({
+		propName: 'operationTime',
+		displayName: '手术时间',
+		textForPreview: '2017-02-27'
+	}),new ObjectDataSourceProperty({
+		propName: 'operationRoom',
+		displayName: '手术间',
+		textForPreview: '1号手术室'
+	}),new ObjectDataSourceProperty({
+		propName: 'surgery',
+		displayName: '手术名称',
+		textForPreview: '扁桃体切除'
+	}),new ObjectDataSourceProperty({
+		propName: 'toolAmount',
+		displayName: '工具件数',
+		textForPreview: '50'
+	}),new ObjectDataSourceProperty({
+		propName: 'implantAmount',
+		displayName: '植入物件数',
+		textForPreview: '10'
+	}),new ObjectDataSourceProperty({
+		propName: 'packageType',
+		displayName: '包装类型',
+		textForPreview: '无纺布'
+	}),new ObjectDataSourceProperty({
+		propName: 'remark',
+		displayName: '备注',
+		textForPreview: '测试备注'
+	})]
+});
+objectDataSourceManager.registerDataSource(foreignTousseDataSource);
+// 外部代理灭菌包
+var foreignProxyDisinfectionTousseDataSource = new ObjectDataSource({
+	name: '外部代理灭菌包',
+	objectProperties: [new ObjectDataSourceProperty({
+		propName: 'name',
+		displayName: '(科室)包名',
+		textForPreview: '(急诊科)缝合包'
+	}),new ObjectDataSourceProperty({
+		propName: 'tousseNameWithoutDepart',
+		displayName: '包名',
+		textForPreview: '缝合包'
+	}),new ObjectDataSourceProperty({
+		propName: 'operator',
+		displayName: '配包人',
+		textForPreview: '张三'
+	}),new ObjectDataSourceProperty({
+		propName: 'reviewer',
+		displayName: '审核人',
+		textForPreview: '李四'
+	}),new ObjectDataSourceProperty({
+		propName: 'maker',
+		displayName: '制作者',
+		textForPreview: '制作者1'
+	}),new ObjectDataSourceProperty({
+		propName: 'assistant',
+		displayName: '核对者',
+		textForPreview: '核对者1'
+	}),new ObjectDataSourceProperty({
+		propName: 'sterilizationDate',
+		displayName: '灭菌日期',
+		textForPreview: '2016-09-10'
+	}),new ObjectDataSourceProperty({
+		propName: 'validDate',
+		displayName: '失效日期',
+		textForPreview: '2016-09-17'
+	}),new ObjectDataSourceProperty({
+		propName: 'sterilizer',
+		displayName: '炉号',
+		textForPreview: '1号灭菌炉'
+	}),new ObjectDataSourceProperty({
+		propName: 'frequency',
+		displayName: '炉次',
+		textForPreview: '2'
+	}),new ObjectDataSourceProperty({
+		propName: 'hospitalName',
+		displayName: '医院名称',
+		textForPreview: '广东省人民医院'
+	}),new ObjectDataSourceProperty({
+		propName: 'sterilizationUser',
+		displayName: '灭菌员',
+		textForPreview: '张三'
+	}),new ObjectDataSourceProperty({
+		propName: 'depart',
+		displayName: '科室',
+		textForPreview: '急诊科'
+	}),new ObjectDataSourceProperty({
+		propName: 'sterilingType',
+		displayName: '灭菌程序',
+		textForPreview: 'P1'
+	}),new ObjectDataSourceProperty({
+		propName: 'sterilisationAbbreviation',
+		displayName: '灭菌程序简称',
+		textForPreview: 'P'
+	})]
+});
+objectDataSourceManager.registerDataSource(foreignProxyDisinfectionTousseDataSource);
+// 标识牌
+var idCardDataSource = new ObjectDataSource({
+	name: '标识牌',
+	objectProperties: [new ObjectDataSourceProperty({
+		propName: 'name',
+		displayName: '名字',
+		textForPreview: '手术标识牌1'
+	}),new ObjectDataSourceProperty({
+		propName: 'idNumber',
+		displayName: '编号',
+		textForPreview: 'SN001'
+	})]
+});
+objectDataSourceManager.registerDataSource(idCardDataSource);
+// 高值耗材
+var expensiveGoodsDataSource = new ObjectDataSource({
+	name: '高值耗材',
+	objectProperties: [new ObjectDataSourceProperty({
+		propName: 'barcode',
+		displayName: '条码',
+		textForPreview: '010000110'
+	}),new ObjectDataSourceProperty({
+		propName: 'name',
+		displayName: '名字',
+		textForPreview: '耗材一'
+	}),new ObjectDataSourceProperty({
+		propName: 'expDate',
+		displayName: '失效期',
+		textForPreview: '2018-05-29'
+	}),new ObjectDataSourceProperty({
+		propName: 'supplierName',
+		displayName: '供应商',
+		textForPreview: '新华'
+	}),new ObjectDataSourceProperty({
+		propName: 'specification',
+		displayName: '规格',
+		textForPreview: '1个每包'
+	})]
+});
+objectDataSourceManager.registerDataSource(expensiveGoodsDataSource);
+// 固定条码
+var fixedBarcodeDataSource = new ObjectDataSource({
+	name: '固定条码',
+	objectProperties: [new ObjectDataSourceProperty({
+		propName: 'barcode',
+		displayName: '条码',
+		textForPreview: '010000110'
+	}),new ObjectDataSourceProperty({
+		propName: 'name',
+		displayName: '名字',
+		textForPreview: '耗材一'
+	}),new ObjectDataSourceProperty({
+		propName: 'unitName',
+		displayName: '单位名称',
+		textForPreview: '妇幼医院'
+	})]
+});
+objectDataSourceManager.registerDataSource(fixedBarcodeDataSource);
+// 人员 
+var userDataSource = new ObjectDataSource({
+	name: '用户',
+	objectProperties: [new ObjectDataSourceProperty({
+		propName: 'barcode',
+		displayName: '条码',
+		textForPreview: '010000110'
+	}),new ObjectDataSourceProperty({
+		propName: 'userName',
+		displayName: '全名',
+		textForPreview: '张三'
+	}),new ObjectDataSourceProperty({
+		propName: 'orgUnitName',
+		displayName: '科室',
+		textForPreview: '急诊科'
+	}),new ObjectDataSourceProperty({
+		propName: 'unitName',
+		displayName: '单位名称',
+		textForPreview: '妇幼医院'
+	})]
+});
+objectDataSourceManager.registerDataSource(userDataSource);
+// 科室printOrgUnitInfo(barcode,orgUnitName,name,0);
+var orgUnitDataSource = new ObjectDataSource({
+	name: '科室',
+	objectProperties: [new ObjectDataSourceProperty({
+		propName: 'barcode',
+		displayName: '条码',
+		textForPreview: '010000110'
+	}),new ObjectDataSourceProperty({
+		propName: 'orgUnitName',
+		displayName: '名字',
+		textForPreview: '急诊科'
+	}),new ObjectDataSourceProperty({
+		propName: 'unitName',
+		displayName: '单位名称',
+		textForPreview: '妇幼医院'
+	})]
+});
+objectDataSourceManager.registerDataSource(orgUnitDataSource);
+// 清洗机
+var rinserDataSource = new ObjectDataSource({
+	name: '清洗机',
+	objectProperties: [new ObjectDataSourceProperty({
+		propName: 'barcode',
+		displayName: '条码',
+		textForPreview: '010000110'
+	}),new ObjectDataSourceProperty({
+		propName: 'name',
+		displayName: '名字',
+		textForPreview: '清洗机1'
+	}),new ObjectDataSourceProperty({
+		propName: 'unitName',
+		displayName: '单位名称',
+		textForPreview: '妇幼医院'
+	})]
+});
+objectDataSourceManager.registerDataSource(rinserDataSource);
+// 灭菌炉
+var sterilizerDataSource = new ObjectDataSource({
+	name: '灭菌炉',
+	objectProperties: [new ObjectDataSourceProperty({
+		propName: 'barcode',
+		displayName: '条码',
+		textForPreview: '010000110'
+	}),new ObjectDataSourceProperty({
+		propName: 'name',
+		displayName: '名字',
+		textForPreview: '灭菌炉1'
+	}),new ObjectDataSourceProperty({
+		propName: 'unitName',
+		displayName: '单位名称',
+		textForPreview: '妇幼医院'
+	})]
+});
+objectDataSourceManager.registerDataSource(sterilizerDataSource);
+// 清洗程序
+var cleanMethodDataSource = new ObjectDataSource({
+	name: '清洗程序',
+	objectProperties: [new ObjectDataSourceProperty({
+		propName: 'barcode',
+		displayName: '条码',
+		textForPreview: '010000110'
+	}),new ObjectDataSourceProperty({
+		propName: 'name',
+		displayName: '名字',
+		textForPreview: '清洗程序 P1'
+	}),new ObjectDataSourceProperty({
+		propName: 'unitName',
+		displayName: '单位名称',
+		textForPreview: '妇幼医院'
+	})]
+});
+objectDataSourceManager.registerDataSource(cleanMethodDataSource);
+//灭菌程序
+var sterilisationMethodDataSource = new ObjectDataSource({
+	name: '灭菌程序',
+	objectProperties: [new ObjectDataSourceProperty({
+		propName: 'barcode',
+		displayName: '条码',
+		textForPreview: '010000110'
+	}),new ObjectDataSourceProperty({
+		propName: 'name',
+		displayName: '名字',
+		textForPreview: '灭菌程序 P1'
+	}),new ObjectDataSourceProperty({
+		propName: 'unitName',
+		displayName: '单位名称',
+		textForPreview: '妇幼医院'
+	})]
+});
+objectDataSourceManager.registerDataSource(sterilisationMethodDataSource);
\ No newline at end of file
Index: ssts-web/src/main/webapp/disinfectsystem/print/print.js
===================================================================
diff -u -r24260 -r24571
--- ssts-web/src/main/webapp/disinfectsystem/print/print.js	(.../print.js)	(revision 24260)
+++ ssts-web/src/main/webapp/disinfectsystem/print/print.js	(.../print.js)	(revision 24571)
@@ -3221,6 +3221,9 @@
 else if (typeof(Ext4) != 'undefined'){
 	Ext4.onReady(function(){loadLocalJavascript('C:\\forgon\\config\\printConfig.js');});
 	Ext4.onReady(function(){loadLocalJavascript('C:\\forgon\\config\\printerConfig.js');});
+}else if (typeof($) != 'undefined'){
+	$(function(){loadLocalJavascript('C:\\forgon\\config\\printConfig.js');});
+	$(function(){loadLocalJavascript('C:\\forgon\\config\\printerConfig.js');});
 }
 
 /**
Index: ssts-web/src/main/webapp/disinfectsystem/labelTemplateDesign/configObj2.js
===================================================================
diff -u
--- ssts-web/src/main/webapp/disinfectsystem/labelTemplateDesign/configObj2.js	(revision 0)
+++ ssts-web/src/main/webapp/disinfectsystem/labelTemplateDesign/configObj2.js	(revision 24571)
@@ -0,0 +1,548 @@
+
+function StyleConfig(config){
+	dingxiang_apply(this,config,{})
+}
+StyleConfig.prototype.getStyleStr = function(){
+	return '';
+}
+
+function FontConfig(config){
+	dingxiang_apply(this,config,{
+		fontStyle: 'normal',
+		fontVariant: 'normal',
+		fontWeight: 'normal',
+		fontSize: '16px',
+		fontSizeValue: '16',
+		fontSizeUnit: 'px',
+		fontFamily: '宋体'
+	})
+}
+FontConfig.prototype.getStyleStr = function(){
+	return this.fontStyle +' '+ this.fontVariant +' '+ this.fontWeight +' '+ this.fontSize +' '+ this.fontFamily+';';
+}
+FontConfig.prototype.saveFontConfig = function(cmpIdPrefix){
+	var family = '';
+	var size = '';
+	var cmpFamily = Ext4.getCmp(cmpIdPrefix + 'family');
+	var cmpSize = Ext4.getCmp(cmpIdPrefix + 'size');
+	if(cmpFamily != null){
+		family = cmpFamily.getValue();
+	}
+	if(cmpSize != null){
+		size = cmpSize.getValue();
+	}
+	if(family != ''){
+		this.fontFamily = family;
+	}
+	if(size != ''){
+		this.fontSize = size;
+	}
+}
+FontConfig.prototype.loadFontConfig = function(cmpIdPrefix){
+	var cmpFamily = Ext4.getCmp(cmpIdPrefix + 'family');
+	var cmpSize = Ext4.getCmp(cmpIdPrefix + 'size');
+	if(cmpFamily != null){
+		cmpFamily.setValue(this.fontFamily);
+	}
+	if(cmpSize != null){
+		cmpSize.setValue(this.fontSize);
+	}
+}
+FontConfig.prototype.convertToJsonObj = function(){
+	var obj = {
+			fontStyle: this.fontStyle,
+			fontVariant: this.fontVariant,
+			fontWeight: this.fontWeight,
+			fontSize: this.fontSize,
+			fontFamily: this.fontFamily	
+	}
+	return obj;
+}
+FontConfig.convertFromJsonObj = function(obj){
+	var newObj = new FontConfig({
+		fontStyle: obj.fontStyle,
+		fontVariant: obj.fontVariant,
+		fontWeight: obj.fontWeight,
+		fontSize: obj.fontSize,
+		fontFamily: obj.fontFamily
+	});
+	return newObj;
+}
+
+function BorderConfig(config){
+	dingxiang_apply(this,config,{
+		borderWidth:'0px',
+		borderStyle:'solid',
+		borderColor:'black',
+	})
+}
+BorderConfig.prototype.getStyleStr = function(){
+//	return this.borderWidth +' '+ this.borderStyle +' '+ this.borderColor+';';
+	return ';';
+}
+BorderConfig.prototype.convertToJsonObj = function(){
+	var obj = {
+			borderWidth: this.borderWidth,
+			borderStyle: this.borderStyle,
+			borderColor: this.borderColor
+	};
+	return obj;
+}
+BorderConfig.convertFromJsonObj = function(obj){
+	var newObj = new BorderConfig({
+		borderWidth: obj.borderWidth,
+		borderStyle: obj.borderStyle,
+		borderColor: obj.borderColor
+	});
+	return newObj;
+}
+
+function TableColumnConfig(config){
+	dingxiang_apply(this,config,{
+		align: 'center',
+		width: '30%',
+		innerHTML:'',
+		fontConfig: new FontConfig(),
+		borderConfig: new BorderConfig()
+	})
+}
+TableColumnConfig.prototype.getStyleStr = function(){
+	return 'border:'+this.borderConfig.getStyleStr() + 'font:'+this.fontConfig.getStyleStr();
+}
+TableColumnConfig.prototype.convertToJsonObj = function(){
+	var obj = {
+			align: this.align,
+			width: this.width,
+			innerHTML: this.innerHTML,
+			fontConfig: this.fontConfig.convertToJsonObj(),
+			borderConfig: this.borderConfig.convertToJsonObj()
+	}
+	return obj;
+}
+TableColumnConfig.convertFromJsonObjs = function(objs){
+	var newObjs = [];
+	for(var i=0;i<objs.length;++i){
+		var obj = objs[i];
+		var newObj = TableColumnConfig.convertFromJsonObj(obj);
+		newObjs.push(newObj);
+	}
+	return newObjs;
+}
+TableColumnConfig.convertToJsonObjs = function(objs){
+	var newObjs = [];
+	for(var i=0;i<objs.length;++i){
+		var obj = objs[i];
+		var newObj = obj.convertToJsonObj();
+		newObjs.push(newObj);
+	}
+	return newObjs;
+}
+TableColumnConfig.convertFromJsonObj = function(obj){
+	var newObj = new TableColumnConfig({
+		align: obj.align,
+		width: obj.width,
+		innerHTML: obj.innerHTML,
+		fontConfig: FontConfig.convertFromJsonObj(obj.fontConfig),
+		borderConfig: BorderConfig.convertFromJsonObj(obj.borderConfig)
+	});
+	return newObj;
+}
+
+var ROW_TYPE_TABLEHEAD = '表头';
+var ROW_TYPE_TABLEFOOT = '表尾';
+var ROW_TYPE_PAGEHEAD = '页头';
+var ROW_TYPE_PAGEFOOT = '页尾';
+var ROW_TYPE_DATAITEM = '数据项'; 
+
+function TableRowConfig(config){
+	dingxiang_apply(this,config,{
+		align: 'center',
+		height: '25',
+		fontConfig: new FontConfig(),
+		borderConfig: new BorderConfig(),
+		type: ROW_TYPE_DATAITEM,
+		columnConfigs: []
+	})
+}
+TableRowConfig.prototype.getStyleStr = function(){
+	return '';
+}
+TableRowConfig.prototype.insertColumnConfig = function(columnConfig){
+	this.columnConfigs.push(columnConfig);
+}
+TableRowConfig.prototype.getAllColumnText = function(columnConfig){
+	var text = '';
+	for(var i=0;i<this.columnConfigs.length;++i){
+		if(text == ''){
+			text = this.columnConfigs[i].innerHTML;
+		}else{
+			text += ','+ this.columnConfigs[i].innerHTML;
+		}
+	}
+	return text;
+}
+TableRowConfig.prototype.getColumnText = function(index){
+	var text = '';
+	if(index < this.columnConfigs.length){
+		text = this.columnConfigs[index].innerHTML;
+	}
+	return text;
+}
+TableRowConfig.prototype.setAllColumnText = function(text){
+	var textArr = [];
+	if(!isUndefinedOrNullOrEmpty(text)){
+		var texts = text.split(',');
+		for(var i=0;i<texts.length;++i){
+			textArr.push(texts[i]);
+		}
+	}
+	
+	for(var i=0;i<this.columnConfigs.length;++i){
+		if(i<texts.length){
+			this.columnConfigs[i].innerHTML = textArr[i];
+		}else{
+			this.columnConfigs[i].innerHTML = '';
+		}
+	}
+	return text;
+}
+TableRowConfig.prototype.convertToJsonObj = function(){
+	var obj = {
+			align: this.align,
+			height: this.height,
+			type: this.type,
+			fontConfig: this.fontConfig.convertToJsonObj(),
+			borderConfig: this.borderConfig.convertToJsonObj(),
+			columnConfigs: TableColumnConfig.convertToJsonObjs(this.columnConfigs)
+	}
+	return obj;
+}
+TableRowConfig.convertFromJsonObjs = function(objs){
+	var newObjs = [];
+	for(var i=0;i<objs.length;++i){
+		var obj = objs[i];
+		var newObj = TableRowConfig.convertFromJsonObj(obj);
+		newObjs.push(newObj);
+	}
+	return newObjs;
+}
+TableRowConfig.convertToJsonObjs = function(objs){
+	var newObjs = [];
+	for(var i=0;i<objs.length;++i){
+		var obj = objs[i];
+		var newObj = obj.convertToJsonObj();
+		newObjs.push(newObj);
+	}
+	return newObjs;
+}
+TableRowConfig.convertFromJsonObj = function(obj){
+	var newObj = new TableRowConfig({
+		align: obj.align,
+		height: obj.height,
+		type: obj.type,
+		fontConfig: FontConfig.convertFromJsonObj(obj.fontConfig),
+		borderConfig: BorderConfig.convertFromJsonObj(obj.borderConfig),
+		columnConfigs: TableColumnConfig.convertFromJsonObjs(obj.columnConfigs)
+	});
+	return newObj;
+}
+function TableConfig(config){
+	dingxiang_apply(this,config,{
+		tableDataSourceName: '',
+		itemsPerRow: 1,
+		columnAmount:3,
+		border:1,
+		width:400,
+		height:300,
+		topforPrint:0,
+		leftforPrint:0,
+		widthforPrint:'80%',
+		heightforPrint:'50%',
+		headRowHeight:'25',
+		dataRowHeight:'25',
+		fontConfig: new FontConfig(),
+		headFontConfig: new FontConfig(),
+		dataItemFontConfig: new FontConfig(),
+		borderConfig: new BorderConfig(),
+		tableRowConfigs: [],
+		columnConfigs: []
+	})
+}
+TableConfig.prototype.saveTableConfig = function(){
+	this.headFontConfig.saveFontConfig('table_head_font_');
+	this.dataItemFontConfig.saveFontConfig('table_dataItem_font_');
+	this.saveNormalConfig();
+}
+TableConfig.prototype.loadTableConfig = function(){
+	this.headFontConfig.loadFontConfig('table_head_font_');
+	this.dataItemFontConfig.loadFontConfig('table_dataItem_font_');
+	this.loadNormalConfig();
+}
+TableConfig.prototype.saveNormalConfig = function(){
+	saveValueFromCmp(this,'border','table_border');
+	saveValueFromCmp(this,'width','table_width');
+	saveValueFromCmp(this,'height','table_height');
+	saveValueFromCmp(this,'topforPrint','table_top_forPrint');
+	saveValueFromCmp(this,'leftforPrint','table_left_forPrint');
+	saveValueFromCmp(this,'widthforPrint','table_width_forPrint');
+	saveValueFromCmp(this,'heightforPrint','table_height_forPrint');
+	saveValueFromCmp(this,'headRowHeight','table_head_row_height');
+	saveValueFromCmp(this,'dataRowHeight','table_data_row_height');
+}
+TableConfig.prototype.loadNormalConfig = function(cmpIdPrefix){
+	loadValueToCmp(this,'border','table_border');
+	loadValueToCmp(this,'width','table_width');
+	loadValueToCmp(this,'height','table_height');
+	loadValueToCmp(this,'topforPrint','table_top_forPrint');
+	loadValueToCmp(this,'leftforPrint','table_left_forPrint');
+	loadValueToCmp(this,'widthforPrint','table_width_forPrint');
+	loadValueToCmp(this,'heightforPrint','table_height_forPrint');
+	loadValueToCmp(this,'headRowHeight','table_head_row_height');
+	loadValueToCmp(this,'dataRowHeight','table_data_row_height');
+}
+TableConfig.prototype.convertToJsonObj = function(){
+	var obj = {
+			tableDataSourceName: this.tableDataSourceName,
+			itemsPerRow: this.itemsPerRow,
+			columnAmount: this.columnAmount,
+			border: this.border,
+			width: this.width,
+			height: this.height,
+			topforPrint: this.topforPrint,
+			leftforPrint: this.leftforPrint,
+			widthforPrint: this.widthforPrint,
+			heightforPrint: this.heightforPrint,
+			headRowHeight: this.headRowHeight,
+			dataRowHeight: this.dataRowHeight,
+			fontConfig: this.fontConfig.convertToJsonObj(),
+			headFontConfig: this.headFontConfig.convertToJsonObj(),
+			dataItemFontConfig: this.dataItemFontConfig.convertToJsonObj(),
+			borderConfig: this.borderConfig.convertToJsonObj(),
+			tableRowConfigs: TableRowConfig.convertToJsonObjs(this.tableRowConfigs),
+			columnConfigs: TableColumnConfig.convertToJsonObjs(this.columnConfigs)
+	}
+	return obj;
+}
+TableConfig.prototype.getTableHeadRowConfigs = function(){
+	var heads = [];
+	for(var i=0;i<this.tableRowConfigs.length;++i){
+		if(this.tableRowConfigs[i].type == ROW_TYPE_TABLEHEAD){
+			heads.push(this.tableRowConfigs[i]);
+		}
+	}
+	return heads;
+}
+TableConfig.prototype.getTableDataItemRowConfig = function(){
+	for(var i=0;i<this.tableRowConfigs.length;++i){
+		if(this.tableRowConfigs[i].type == ROW_TYPE_DATAITEM){
+			return this.tableRowConfigs[i];
+		}
+	}
+	return null;
+}
+TableConfig.prototype.getStyleStr = function(){
+	return 'width:'+this.widthforPrint+';'+'border:'+this.borderConfig.getStyleStr() +'font:'+ this.fontConfig.getStyleStr();
+}
+TableConfig.prototype.insertRowConfig = function(tableRowConfig){
+	this.tableRowConfigs.push(tableRowConfig);
+}
+TableConfig.prototype.getFirstHeadRowConfig = function(tableRowConfig){
+	for(var i=0;i<this.tableRowConfigs.length;++i){
+		if(this.tableRowConfigs[i].type == ROW_TYPE_TABLEHEAD){
+			return this.tableRowConfigs[i];
+		}
+	}
+	return null;
+}
+TableConfig.prototype.getFirstDataItemRowConfig = function(tableRowConfig){
+	for(var i=0;i<this.tableRowConfigs.length;++i){
+		if(this.tableRowConfigs[i].type == ROW_TYPE_DATAITEM){
+			return this.tableRowConfigs[i];
+		}
+	}
+	return null;
+}
+TableConfig.prototype.getTableDataSource = function(){
+	if(!isUndefinedOrNullOrEmpty(this.tableDataSourceName)){
+		return tableDataSourceManager.getTableDataSourceByName(this.tableDataSourceName);
+	}
+	return null;
+}
+TableConfig.prototype.getDataSourceItemNamesForCombo = function(itemsPerRow){
+	var tableDataSource = this.getTableDataSource();
+	if(tableDataSource != null){
+		return tableDataSource.getDataSourceItemNamesForCombo(itemsPerRow);
+	}
+	return [];
+}
+TableConfig.prototype.setAllColumnWidths = function(text){
+	var textArr = [];
+	if(!isUndefinedOrNullOrEmpty(text)){
+		var texts = text.split(',');
+		for(var i=0;i<texts.length;++i){
+			textArr.push(texts[i]);
+		}
+	}
+	
+	for(var i=0;i<this.columnConfigs.length;++i){
+		if(i<texts.length){
+			this.columnConfigs[i].width = textArr[i];
+		}else{
+//			this.columnConfigs[i].width = '';
+		}
+	}
+	return text;
+}
+TableConfig.convertFromJsonObjs = function(objs){
+	var newObjs = [];
+	for(var i=0;i<objs.length;++i){
+		var obj = objs[i];
+		var newObj = TableConfig.convertFromJsonObj(obj);
+		newObjs.push(newObj);
+	}
+	return newObjs;
+}
+TableConfig.convertToJsonObjs = function(objs){
+	var newObjs = [];
+	for(var i=0;i<objs.length;++i){
+		var obj = objs[i];
+		var newObj = obj.convertToJsonObj();
+		newObjs.push(newObj);
+	}
+	return newObjs;
+}
+TableConfig.convertFromJsonObj = function(obj){
+	var newObj = new TableConfig({
+		tableDataSourceName: obj.tableDataSourceName,
+		itemsPerRow: obj.itemsPerRow,
+		columnAmount: obj.columnAmount,
+		border: obj.border,
+		width: obj.width,
+		height: obj.height,
+		topforPrint: obj.topforPrint,
+		leftforPrint: obj.leftforPrint,
+		widthforPrint: obj.widthforPrint,
+		heightforPrint: obj.heightforPrint,
+		headRowHeight: obj.headRowHeight,
+		dataRowHeight: obj.dataRowHeight,
+		fontConfig: FontConfig.convertFromJsonObj(obj.fontConfig),
+		headFontConfig: FontConfig.convertFromJsonObj(obj.headFontConfig),
+		dataItemFontConfig: FontConfig.convertFromJsonObj(obj.dataItemFontConfig),
+		borderConfig: BorderConfig.convertFromJsonObj(obj.borderConfig),
+		tableRowConfigs: TableRowConfig.convertFromJsonObjs(obj.tableRowConfigs),
+		columnConfigs: TableColumnConfig.convertFromJsonObjs(obj.columnConfigs)
+	});
+	return newObj;
+}
+
+function resetBorder(tableConfig,obj){
+	if(!isUndefinedOrNull(tableConfig.border)){
+		obj.borderConfig.borderWidth = tableConfig.border+'px';
+	}
+}
+//根据配置和数据源生成表格
+function createTableHtmlByConfig(tableConfig,obj){
+	var tableHtml = '';
+	var tempStr;
+	var tableDataSource = tableConfig.getTableDataSource();
+	var itemsPropName = tableDataSource.itemsPropName;
+	if(isUndefinedOrNull(tableConfig.border)){
+//		tableConfig.borderConfig.borderWidth = '1px';
+	}else{
+//		tableConfig.borderConfig.borderWidth = tableConfig.border+'px';
+	}
+	var borderStr = 'border="1"';
+	if(!isUndefinedOrNull(tableConfig.border)){
+		borderStr = 'border="'+tableConfig.border+'"';
+	}
+	tableConfig.tableStyle = tableConfig.getStyleStr();
+	
+	// 表格本身
+	tempStr = '<table '+borderStr+' cellspacing="0" cellpadding="0" style="${tableStyle}" >';
+	tableHtml += fillPropertiesFromObj(tableConfig,tempStr);
+	// 获取表头配置
+	var headRowConfigs = tableConfig.getTableHeadRowConfigs();
+	if(headRowConfigs.length > 0){
+		for(var r=0;r<headRowConfigs.length;++r){
+			var headRowConfig = headRowConfigs[r];
+			var columnConfigs = headRowConfig.columnConfigs;
+			if(tableConfig.headRowHeight > 0){
+				tableHtml += '<tr height="'+tableConfig.headRowHeight+'">';
+				for(var c=0;c<columnConfigs.length;++c){
+					var columnConfig = columnConfigs[c];
+					var tableColumnConfig = tableConfig.columnConfigs[c];
+//					resetBorder(tableConfig,columnConfig);
+					columnConfig.columnStyle = columnConfig.getStyleStr();
+					tempStr = '<td align="'+columnConfig.align+'" width ="'+tableColumnConfig.width+'" style="'+columnConfig.columnStyle+'">'+columnConfig.innerHTML+'</td>';
+					tableHtml += fillPropertiesFromObj(columnConfig,tempStr);
+				}
+				tableHtml += '</tr>';
+			}					
+		}
+	}
+	// 数据项
+	var dataRowConfig = tableConfig.getTableDataItemRowConfig();
+	if(dataRowConfig != null){
+		var itemsPerRow = tableConfig.itemsPerRow;
+		var dataItems = obj[itemsPropName];
+		if(isUndefinedOrNull(dataItems)){
+			dataItems = [];
+		}
+//		alert(itemsPropName)
+		var mod = dataItems.length % itemsPerRow;
+		var itemsCount = dataItems.length;
+		var rowsCount = parseInt(itemsCount/itemsPerRow);
+		if(mod != 0){
+			rowsCount++;
+		}
+		if(rowsCount > 0){
+			var columnConfigs = dataRowConfig.columnConfigs;
+			for(var row=0;row<rowsCount;++row){
+				tableHtml += '<tr height="'+tableConfig.dataRowHeight+'">';
+				for(var c=0;c<columnConfigs.length;++c){
+					var columnConfig = columnConfigs[c];
+					var tableColumnConfig = tableConfig.columnConfigs[c];
+					// 字体直接取表格数据字体
+					columnConfig.fontConfig = tableConfig.dataItemFontConfig;
+//					resetBorder(tableConfig,columnConfig);
+					columnConfig.columnStyle = columnConfig.getStyleStr();
+//					alert(columnConfig.columnStyle)
+					var itemsObj = {};
+					for(var i=0;i<itemsPerRow;++i){
+						var tdItemI = null;
+						var index = row*itemsPerRow + i;
+						if(index < itemsCount){
+							tdItemI = dataItems[index];
+						}else{
+							tdItemI = {};
+						}
+						itemsObj['item'+(i+1)] = tdItemI;
+					}
+					tempStr = '<td align="'+columnConfig.align+'" width ="'+tableColumnConfig.width+'" style="'+columnConfig.columnStyle+'">'+columnConfig.innerHTML+'</td>';
+					tableHtml += fillPropertiesFromObj(itemsObj,tempStr);
+				}
+				tableHtml += "</tr>";
+			}
+		}
+	}
+	
+	// 结束表格
+	tableHtml += '</table>';
+//	alert(tableHtml)
+	return tableHtml;
+}
+function transformTemplateConfigObjs(template){
+	
+	if(isUndefinedOrNullOrEmpty(template.templateInfo)){
+		template.templateInfo = {};
+	}else{
+		template.templateInfo = JSON.parse(template.templateInfo);
+	}
+	var templateInfo = template.templateInfo;
+	if(isUndefinedOrNullOrEmpty(templateInfo.tableConfigs)){
+		templateInfo.tableConfigs = [];
+	}else{
+		templateInfo.tableConfigs = TableConfig.convertFromJsonObjs(templateInfo.tableConfigs);
+	}
+	return template;
+}