Index: ssts-web/src/main/webapp/disinfectsystem/labelTemplateDesign/dataSource.js
===================================================================
diff -u -r15473 -r15476
--- ssts-web/src/main/webapp/disinfectsystem/labelTemplateDesign/dataSource.js	(.../dataSource.js)	(revision 15473)
+++ ssts-web/src/main/webapp/disinfectsystem/labelTemplateDesign/dataSource.js	(.../dataSource.js)	(revision 15476)
@@ -82,18 +82,21 @@
 	constructor: function(config){
 		this.initConfig(config);
     },
-    getDataSourceItemNamesForCombo: function(){
-    	var s = [];
-    	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,'${item1.'+ dataSourceItem.propName +'}'];
-    		s.push(o);
+    getTemplateObj: function(){
+    	var obj = {};
+    	for(var i=0;i<this.objectProperties.length;++i){
+    		var dataSourceItem = this.objectProperties[i];
+    		obj[dataSourceItem.propName] = dataSourceItem.displayName;
     	}
-    	return s;
+    	return obj;
+    },
+    getPreviewObj: function(){
+    	var obj = {};
+    	for(var i=0;i<this.objectProperties.length;++i){
+    		var dataSourceItem = this.objectProperties[i];
+    		obj[dataSourceItem.propName] = dataSourceItem.textForPreview;
+    	}
+    	return obj;
     }
 });
 Ext4.define("ObjectDataSourceManager", {
@@ -226,4 +229,54 @@
 	})]
 });
 objectDataSourceManager.registerDataSource(foreignTousseDataSource);
+// 外部代理灭菌包
+var foreignProxyDisinfectionTousseDataSource = new ObjectDataSource({
+	name: '外部代理灭菌包',
+	objectProperties: [new ObjectDataSourceProperty({
+		propName: 'name',
+		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: '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'
+	})]
+});
+objectDataSourceManager.registerDataSource(foreignProxyDisinfectionTousseDataSource);