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);
 
Index: ssts-basedata/src/main/java/com/forgon/disinfectsystem/entity/labeltemplate/LabelTemplate.java
===================================================================
diff -u -r15473 -r15476
--- ssts-basedata/src/main/java/com/forgon/disinfectsystem/entity/labeltemplate/LabelTemplate.java	(.../LabelTemplate.java)	(revision 15473)
+++ ssts-basedata/src/main/java/com/forgon/disinfectsystem/entity/labeltemplate/LabelTemplate.java	(.../LabelTemplate.java)	(revision 15476)
@@ -27,7 +27,7 @@
 	public final static String TEMPLATE_NAME_PREFIX = "模板-";
 	public final static String OBJECTDATASOURCE_TOUSSE = "普通器械包";
 	public final static String OBJECTDATASOURCE_FOREIGNTOUSSE = "外来器械包";
-	
+	public final static String OBJECTDATASOURCE_FOREIGNPROXYDISINFECTIONTOUSSE = "外部代理灭菌包";
 	private Long id;
 
 	/**
Index: ssts-web/src/main/webapp/disinfectsystem/labelTemplateDesign/labelTemplates/外部代理灭菌小标签
===================================================================
diff -u
--- ssts-web/src/main/webapp/disinfectsystem/labelTemplateDesign/labelTemplates/外部代理灭菌小标签	(revision 0)
+++ ssts-web/src/main/webapp/disinfectsystem/labelTemplateDesign/labelTemplates/外部代理灭菌小标签	(revision 15476)
@@ -0,0 +1 @@
+{"programCodes":"LODOP.PRINT_INITA(0,0,\"50mm\",\"29.9mm\",\"\");\r\nLODOP.SET_PRINT_MODE(\"PROGRAM_CONTENT_BYVAR\",true);\r\nLODOP.ADD_PRINT_TEXTA(\"name\",\"1.1mm\",\"0mm\",\"50mm\",\"5mm\",obj.name);\r\nLODOP.SET_PRINT_STYLEA(0,\"FontSize\",7);\r\nLODOP.SET_PRINT_STYLEA(0,\"Alignment\",2);\r\nLODOP.SET_PRINT_STYLEA(0,\"ContentVName\",\"obj.name\");\r\nLODOP.ADD_PRINT_TEXTA(\"a\",\"10.1mm\",\"1.1mm\",\"11.9mm\",\"6.1mm\",\"灭菌日期:\");\r\nLODOP.SET_PRINT_STYLEA(0,\"FontSize\",5);\r\nLODOP.ADD_PRINT_TEXTA(\"sterilizationDate\",\"10.1mm\",\"13mm\",\"20.1mm\",\"6.1mm\",obj.sterilizationDate);\r\nLODOP.SET_PRINT_STYLEA(0,\"FontSize\",5);\r\nLODOP.SET_PRINT_STYLEA(0,\"ContentVName\",\"obj.sterilizationDate\");\r\nLODOP.ADD_PRINT_TEXTA(\"a\",\"14mm\",\"1.1mm\",\"11.9mm\",\"6.1mm\",\"失效日期:\");\r\nLODOP.SET_PRINT_STYLEA(0,\"FontSize\",5);\r\nLODOP.ADD_PRINT_TEXTA(\"validDate\",\"14mm\",\"13mm\",\"20.1mm\",\"6.1mm\",obj.validDate);\r\nLODOP.SET_PRINT_STYLEA(0,\"FontSize\",5);\r\nLODOP.SET_PRINT_STYLEA(0,\"ContentVName\",\"obj.validDate\");\r\nLODOP.ADD_PRINT_TEXTA(\"a\",\"10.1mm\",\"25.9mm\",\"11.9mm\",\"6.1mm\",\"灭菌程序\");\r\nLODOP.SET_PRINT_STYLEA(0,\"FontSize\",5);\r\nLODOP.ADD_PRINT_TEXTA(\"sterilingType\",\"10.1mm\",\"38.1mm\",\"20.1mm\",\"6.1mm\",obj.sterilingType);\r\nLODOP.SET_PRINT_STYLEA(0,\"FontSize\",5);\r\nLODOP.SET_PRINT_STYLEA(0,\"ContentVName\",\"obj.sterilingType\");\r\nLODOP.ADD_PRINT_TEXTA(\"a\",\"14mm\",\"25.9mm\",\"11.9mm\",\"6.1mm\",\"灭菌员:\");\r\nLODOP.SET_PRINT_STYLEA(0,\"FontSize\",5);\r\nLODOP.ADD_PRINT_TEXTA(\"sterilizationUser\",\"14mm\",\"38.1mm\",\"20.1mm\",\"6.1mm\",obj.sterilizationUser);\r\nLODOP.SET_PRINT_STYLEA(0,\"FontSize\",5);\r\nLODOP.SET_PRINT_STYLEA(0,\"ContentVName\",\"obj.sterilizationUser\");\r\nLODOP.ADD_PRINT_BARCODE(\"18mm\",\"11.1mm\",\"29.9mm\",\"10.1mm\",\"128Auto\",obj.barcode);\r\nLODOP.SET_PRINT_STYLEA(0,\"ContentVName\",\"obj.barcode\");\r\nLODOP.ADD_PRINT_TEXTA(\"depart\",\"6.1mm\",\"0mm\",\"50mm\",\"4mm\",obj.depart);\r\nLODOP.SET_PRINT_STYLEA(0,\"FontSize\",7);\r\nLODOP.SET_PRINT_STYLEA(0,\"Alignment\",2);\r\nLODOP.SET_PRINT_STYLEA(0,\"ContentVName\",\"obj.depart\");\r\n","templateInfo":"{\"tableConfigs\":[]}","name":"外部代理灭菌小标签","width":"50mm","description":"外部代理灭菌小标签","fullName":"模板-外部代理灭菌小标签","id":5,"dataSourceName":"外部代理灭菌包","height":"30mm"}
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方法，装载模板
Index: ssts-web/src/main/webapp/disinfectsystem/sterilizationmanager/sterilizationrecord/foreignProxyDisinfectionView.jsp
===================================================================
diff -u -r15159 -r15476
--- ssts-web/src/main/webapp/disinfectsystem/sterilizationmanager/sterilizationrecord/foreignProxyDisinfectionView.jsp	(.../foreignProxyDisinfectionView.jsp)	(revision 15159)
+++ ssts-web/src/main/webapp/disinfectsystem/sterilizationmanager/sterilizationrecord/foreignProxyDisinfectionView.jsp	(.../foreignProxyDisinfectionView.jsp)	(revision 15476)
@@ -59,8 +59,10 @@
 <link rel="stylesheet" type="text/css" href="${ctx}/ext/fontSize${fontSize}/treepanel/resources/css/column-tree.css" />
 
 <!-- 打印函数 -->
+<%@ include file="/common/includeExtJs4_2.jsp"%>
 <script language="javascript" src="${ctx}/disinfectsystem/print/LodopFuncs.js"></script>
 <script type="text/javascript" src="${ctx}/disinfectsystem/print/print.js"></script>
+<%@ include file="/disinfectsystem/print/print.jsp"%>
 <script type="text/javascript" src="${ctx}/disinfectsystem/config/${profile}/config.js"></script>
 <script type="text/javascript" src="${ctx}/disinfectsystem/config/${profile}/print/printConfig.js"></script>