Index: ssts-web/src/main/webapp/disinfectsystem/labelTemplateDesign/printCustomDesign.js
===================================================================
diff -u -r15036 -r15071
--- ssts-web/src/main/webapp/disinfectsystem/labelTemplateDesign/printCustomDesign.js	(.../printCustomDesign.js)	(revision 15036)
+++ ssts-web/src/main/webapp/disinfectsystem/labelTemplateDesign/printCustomDesign.js	(.../printCustomDesign.js)	(revision 15071)
@@ -58,7 +58,9 @@
 }
 function CreatePage() {
 	getLODOP2();
+//	alert(currentConfig.width)
 	LODOP.PRINT_INITA(0, 0, currentConfig.width, currentConfig.height, "小标签");
+	LODOP.PRINT_INITA(0, 0, '800px', '600px', "小标签");
 	LODOP.SET_PRINT_MODE("PROGRAM_CONTENT_BYVAR", true);// 生成程序时，内容参数有变量用变量，无变量用具体值
 };
 function DisplayDesign() {
@@ -68,10 +70,14 @@
 //		alert(currentConfig.programCodes)
 		eval(currentConfig.programCodes);// 执行eval方法，装载模板
 	}
+//	LODOP.PRINT_INITA(0, 0, '800px', '600px', "小标签");
+//	LODOP.PRINT_INITA(0, 0, '300%', '300%', "小标签");
 	
 	LODOP.SET_SHOW_MODE("DESIGN_IN_BROWSE", 1);
+//	LODOP.SET_SHOW_MODE("HIDE_ITEM_LIST",false);//设置对象列表默认处于关闭状态
+	LODOP.SET_SHOW_MODE("TEXT_SHOW_BORDER",2); //设置字符编辑框默认为无边框
 	LODOP.SET_SHOW_MODE("SETUP_ENABLESS", "11111111000000");// 隐藏关闭(叉)按钮
