Index: ssts-web/src/main/webapp/disinfectsystem/print/print.js
===================================================================
diff -u -r21190 -r21222
--- ssts-web/src/main/webapp/disinfectsystem/print/print.js	(.../print.js)	(revision 21190)
+++ ssts-web/src/main/webapp/disinfectsystem/print/print.js	(.../print.js)	(revision 21222)
@@ -2018,11 +2018,18 @@
 	if(isUndefinedOrNullOrEmpty(idCardInstance)){
 		return;
 	}
+	var paperType = idCardInstance.idCardPaperType;
+	idCardInstance.name = idCardInstance.tousseDefinition.name;
+	if(isTemplatePageType(paperType)){
+		if(invokeTemplatePrintFunction(paperType,idCardInstance)){
+			return;
+		}
+	}
 	doGetLodop();
 	LODOP.PRINT_INIT("");
 	if(isUndefinedOrNullOrEmpty(idCardInstance.configKey)){
 		
-		var paperType = idCardInstance.idCardPaperType;
+		
 		formTypeOfPrinted = "idCardLargeLabel";
 		if(paperType == "大标签"){
 			formTypeOfPrinted = "idCardLargeLabel";
Index: ssts-web/src/main/webapp/disinfectsystem/labelTemplateDesign/dataSource.js
===================================================================
diff -u -r20076 -r21222
--- ssts-web/src/main/webapp/disinfectsystem/labelTemplateDesign/dataSource.js	(.../dataSource.js)	(revision 20076)
+++ ssts-web/src/main/webapp/disinfectsystem/labelTemplateDesign/dataSource.js	(.../dataSource.js)	(revision 21222)
@@ -397,4 +397,18 @@
 	})]
 });
 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);
 
Index: ssts-web/src/main/webapp/disinfectsystem/basedatamanager/tousse/idCardFormExt4.js
===================================================================
diff -u -r20650 -r21222
--- ssts-web/src/main/webapp/disinfectsystem/basedatamanager/tousse/idCardFormExt4.js	(.../idCardFormExt4.js)	(revision 20650)
+++ ssts-web/src/main/webapp/disinfectsystem/basedatamanager/tousse/idCardFormExt4.js	(.../idCardFormExt4.js)	(revision 21222)
@@ -17,14 +17,8 @@
 var forSupplement = false;// 是否装配补充弹出来的
 var supplementResult = false;// 补充结果
 
-//标识牌标签类型
-var idCardPaperTypeData = [['大标签'],['中标签'],['小标签'],['标识牌和图片']];
-if(sstsConfig.canUseBarcodeTypes && sstsConfig.canUseBarcodeTypes.length > 0){
-	idCardPaperTypeData = [];
-	for(var i = 0;i < sstsConfig.canUseBarcodeTypes.length;i++){
-		idCardPaperTypeData.push([sstsConfig.canUseBarcodeTypes[i]]);
-	}
-}
+// 默认标识牌标签类型
+var defaultIdCardPaperType = '中标签';
 
 var idCardInstanceFields = [
                        	    {name : 'id'},
@@ -89,6 +83,22 @@
 			model: 'IdCardDefinitionModel'
 		})
 	});
+	//标签纸类型combo的store
+	idCardBarcodePaperTypeStore = new Ext4.data.ArrayStore({
+		proxy : new Ext4.data.HttpProxy({
+			url : WWWROOT + '/disinfectSystem/labelTemplateAction!getAllIdCardLabelTemplate.do',
+			method : 'POST'
+		}),
+		fields : [ 'name'],
+		listeners: {
+            load: function () {
+                var combo = top.Ext4.getCmp('idCardPaperType2');
+                combo.setValue(defaultIdCardPaperType);
+            }
+         }
+	});
+	idCardBarcodePaperTypeStore.load();
+
 //	idCardDefinitionStore.baseParams['id'] = id;
 //	idCardDefinitionStore.load({
 //		callback:function(records,options,success){
