Index: ssts-web/src/main/webapp/disinfectsystem/labelTemplateDesign/printCustomDesign.js
===================================================================
diff -u -r15117 -r15199
--- ssts-web/src/main/webapp/disinfectsystem/labelTemplateDesign/printCustomDesign.js	(.../printCustomDesign.js)	(revision 15117)
+++ ssts-web/src/main/webapp/disinfectsystem/labelTemplateDesign/printCustomDesign.js	(.../printCustomDesign.js)	(revision 15199)
@@ -3,6 +3,7 @@
 var LODOP; // 声明为全局变量
 var templateObj = {
 	name: '包名',
+	barcode:'010000001',
 	operator: '配包人',
 	reviewer: '审核人',
 	sterilizationDate: '灭菌日期',
@@ -16,6 +17,7 @@
 };
 var previewObj = {
 		name: '缝合包',
+		barcode:'010000001',
 		operator: '张三',
 		reviewer: '李四',
 		sterilizationDate: '2016-09-10',
@@ -51,7 +53,7 @@
 		if(LODOP.GET_VALUE("ItemIsAdded", propName)){
 			LODOP.SET_PRINT_STYLEA(propName, 'Deleted', 0);// 恢复删除的项
 		}else{
-			LODOP.ADD_PRINT_TEXTA(propName, 56, 32, 65, 30, value);
+			LODOP.ADD_PRINT_TEXTA(propName, '2mm', '2mm', '30mm', '3mm', value);
 			LODOP.SET_PRINT_STYLEA(0, "ContentVName", vName);// 设置内容参数的变量名
 		}
 	}else{
@@ -61,7 +63,7 @@
 function CreatePage() {
 	getLODOP2();
 //	alert(currentConfig.width)
-	LODOP.PRINT_INITA(0, 0, currentConfig.width, currentConfig.height, "小标签");
+	LODOP.PRINT_INITA(0, 0, currentConfig.width, currentConfig.height, null);
 //	LODOP.PRINT_INITA(0, 0, '800px', '600px', "小标签");
 	LODOP.SET_PRINT_MODE("PROGRAM_CONTENT_BYVAR", true);// 生成程序时，内容参数有变量用变量，无变量用具体值
 };
@@ -94,8 +96,21 @@
 }
 // 插入文本项
 function insertTextItem() {
-	LODOP.ADD_PRINT_TEXTA('a', 0, 0, 75, 30, '文本');
+	LODOP.ADD_PRINT_TEXTA('a', '0mm', '0mm', '10mm', '5mm', '文本');
 }
