Index: ssts-web/src/main/webapp/disinfectsystem/labelTemplateDesign/dataSource.js
===================================================================
diff -u -r26799 -r26815
--- ssts-web/src/main/webapp/disinfectsystem/labelTemplateDesign/dataSource.js	(.../dataSource.js)	(revision 26799)
+++ ssts-web/src/main/webapp/disinfectsystem/labelTemplateDesign/dataSource.js	(.../dataSource.js)	(revision 26815)
@@ -283,9 +283,20 @@
 		propName: 'idCardDefinitionDescription',
 		displayName: '标识牌定义描述',
 		textForPreview: '注意事项'
+	}),new ObjectDataSourceProperty({
+		propName: 'operationDate',
+		displayName: '装配日期',
+		textForPreview: '2018-09-16'
+	}),new ObjectDataSourceProperty({
+		propName: 'inspectorName',
+		displayName: '检查人',
+		textForPreview: '张三'
 	})]
 });
+
 objectDataSourceManager.registerDataSource(normalTousseDataSource);
+
+
 //外来器械包
 var foreignTousseDataSource = new ObjectDataSource({
 	name: '外来器械包',
@@ -429,6 +440,14 @@
 		propName: 'remark',
 		displayName: '备注',
 		textForPreview: '测试备注'
+	}),new ObjectDataSourceProperty({
+		propName: 'operationDate',
+		displayName: '装配日期',
+		textForPreview: '2018-09-16'
+	}),new ObjectDataSourceProperty({
+		propName: 'inspectorName',
+		displayName: '检查人',
+		textForPreview: '张三'
 	})]
 });
 objectDataSourceManager.registerDataSource(foreignTousseDataSource);
@@ -495,6 +514,14 @@
 		propName: 'sterilisationAbbreviation',
 		displayName: '灭菌程序简称',
 		textForPreview: 'P'
+	}),new ObjectDataSourceProperty({
+		propName: 'operationDate',
+		displayName: '装配日期',
+		textForPreview: '2018-09-16'
+	}),new ObjectDataSourceProperty({
+		propName: 'inspectorName',
+		displayName: '检查人',
+		textForPreview: '张三'
 	})]
 });
 objectDataSourceManager.registerDataSource(foreignProxyDisinfectionTousseDataSource);
@@ -716,3 +743,23 @@
 	})]
 });
 objectDataSourceManager.registerDataSource(storageLocationDataSource);
+//开启库位管理，才显示库位编码、库位简称
+if(sstsConfig.enableWarehousePositionModule){
+	var storageLocationCodeObj = new ObjectDataSourceProperty({
+		propName: 'storageLocationCode',
+		displayName: '库位编码',
+		textForPreview: '0123'
+	});
+	normalTousseDataSource.objectProperties.push(storageLocationCodeObj);
+	foreignTousseDataSource.objectProperties.push(storageLocationCodeObj);
+	foreignProxyDisinfectionTousseDataSource.objectProperties.push(storageLocationCodeObj);
+	var simpleNameObj = new ObjectDataSourceProperty({
+		propName: 'simpleName',
+		displayName: '库位简称',
+		textForPreview: '1号仓库'
+	});
+	normalTousseDataSource.objectProperties.push(simpleNameObj);
+	foreignTousseDataSource.objectProperties.push(simpleNameObj);
+	foreignProxyDisinfectionTousseDataSource.objectProperties.push(simpleNameObj);
+	
+}
\ No newline at end of file