@@ -327,15 +337,11 @@
                 id : 'idCardPaperType2',
                 name : 'idCardPaperType2',
                 editable:false,
-                valueField : 'value',
-                displayField : 'value',
-                store : new Ext4.data.ArrayStore( {
-                    fields : [ 'value'],
-                    data : idCardPaperTypeData
-                }),
-                value : idCardPaperTypeData[0][0],
+                valueField : 'name',
+                displayField : 'name',
+                store : idCardBarcodePaperTypeStore,
+                value : defaultIdCardPaperType,
                 forceSelection : true,
-                mode : 'local',
                 triggerAction : 'all',
                 anchor : '100%'
             }]
Index: ssts-web/src/main/webapp/disinfectsystem/basedatamanager/tousse/tousseForm.js
===================================================================
diff -u -r20632 -r21222
--- ssts-web/src/main/webapp/disinfectsystem/basedatamanager/tousse/tousseForm.js	(.../tousseForm.js)	(revision 20632)
+++ ssts-web/src/main/webapp/disinfectsystem/basedatamanager/tousse/tousseForm.js	(.../tousseForm.js)	(revision 21222)
@@ -12,7 +12,7 @@
 var beginBarcodeLabel = '扫描条码:';
 var hiddenEndBarcode = true;//隐藏尾篮筐
 var useRecordOperationRoomAllowBlank = false;
-
+var idCardBarcodePaperTypeStore = null;
 if(sstsConfig.disableLoadToVirtualBasket == false){
 	beginBarcodeLabel = '条码/篮筐(首):';
 	hiddenEndBarcode = false;//显示尾篮筐
@@ -36,13 +36,7 @@
 }
 
 //标识牌标签类型
-var idCardPaperTypeData = [['大标签'],['中标签'],['小标签'],['标识牌和图片']];
-if(sstsConfig.canUseBarcodeTypes && sstsConfig.canUseBarcodeTypes.length > 0){
-	idCardPaperTypeData = [];
-	for(var i = 0;i < sstsConfig.canUseBarcodeTypes.length;i++){
-		idCardPaperTypeData.push([sstsConfig.canUseBarcodeTypes[i]]);
-	}
-}
+var defaultIdCardPaperType = '中标签';
 
 var isLastRow = false;//记录当前编辑的行是否是最后一行
 //删除视频
@@ -254,22 +248,22 @@
 	//标签纸类型combo的store
 	var barcodePaperTypeStore = new Ext.data.JsonStore({
 		fields : [ 'name'],
-		url : WWWROOT + '/disinfectSystem/labelTemplateAction!getAllBarcodePaperType.do',
+		url : WWWROOT + '/disinfectSystem/labelTemplateAction!getTousseBarcodePaperType.do',
 		listeners:{
 			load:function(store,records) {
 			}
 		}
 	});
 	
 	//标签纸类型combo的store
-//	var idCardBarcodePaperTypeStore = new Ext.data.JsonStore({
-//		fields : [ 'name'],
-//		url : WWWROOT + '/disinfectSystem/labelTemplateAction!getAllIdCardLabelTemplate.do',
-//		listeners:{
-//			load:function(store,records) {
-//			}
-//		}
-//	});
+	idCardBarcodePaperTypeStore = new Ext.data.JsonStore({
+		fields : [ 'name'],
+		url : WWWROOT + '/disinfectSystem/labelTemplateAction!getAllIdCardLabelTemplate.do',
+		listeners:{
+			load:function(store,records) {
+			}
+		}
+	});
 	
 	/////////////////////////////////////////图片预览
 	var page = 1;
@@ -1671,15 +1665,11 @@
                       id : 'idCardPaperType',
                       name : 'idCardPaperType',
                       editable:false,
-                      valueField : 'value',
-                      displayField : 'value',
-                      store : new Ext.data.SimpleStore( {
-                          fields : [ 'value'],
-                          data : idCardPaperTypeData
-                      }),
-                      value : idCardPaperTypeData[0][0],
+                      valueField : 'name',
+                      displayField : 'name',
+                      store : idCardBarcodePaperTypeStore,
+                      value : defaultIdCardPaperType,
                       forceSelection : true,