+function insertBarcode() {
+//	LODOP.ADD_PRINT_TEXTA(propName, 56, 32, 65, 30, value);
+	LODOP.ADD_PRINT_BARCODE("1mm","1mm","10mm","10mm","128Auto", obj.barcode);// 条码1
+	LODOP.SET_PRINT_STYLEA(0, "ContentVName", 'obj.barcode');// 设置内容参数的变量名
+}
+function insertTousseName(){
+	var propName = 'name';
+	getLODOP2();
+	var vName = 'obj.'+propName;
+	var value = obj[propName];
+	LODOP.ADD_PRINT_TEXTA(propName, '2mm', '2mm', '30mm', '6mm', value);
+	LODOP.SET_PRINT_STYLEA(0, "ContentVName", vName);// 设置内容参数的变量名
+}
 function insertTableToLodop(tableConfig){
 //	alert(tableConfig)
 	if(tableConfig == null){
@@ -311,6 +326,18 @@
     			handler : function() {
     				insertTextItem();
     			}
+    		}, {
+    			xtype : 'button',
+    			text : '插入器械包条码',
+    			handler : function() {
+    				insertBarcode();
+    			}
+    		}, {
+    			xtype : 'button',
+    			text : '插入包名',
+    			handler : function() {
+    				insertTousseName();
+    			}
     		}]
 		},{
 			xtype:'fieldset',
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 15199)
@@ -0,0 +1 @@
+{"programCodes":"LODOP.PRINT_INITA(0,0,\"60.01mm\",\"80.01mm\",\"\");\r\nLODOP.SET_PRINT_MODE(\"PROGRAM_CONTENT_BYVAR\",true);\r\nLODOP.ADD_PRINT_TEXTA(\"name\",\"2.01mm\",\"0mm\",\"60.01mm\",\"29mm\",obj.name);\r\nLODOP.SET_PRINT_STYLEA(0,\"Alignment\",2);\r\nLODOP.SET_PRINT_STYLEA(0,\"ContentVName\",\"obj.name\");\r\nLODOP.ADD_PRINT_TEXTA(\"a\",\"31.01mm\",\"1.01mm\",\"10mm\",\"6.01mm\",\"灭菌:\");\r\nLODOP.SET_PRINT_STYLEA(0,\"FontSize\",8);\r\nLODOP.ADD_PRINT_TEXTA(\"a\",\"31.01mm\",\"32.99mm\",\"15mm\",\"6.01mm\",\"装配员:\");\r\nLODOP.SET_PRINT_STYLEA(0,\"FontSize\",8);\r\nLODOP.ADD_PRINT_TEXTA(\"a\",\"36.99mm\",\"1.01mm\",\"10mm\",\"6.01mm\",\"失效:\");\r\nLODOP.SET_PRINT_STYLEA(0,\"FontSize\",8);\r\nLODOP.ADD_PRINT_TEXTA(\"a\",\"36.99mm\",\"32.99mm\",\"15mm\",\"6.01mm\",\"审核员:\");\r\nLODOP.SET_PRINT_STYLEA(0,\"FontSize\",8);\r\nLODOP.ADD_PRINT_TEXTA(\"sterilizationDate\",\"31.01mm\",\"9mm\",\"30mm\",\"6.01mm\",obj.sterilizationDate);\r\nLODOP.SET_PRINT_STYLEA(0,\"ContentVName\",\"obj.sterilizationDate\");\r\nLODOP.ADD_PRINT_TEXTA(\"operator\",\"31.01mm\",\"45.01mm\",\"30mm\",\"6.01mm\",obj.operator);\r\nLODOP.SET_PRINT_STYLEA(0,\"ContentVName\",\"obj.operator\");\r\nLODOP.ADD_PRINT_TEXTA(\"validDate\",\"36.99mm\",\"9mm\",\"30mm\",\"6.01mm\",obj.validDate);\r\nLODOP.SET_PRINT_STYLEA(0,\"ContentVName\",\"obj.validDate\");\r\nLODOP.ADD_PRINT_TEXTA(\"reviewer\",\"36.99mm\",\"45.01mm\",\"30mm\",\"6.01mm\",obj.reviewer);\r\nLODOP.SET_PRINT_STYLEA(0,\"ContentVName\",\"obj.reviewer\");\r\nLODOP.ADD_PRINT_BARCODE(\"44mm\",\"10mm\",\"40mm\",\"17.99mm\",\"128Auto\",obj.barcode);\r\nLODOP.SET_PRINT_STYLEA(0,\"ContentVName\",\"obj.barcode\");\r\nLODOP.ADD_PRINT_TEXTA(\"name\",\"64mm\",\"0mm\",\"60.01mm\",\"2.99mm\",obj.name);\r\nLODOP.SET_PRINT_STYLEA(0,\"FontSize\",6);\r\nLODOP.SET_PRINT_STYLEA(0,\"Alignment\",2);\r\nLODOP.SET_PRINT_STYLEA(0,\"ContentVName\",\"obj.name\");\r\nLODOP.ADD_PRINT_BARCODE(\"69mm\",\"10mm\",\"40mm\",\"10mm\",\"128Auto\",obj.barcode);\r\nLODOP.SET_PRINT_STYLEA(0,\"ContentVName\",\"obj.barcode\");\r\n","templateInfo":"{\"tableConfigs\":[]}","name":"普通中标签","width":"60mm","description":"","fullName":"模板-普通中标签","id":9,"dataSourceName":"普通器械包","height":"80mm"}
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 15199)
@@ -0,0 +1 @@
+{"programCodes":"LODOP.PRINT_INITA(0,0,\"50.01mm\",\"30mm\",\"\");\r\nLODOP.SET_PRINT_MODE(\"PROGRAM_CONTENT_BYVAR\",true);\r\nLODOP.ADD_PRINT_BARCODE(\"17.01mm\",\"10mm\",\"30mm\",\"10mm\",\"128Auto\",obj.barcode);\r\nLODOP.SET_PRINT_STYLEA(0,\"ContentVName\",\"obj.barcode\");\r\nLODOP.ADD_PRINT_TEXTA(\"name\",\"1.01mm\",\"0mm\",\"50.01mm\",\"5mm\",obj.name);\r\nLODOP.SET_PRINT_STYLEA(0,\"Alignment\",2);\r\nLODOP.SET_PRINT_STYLEA(0,\"ContentVName\",\"obj.name\");\r\nLODOP.ADD_PRINT_TEXTA(\"a\",\"6.01mm\",\"1.01mm\",\"10mm\",\"6.01mm\",\"灭菌:\");\r\nLODOP.SET_PRINT_STYLEA(0,\"FontSize\",8);\r\nLODOP.ADD_PRINT_TEXTA(\"sterilizationDate\",\"6.01mm\",\"7.99mm\",\"30mm\",\"6.01mm\",obj.sterilizationDate);\r\nLODOP.SET_PRINT_STYLEA(0,\"FontSize\",8);\r\nLODOP.SET_PRINT_STYLEA(0,\"ContentVName\",\"obj.sterilizationDate\");\r\nLODOP.ADD_PRINT_TEXTA(\"a\",\"6.01mm\",\"30mm\",\"10mm\",\"6.01mm\",\"装配:\");\r\nLODOP.SET_PRINT_STYLEA(0,\"FontSize\",8);\r\nLODOP.ADD_PRINT_TEXTA(\"operator\",\"6.01mm\",\"37.99mm\",\"30mm\",\"6.01mm\",obj.operator);\r\nLODOP.SET_PRINT_STYLEA(0,\"FontSize\",8);\r\nLODOP.SET_PRINT_STYLEA(0,\"ContentVName\",\"obj.operator\");\r\nLODOP.ADD_PRINT_TEXTA(\"a\",\"12.01mm\",\"1.01mm\",\"10mm\",\"6.01mm\",\"失效:\");\r\nLODOP.SET_PRINT_STYLEA(0,\"FontSize\",8);\r\nLODOP.ADD_PRINT_TEXTA(\"validDate\",\"12.01mm\",\"7.99mm\",\"30mm\",\"6.01mm\",obj.validDate);\r\nLODOP.SET_PRINT_STYLEA(0,\"FontSize\",8);\r\nLODOP.SET_PRINT_STYLEA(0,\"ContentVName\",\"obj.validDate\");\r\nLODOP.ADD_PRINT_TEXTA(\"a\",\"12.01mm\",\"30mm\",\"10mm\",\"6.01mm\",\"审核:\");\r\nLODOP.SET_PRINT_STYLEA(0,\"FontSize\",8);\r\nLODOP.ADD_PRINT_TEXTA(\"reviewer\",\"12.01mm\",\"37.99mm\",\"30mm\",\"6.01mm\",obj.reviewer);\r\nLODOP.SET_PRINT_STYLEA(0,\"FontSize\",8);\r\nLODOP.SET_PRINT_STYLEA(0,\"ContentVName\",\"obj.reviewer\");\r\n","templateInfo":"{\"tableConfigs\":[]}","name":"普通小标签","width":"50mm","description":"","fullName":"模板-普通小标签","id":8,"dataSourceName":"普通器械包","height":"30mm"}