-	LODOP.SET_SHOW_MODE("HIDE_GROUND_LOCK", true);// 隐藏纸钉按钮
+//	LODOP.SET_SHOW_MODE("HIDE_GROUND_LOCK", true);// 隐藏纸钉按钮
 	LODOP.PRINT_DESIGN();
 };
 function DisplaySetup() {
@@ -88,6 +94,64 @@
 function insertTextItem() {
 	LODOP.ADD_PRINT_TEXTA('a', 0, 0, 75, 30, '文本');
 }
+function testInsertTable(tableConfig){
+	var tableHtml = createTableHtmlByConfig(tableConfig,dataSource1);
+	LODOP.ADD_PRINT_TABLE(0,0,'800px','600px',tableHtml);
+	LODOP.SET_PRINT_STYLEA(0, "ItemType",4);// 多页项
+}
+// 插入表格
+function insertTable() {
+	var tableConfigs = currentConfig.tableConfigs;
+	if(tableConfigs.length > 0){
+		showResult("表格已存在!");
+		return;
+	}
+	var columnAmount = Ext4.getCmp('columnAmount').getValue();
+	var tableConfig = new TableConfig({
+		itemsPerRow: 1,
+		columnAmount: columnAmount,
+		fontConfig: new FontConfig(),
+		borderConfig: new BorderConfig(),
+		tableRowConfigs: []
+	});
+	// 初始化行列配置
+	// 表头
+	var rowConfig = Ext4.create('TableRowConfig',{
+		align: 'center',
+		height: '25',
+		fontConfig: new FontConfig(),
+		borderConfig: new BorderConfig(),
+		type: ROW_TYPE_TABLEHEAD,
+		columnConfigs: []
+	});
+	for(var i=0;i<columnAmount;++i){
+		var column = new TableColumnConfig({
+			innerHTML:'列'+(i+1)
+		});
+		rowConfig.insertColumnConfig(column);
+	}
+	tableConfig.insertRowConfig(rowConfig);
+	// 数据项
+	var rowConfig2 = Ext4.create('TableRowConfig',{
+		align: 'center',
+		height: '25',
+		fontConfig: new FontConfig(),
+		borderConfig: new BorderConfig(),
+		type: ROW_TYPE_DATAITEM,
+		columnConfigs: []
+	});
+	for(var i=0;i<columnAmount;++i){
+		var column = new TableColumnConfig({
+			innerHTML:''
+		});
+		rowConfig2.insertColumnConfig(column);
+	}
+	tableConfig.insertRowConfig(rowConfig2);
+	tableConfigs.push(tableConfig);
+	
+	testInsertTable(tableConfig);
+}
+
 function Addhtm() {
 	LODOP
 			.ADD_PRINT_HTM(
@@ -141,6 +205,11 @@
 	LODOP.SET_SHOW_MODE("HIDE_GROUND_LOCK", true);// 隐藏纸钉按钮
 
 };
+
+function zoomIn(){
+	getLODOP2();
+//	LODOP.DO_ACTION("PREVIEW_ZOOM_IN",0);
+}
 function prn_Preview() {
 	getLODOP2();
 	getProgram();
@@ -189,7 +258,7 @@
 		labelSeparator : ':',
 		bodyStyle : 'padding:5px 5px 0px 5px;',
 		width : 800,
-
+		layout:'column',
 		renderTo : 'bottomDiv',
 		fieldDefaults : {
 			labelAlign : 'left',
@@ -199,8 +268,7 @@
 			xtype : 'hidden',
 			id : 'id',
 			name : 'id'
-		} ],
-		tbar : [ {
+		}, {
 			xtype : 'button',
 			text : '删除所选项',
 			handler : function() {
@@ -212,7 +280,7 @@
 			handler : function() {
 				insertTextItem();
 			}
-		}, {
+		},{
 			xtype : 'checkboxfield',
 			id: 'cmp_name',
 			boxLabel  : '包名称',
@@ -289,8 +357,16 @@
 			handler : function(checkbox,checked) {
 				addOrRemove(checked,'implantAmount');
 			}
-		} ],
+		}  ],
+//		tbar : [],
 		buttons : [ {
+			id : 'zoomIn',
+			text : '放大',
+			hidden : false,
+			handler : function() {
+				zoomIn();
+			}
+		},{
 			id : 'pre',
 			text : '预览',
 			hidden : false,
@@ -311,7 +387,191 @@
 		} ]
 	});
 }