-                      mode : 'local',
                       triggerAction : 'all',
                       anchor : '100%'
                   }]
Index: ssts-web/src/main/webapp/disinfectsystem/basedatamanager/tousse/tousseView.jsp
===================================================================
diff -u -r19521 -r21222
--- ssts-web/src/main/webapp/disinfectsystem/basedatamanager/tousse/tousseView.jsp	(.../tousseView.jsp)	(revision 19521)
+++ ssts-web/src/main/webapp/disinfectsystem/basedatamanager/tousse/tousseView.jsp	(.../tousseView.jsp)	(revision 21222)
@@ -46,6 +46,8 @@
 </object> 
 
 <%@ include file="/common/includeExtJsAndCss.jsp"%>
+<%@ include file="/common/include_Ext42_Js.jsp"%>
+<%@ include file="/disinfectsystem/print/print.jsp"%>
 <script type="text/javascript">
 var imageTypeTousse = '<%=ImageFile.IMAGE_TYPE_TOUSSE%>';
 var imageTypeToussePacking = '<%=ImageFile.IMAGE_TYPE_TOUSSEPACKING%>';
@@ -120,6 +122,7 @@
 <script type="text/javascript" src="${ctx}/disinfectsystem/config/${profile}/print/printConfig.js"></script>
 <script type="text/javascript" src="${ctx}/js/common.js"></script>
 <script type="text/javascript" src="${ctx}/js/json3.min.js"></script>
+<script type="text/javascript" src="${ctx}/disinfectsystem/common/cssdUtils.js" /></script>
 <script type="text/javascript" src="${ctx}/js/extUtils.js"></script>
 <script type="text/javascript" src="${ctx}/ext/grid/ForgonGrid.js"></script>
 <script type="text/javascript" src="${ctx}/dwr/interface/TousseDefinitionTableManager.js"></script>
Index: ssts-web/src/main/webapp/disinfectsystem/basedatamanager/tousse/idCardForm.js
===================================================================
diff -u -r20632 -r21222
--- ssts-web/src/main/webapp/disinfectsystem/basedatamanager/tousse/idCardForm.js	(.../idCardForm.js)	(revision 20632)
+++ ssts-web/src/main/webapp/disinfectsystem/basedatamanager/tousse/idCardForm.js	(.../idCardForm.js)	(revision 21222)
@@ -18,16 +18,6 @@
 var supplementResult = false;// 补充结果
 
 //标识牌标签类型
-
-var idCardPaperTypeData = [['大标签'],['中标签'],['小标签']];
-if(sstsConfig.canUseBarcodeTypes && sstsConfig.canUseBarcodeTypes.length > 0){
-	idCardPaperTypeData = [];
-	for(var i = 0;i < sstsConfig.canUseBarcodeTypes.length;i++){
-		idCardPaperTypeData.push([sstsConfig.canUseBarcodeTypes[i]]);
-	}
-//	idCardPaperTypeData.push(['标识牌和图片']);
-}
-
 var idCardInstanceFields = [
                        	    {name : 'id'},
                        	    {name : 'idCardDefinitionID'},
@@ -521,16 +511,12 @@
                 id : 'idCardPaperType2',
                 name : 'idCardPaperType2',
                 editable:false,
-                valueField : 'value',
-                displayField : 'value',
+                valueField : 'name',
+                displayField : 'name',
                 listWidth: 150,
-                store : new Ext.data.SimpleStore( {
-                    fields : [ 'value'],
-                    data : idCardPaperTypeData
-                }),
-                value : idCardPaperTypeData[0][0],
+                store : idCardBarcodePaperTypeStore,
+                value : defaultIdCardPaperType,
                 forceSelection : true,
-                mode : 'local',
                 triggerAction : 'all',
                 anchor : '100%'
             }]