Index: ssts-web/src/main/webapp/disinfectsystem/labelTemplateDesign/printCustomDesign.js
===================================================================
diff -u -r22651 -r24194
--- ssts-web/src/main/webapp/disinfectsystem/labelTemplateDesign/printCustomDesign.js	(.../printCustomDesign.js)	(revision 22651)
+++ ssts-web/src/main/webapp/disinfectsystem/labelTemplateDesign/printCustomDesign.js	(.../printCustomDesign.js)	(revision 24194)
@@ -116,6 +116,11 @@
 	LODOP.ADD_PRINT_BARCODE("1mm","1mm","10mm","10mm","128Auto", obj.barcode);// 条码1
 	LODOP.SET_PRINT_STYLEA(0, "ContentVName", 'obj.barcode');// 设置内容参数的变量名
 }
+function insert2DBarcode() {
+//	LODOP.ADD_PRINT_TEXTA(propName, 56, 32, 65, 30, value);
+	LODOP.ADD_PRINT_BARCODE("1mm","1mm","20mm","20mm","QRCode", obj.barcode);// 条码1
+	LODOP.SET_PRINT_STYLEA(0, "ContentVName", 'obj.barcode');// 设置内容参数的变量名
+}
 function insertBarcodeText() {
 	var propName = 'barcode';
 	getLODOP2();
@@ -410,6 +415,12 @@
     			}
     		}, {
     			xtype : 'button',
+    			text : '插入器械包条码（二维码）',
+    			handler : function() {
+    				insert2DBarcode();
+    			}
+    		}, {
+    			xtype : 'button',
     			text : '插入器械包条码文本',
     			handler : function() {
     				insertBarcodeText();