Index: ssts-web/src/main/webapp/disinfectsystem/labelTemplateDesign/printCustomDesign.js
===================================================================
diff -u -r15748 -r15769
--- ssts-web/src/main/webapp/disinfectsystem/labelTemplateDesign/printCustomDesign.js	(.../printCustomDesign.js)	(revision 15748)
+++ ssts-web/src/main/webapp/disinfectsystem/labelTemplateDesign/printCustomDesign.js	(.../printCustomDesign.js)	(revision 15769)
@@ -148,12 +148,12 @@
 		showResult("表格已存在!");
 		return;
 	}
+	var itemsPerRow = Ext4.getCmp('itemsPerRow').getValue();
 	var columnAmount = Ext4.getCmp('columnAmount').getValue();
 	var tableDataSourceName = Ext4.getCmp('table_dataSource_name').getValue();
-	
 	var tableConfig = new TableConfig({
 		tableDataSourceName: tableDataSourceName,
-		itemsPerRow: 1,
+		itemsPerRow: itemsPerRow,
 		columnAmount: columnAmount,
 		fontConfig: new FontConfig(),
 		headFontConfig: new FontConfig(),
@@ -511,7 +511,8 @@
         	render : function(field,event){
         		// 动态创建列
         		var colAmount = tableConfig.columnConfigs.length;
-        		var ds = tableConfig.getDataSourceItemNamesForCombo();
+        		var itemsPerRow = tableConfig.itemsPerRow;
+        		var ds = tableConfig.getDataSourceItemNamesForCombo(itemsPerRow);
         		var p = Ext4.getCmp('editTableDataItemPanel');
         		for(var i=0;i<colAmount;++i){
         			var num = i+1;
@@ -528,6 +529,9 @@
         					data : ds
         				}),
         				listeners:{
+//        					render : function(field,event){
+//        						field.setRawValue(records[0].data.value);
+//        					},
 							select: function(combo, records, index){
 								combo.setRawValue(records[0].data.value);
 							}
@@ -601,7 +605,6 @@
         	render : function(field,event){
         		// 动态创建列
         		var colAmount = tableConfig.columnConfigs.length;
-        		var ds = tableConfig.getDataSourceItemNamesForCombo();
         		var p = Ext4.getCmp('table_column_panel');
         		for(var i=0;i<colAmount;++i){
         			var num = i+1;
@@ -672,6 +675,13 @@
         	defaultType: 'textfield',
         	items: [{
             	xtype: 'numberfield',
+            	id: 'itemsPerRow',
+            	fieldLabel: '每行包数',
+                value: 1,
+                maxValue: 3,
+                minValue: 1
+            },{
+            	xtype: 'numberfield',
             	id: 'columnAmount',
             	fieldLabel: '列数',
                 value: 3,
@@ -1038,6 +1048,7 @@
 for(var i=0;i<10;++i){
 	var num = i+1;
 	dataSource1.materials.push({
+		name: '材料'+num,
 		fullName: '材料'+num,
 		count: '数量'+num,
 		price: '单价'+num