-
+function showInsertTableWindow(){
+	var w = Ext4.create('widget.window', {
+        header: {
+            titlePosition: 2,
+            titleAlign: 'center'
+        },
+        closable: false,
+        closeAction: 'hide',
+        width: 400,
+        minWidth: 350,
+        height: 300,
+        x:800,
+        layout: 'fit',
+        items: [{
+        	xtype: 'form',
+        	id: 'insertTableForm',
+        	defaultType: 'textfield',
+        	items: [{
+            	xtype: 'numberfield',
+            	id: 'columnAmount',
+            	fieldLabel: '列数',
+                value: 3,
+                maxValue: 20,
+                minValue: 1
+            }]
+        }],
+        buttons : [ {
+			text : '确定',
+			hidden : false,
+			handler : function() {
+				var insertTableForm = Ext4.getCmp('insertTableForm');
+				if(!insertTableForm.form.isValid()){
+					showResult('请正确填写表单各值!');
+					return;
+				}
+				insertTable();
+				w.close();
+			}
+		}, {
+			text : '取消',
+			handler : function(){
+				w.close();
+			}
+		} ]
+    });
+    w.show();
+}
+// 显示表格窗口
+var tableDesignWindow = null;
+function showTableDesignWindow(){
+    if (!tableDesignWindow) {
+    	tableDesignWindow = Ext4.create('widget.window', {
+            title: '表格设计器',
+            header: {
+                titlePosition: 2,
+                titleAlign: 'center'
+            },
+            closable: false,
+            closeAction: 'hide',
+            maximizable: true,
+            width: 600,
+            minWidth: 350,
+            height: 600,
+            x:800,
+//            tools: [{type: 'pin'}],
+            layout: {
+                type: 'border',
+                padding: 5
+            },
+            items: [{
+                region: 'west',
+                title: '表格列表',
+                width: 200,
+                split: true,
+                collapsible: true,
+                floatable: false
+            }, {
+                region: 'north',
+                xtype: 'panel',
+                layout: 'column',
+                items: [{
+                    // LTR even when example is RTL so that the code can be read
+                	xtype: 'button',
+                    text: '插入表格',
+                    handler : function() {
+                    	showInsertTableWindow();
+        			}
+                },{
+                    // LTR even when example is RTL so that the code can be read
+                	xtype: 'button',
+                    text: '删除表格',
+                    handler : function() {
+        				prn_Preview();
+        			}
+                }]
+            }, {
+                region: 'center',
+                xtype: 'form',
+                items: [{
+                	xtype:'fieldset',
+                    title: '表格打印区域',
+                	defaultType: 'textfield',
+                	items: [{
+                    	fieldLabel: '上边距',
+                    	id: 'table_top_forPrint',
+                    	value: '0px',
+                    	allowBlank: false
+                    },{
+                    	fieldLabel: '左边距',
+                    	id: 'table_left_forPrint',
+                    	value: '0px',
+                    	allowBlank: false
+                    },{
+                    	fieldLabel: '宽度',
+                    	id: 'table_width_forPrint',
+                    	value: '600px',
+                    	allowBlank: false
+                    },{
+                    	fieldLabel: '高度',
+                    	id: 'table_height_forPrint',
+                    	value: '400px',
+                    	allowBlank: false
+                    }]
+                },{
+                	xtype:'fieldset',
+                    title: '表格属性',
+                	defaultType: 'textfield',
+                	items: [{
+                    	fieldLabel: '宽度',
+                    	id: 'table_width',
+                    	value: '600px',
+                    	allowBlank: false
+                    },{
+                    	fieldLabel: '高度',
+                    	id: 'table_height',
+                    	value: '400px',
+                    	allowBlank: false
+                    }]
+                }]
+            }, {
+                region: 'south',
+                xtype: 'tabpanel',
+                items: [{
+                    // LTR even when example is RTL so that the code can be read
+                    rtl: false,
+                    title: 'Bogus Tab',
+                    html: '<p>Window configured with:</p><pre style="margin-left:20px"><code>header: {\n    titlePosition: 2,\n    titleAlign: "center"\n},\nmaximizable: true,\ntools: [{type: "pin"}],\nclosable: true</code></pre>'
+                }, {
+                    title: 'Another Tab',
+                    html: 'Hello world 2'
+                }, {
+                    title: 'Closable Tab',
+                    html: 'Hello world 3',
+                    closable: true
+                }]
+            }, {
+                region: 'east',
+                xtype: 'tabpanel',
+                items: [{
+                    // LTR even when example is RTL so that the code can be read
+                    rtl: false,
+                    title: 'Bogus Tab',
+                    html: '<p>Window configured with:</p><pre style="margin-left:20px"><code>header: {\n    titlePosition: 2,\n    titleAlign: "center"\n},\nmaximizable: true,\ntools: [{type: "pin"}],\nclosable: true</code></pre>'
+                }, {
+                    title: 'Another Tab',
+                    html: 'Hello world 2'
+                }, {
+                    title: 'Closable Tab',
+                    html: 'Hello world 3',
+                    closable: true
+                }]
+            }]
+        });
+    }
+    tableDesignWindow.show();
+//    if (win.isVisible()) {
+//        win.hide(this, function() {
+//            button.dom.disabled = false;
+//        });
+//    } else {
+//        win.show(this, function() {
+//            button.dom.disabled = false;
+//        });
+//    }
+}
 function loadConfigAndInitDesign() {
 	
 	if (!Ext4.isEmpty(id)) {
@@ -327,6 +587,11 @@
 				var result = Ext4.JSON.decode(response.responseText);
 				if (result.success && result.data) {
 					currentConfig = result.data;
+					if(isUndefinedOrNullOrEmpty(currentConfig.tableConfigs)){
+						currentConfig.tableConfigs = [];
+					}else{
+						currentConfig.tableConfigs = Ext4.JSON.decode(currentConfig.tableConfigs);
+					}
 					DisplayDesign();
 //					restoreDesign();
 				} else {
@@ -344,5 +609,282 @@
 	Ext4.QuickTips.init();
 	
 	showWindow('');
+	showTableDesignWindow();
 	loadConfigAndInitDesign();
 });
+
+//function FontConfig(){
+//	this.fontStyle = 'normal';
+//	this.fontVariant = 'normal';
+//	this.fontWeight = 'normal';
+//	this.fontSize = '16px';
+//	this.fontSizeValue = '16';
+//	this.fontSizeUnit = 'px';
+//	this.fontFamily = '宋体';
+//}
+//FontConfig.prototype = {
+//	
+//}
+Ext4.define("StyleConfig", {
+	getStyleStr: function(){
+		return '';
+	}
+});
+Ext4.define("FontConfig", {
+	fontStyle: 'normal',
+	fontVariant: 'normal',
+	fontWeight: 'normal',
+	fontSize: '16px',
+	fontSizeValue: '16',
+	fontSizeUnit: 'px',
+	fontFamily: '宋体',
+    extend: 'StyleConfig',
+    getStyleStr: function(){
+		return this.fontStyle +' '+ this.fontVariant +' '+ this.fontWeight +' '+ this.fontSize +' '+ this.fontFamily+';';
+	},
+    constructor: function(){
+        this.callParent(arguments);
+    }
+});
+Ext4.define("BorderConfig", {
+    extend: 'StyleConfig',
+    getStyleStr: function(){
+		return this.borderWidth +' '+ this.borderStyle +' '+ this.borderColor+';';
+	},
+    constructor: function(){
+        this.callParent(arguments);
+        this.borderWidth = '1px';
+        this.borderStyle = 'solid';
+        this.borderColor = 'black';
+    }
+});
+Ext4.define("TableColumnConfig", {
+	config:{
+		align: 'center',
+		width: '30%',
+		innerHTML:'',
+		fontConfig: new FontConfig(),
+		borderConfig: new BorderConfig()
+	},
+	constructor: function(config){
+		this.initConfig(config);
+        this.callParent(arguments);
+    },
+	getStyleStr: function(){
+		return this.borderConfig.getStyleStr() + this.fontConfig.getStyleStr();
+	}
+});
+var ROW_TYPE_TABLEHEAD = '表头';
+var ROW_TYPE_TABLEFOOT = '表尾';
+var ROW_TYPE_PAGEHEAD = '页头';
+var ROW_TYPE_PAGEFOOT = '页尾';
+var ROW_TYPE_DATAITEM = '数据项'; 
+
+
+Ext4.define("TableRowConfig", {
+	config:{
+		align: 'center',
+		height: '25',
+		fontConfig: new FontConfig(),
+		borderConfig: new BorderConfig(),
+		type: ROW_TYPE_DATAITEM,
+		columnConfigs: []
+	},
+	constructor: function(config){
+		this.initConfig(config);
+        this.callParent(arguments);
+    },
+	getStyleStr: function(){
+		return '';
+	},
+	insertColumnConfig: function(columnConfig){
+		this.columnConfigs.push(columnConfig);
+	}
+});
+
+
+Ext4.define("TableConfig", {
+	config:{
+		itemsPerRow: 1,
+		columnAmount:3,
+		fontConfig: new FontConfig(),
+		borderConfig: new BorderConfig(),
+		tableRowConfigs: []
+	},
+	constructor: function(config){
+		this.initConfig(config);
+        this.callParent(arguments);
+    },
+	getTableHeadRowConfig: function(){
+		var heads = [];
+		for(var i=0;i<this.tableRowConfigs.length;++i){
+			if(this.tableRowConfigs[i].type == ROW_TYPE_TABLEHEAD){
+				heads.push(this.tableRowConfigs[i]);
+			}
+		}
+		return heads;
+	},
+	getTableDataItemRowConfig: function(){
+		for(var i=0;i<this.tableRowConfigs.length;++i){
+			if(this.tableRowConfigs[i].type == ROW_TYPE_DATAITEM){
+				return this.tableRowConfigs[i];
+			}
+		}
+		return null;
+	},
+	getStyleStr: function(){
+		return this.borderConfig.getStyleStr() + this.fontConfig.getStyleStr();
+	},
+	insertRowConfig: function(tableRowConfig){
+		this.tableRowConfigs.push(tableRowConfig);
+	}
+});
+// 测试配置和数据源
+var tableConfig1 = new TableConfig({
+	itemsPerRow: 1,
+	fontConfig: new FontConfig(),
+	borderConfig: new BorderConfig(),
+	tableRowConfigs: []
+});
+
+var rowConfig = Ext4.create('TableRowConfig',{
+	align: 'center',
+	height: '25',
+	fontConfig: new FontConfig(),
+	borderConfig: new BorderConfig(),
+	type: ROW_TYPE_TABLEHEAD,
+	columnConfigs: []
+});
+
+var column = new TableColumnConfig({
+	innerHTML:'包名'
+});
+rowConfig.insertColumnConfig(column);
+
+var column = new TableColumnConfig({
+	innerHTML:'数量'
+});
+rowConfig.insertColumnConfig(column);
+
+var column = new TableColumnConfig({
+	innerHTML:'包名'
+});
+rowConfig.insertColumnConfig(column);
+
+var column = new TableColumnConfig({
+	innerHTML:'数量'
+});
+rowConfig.insertColumnConfig(column);
+
+tableConfig1.insertRowConfig(rowConfig);
+// 数据项
+var rowConfig2 = Ext4.create('TableRowConfig',{
+	align: 'center',
+	height: '25',
+	fontConfig: new FontConfig(),
+	borderConfig: new BorderConfig(),
+	type: ROW_TYPE_DATAITEM,
+	columnConfigs: []
+});
+var column = new TableColumnConfig({
+	innerHTML:'${item1.name}'
+});
+rowConfig2.insertColumnConfig(column);
+
+var column = new TableColumnConfig({
+	innerHTML:'${item1.amount}'
+});
+rowConfig2.insertColumnConfig(column);
+
+var column = new TableColumnConfig({
+	innerHTML:'${item2.name}'
+});
+rowConfig2.insertColumnConfig(column);
+
+var column = new TableColumnConfig({
+	innerHTML:'${item2.amount}'
+});
+rowConfig2.insertColumnConfig(column);
+
+tableConfig1.insertRowConfig(rowConfig2);
+tableConfig1.itemsPerRow = 2;
+
+// 数据源
+var dataSource1 = {
+	dataItems:[]	
+}
+for(var i=0;i<10;++i){
+	dataSource1.dataItems.push({
+		name: '材料'+(i+1),
+		amount: '数量'+(i+1)
+	});
+}
+//alert(createTableHtmlByConfig(tableConfig1,dataSource1));
+// 根据配置和数据源生成表格
+function createTableHtmlByConfig(tableConfig,obj){
+	var tableHtml = '';
+	var tempStr;
+	
+	tableConfig.tableStyle = tableConfig.getStyleStr();
+	// 表格本身
+	tempStr = '<table border ="0" cellspacing="0" cellpadding="0" style="${tableStyle}" >';
+	tableHtml += fillPropertiesFromObj(tableConfig,tempStr);
+	// 获取表头配置
+	var headRowConfigs = tableConfig.getTableHeadRowConfig();
+	if(headRowConfigs.length > 0){
+		for(var r=0;r<headRowConfigs.length;++r){
+			var headRowConfig = headRowConfigs[r];
+			var columnConfigs = headRowConfig.columnConfigs;
+			tableHtml += '<tr height="'+headRowConfig.height+'">';
+			for(var c=0;c<columnConfigs.length;++c){
+				var columnConfig = columnConfigs[c];
+				columnConfig.columnStyle = columnConfig.getStyleStr();
+				tempStr = '<td align="'+columnConfig.align+'" width ="'+columnConfig.width+'" style="'+columnConfig.columnStyle+'">'+columnConfig.innerHTML+'</td>';
+				tableHtml += fillPropertiesFromObj(columnConfig,tempStr);
+			}
+			tableHtml += '</tr>';
+		}
+	}
+	// 数据项
+	var dataRowConfig = tableConfig.getTableDataItemRowConfig();
+	if(dataRowConfig != null){
+		var itemsPerRow = tableConfig.itemsPerRow;
+		var dataItems = obj.dataItems;
+		var mod = dataItems.length % itemsPerRow;
+		var itemsCount = dataItems.length;
+		var rowsCount = parseInt(itemsCount/itemsPerRow);
+		if(mod != 0){
+			rowsCount++;
+		}
+		if(rowsCount > 0){
+			var columnConfigs = dataRowConfig.columnConfigs;
+			for(var row=0;row<rowsCount;++row){
+				tableHtml += '<tr height="'+dataRowConfig.height+'">';
+				for(var c=0;c<columnConfigs.length;++c){
+					var columnConfig = columnConfigs[c];
+					columnConfig.columnStyle = columnConfig.getStyleStr();
+					
+					var itemsObj = {};
+					for(var i=0;i<itemsPerRow;++i){
+						var tdItemI = null;
+						var index = row*itemsPerRow + i;
+						if(index < itemsCount){
+							tdItemI = dataItems[index];
+						}else{
+							tdItemI = {};
+						}
+						itemsObj['item'+(i+1)] = tdItemI;
+					}
+					tempStr = '<td align="'+columnConfig.align+'" width ="'+columnConfig.width+'" style="'+columnConfig.columnStyle+'">'+columnConfig.innerHTML+'</td>';
+					tableHtml += fillPropertiesFromObj(itemsObj,tempStr);
+				}
+				tableHtml += "</tr>";
+			}
+		}
+	}
+	
+	// 结束表格
+	tableHtml += '</table>';
+
+	return tableHtml;
+}
Index: ssts-web/src/main/webapp/disinfectsystem/labelTemplateDesign/printCustomDesign.jsp
===================================================================
diff -u -r15036 -r15071
--- ssts-web/src/main/webapp/disinfectsystem/labelTemplateDesign/printCustomDesign.jsp	(.../printCustomDesign.jsp)	(revision 15036)
+++ ssts-web/src/main/webapp/disinfectsystem/labelTemplateDesign/printCustomDesign.jsp	(.../printCustomDesign.jsp)	(revision 15071)
@@ -10,6 +10,7 @@
 <meta http-equiv="Content-Type" content="text/html; charset=UTF-8" />
 <script type="text/javascript" src="${ctx}/js/common.js" /></script>
 <script language="javascript" src="LodopFuncs.js"></script>
+<script type="text/javascript" src="${ctx}/disinfectsystem/print/print.js"></script>
 <script language="javascript" src="printCustomDesign.js"></script>
 <object id="LODOP1" classid="clsid:2105C259-1E0C-4534-8141-A753534CB4CA" width=0 height=0> 
 	<embed id="LODOP_EM1" TYPE="application/x-print-lodop" width=0 height=0 PLUGINSPAGE="install_lodop32.exe"></embed>