Index: ssts-web/src/main/webapp/disinfectsystem/print/print.js
===================================================================
diff -u -r14340 -r14392
--- ssts-web/src/main/webapp/disinfectsystem/print/print.js	(.../print.js)	(revision 14340)
+++ ssts-web/src/main/webapp/disinfectsystem/print/print.js	(.../print.js)	(revision 14392)
@@ -182,7 +182,25 @@
 	htmlString += ">";
 	return htmlString;
 }
-
+//获取表格某一列的样式。先获取columns中定义的style属性，如果没有定义，则使用goodsTable的style属性。
+//如果还是未定义,则使用固定值'BORDER: #000000 1px solid',打印出表格边框
+//@param goodsTable 要打印的表格
+//@param col 表格的列号,从0开始
+function getTableTdStyle(goodsTable,col){
+	var def = "'BORDER: #000000 1px solid'";
+	if(isObjEmpty(goodsTable) || isObjEmpty(goodsTable.columns)){
+		return def;
+	}
+	var item = goodsTable.columns[col];
+	var style = item.style;
+	if(isObjEmpty(style)){
+		style = goodsTable.style;
+	}
+	if(isObjEmpty(style)){
+		style = def;
+	}
+	return style;
+}
 //根据配置的表单打印信息，以及从服务器取到的物品信息数据，打印表单
 function print2(printSummaryObj){
 	LODOP = getLodop(document.getElementById('LODOP'), document
@@ -376,8 +394,8 @@
 	
 		for (var i=0;i<myObj.goodsTable.columns.length;i++){
 			var item = myObj.goodsTable.columns[i];
-			
-			tableHtml += "<td align='center' width ='" + item.width + "' style='BORDER: #000000 1px solid'>" + item.header + "</td>";
+			var style = getTableTdStyle(myObj.goodsTable,i);
+			tableHtml += "<td align='center' width ='" + item.width + "' style=" + style + ">" + item.header + "</td>";
 		}
 		tableHtml += "</tr>";
 	
@@ -400,18 +418,20 @@
 				if (item.dataIndex.toLowerCase().indexOf("price") >= 0){
 					value = formatMoney(value);
 				}
-				tableHtml += "<td align=" + item.align + " style='BORDER: #000000 1px solid'>" + value + "&nbsp</td>";
+				var style = getTableTdStyle(myObj.goodsTable,i);
+				tableHtml += "<td align=" + item.align + " style="+style+">" + value + "&nbsp</td>";
 			}
 			tableHtml += "</tr>";
 		}
 		
 		// 打印合计信息
 		tableHtml = appendTableRowString(tableHtml, myObj.goodsTable.rowHeight , myObj.goodsTable.fontSize);
-		tableHtml += "<td style='BORDER: #000000 1px solid' align='center'>合计</td>";
+		var style = getTableTdStyle(myObj.goodsTable,0);
+		tableHtml += "<td style="+style+" align='center'>合计</td>";
 
 		for (var i=1;i<columnCount;i++){
 			var item = myObj.goodsTable.columns[i];
-
+			var style = getTableTdStyle(myObj.goodsTable,i);
 			var value = "";
 			var indexName = item.dataIndex;
 			if (indexName == "goodsAmount" || indexName.toLowerCase().indexOf("count") >= 0  || indexName == "amount"){
@@ -427,7 +447,7 @@
 				value = formatMoney(printSummaryObj.totalPrice);
 			}
 
-			tableHtml += "<td align=" + item.align + " style='BORDER: #000000 1px solid'>" + value + "&nbsp</td>";
+			tableHtml += "<td align=" + item.align + " style="+style+">" + value + "&nbsp</td>";
 		}
 
 		tableHtml += "</tr>";
Index: ssts-web/src/main/webapp/disinfectsystem/config/dgsdhyy/print/printConfig.js
===================================================================
diff -u -r14388 -r14392
--- ssts-web/src/main/webapp/disinfectsystem/config/dgsdhyy/print/printConfig.js	(.../printConfig.js)	(revision 14388)
+++ ssts-web/src/main/webapp/disinfectsystem/config/dgsdhyy/print/printConfig.js	(.../printConfig.js)	(revision 14392)
@@ -282,45 +282,48 @@
     	            // 页眉名称
     	            //{label : "", dataIndex : 'unitName', fontSize : 10, position : ["5","1%","90%",5]},
     	            // 标题
-    	            {label : "东莞东华医院器械仓库领用出库单", dataIndex : '', fontSize : 15, position : ["5","25%","99%",5]},
-    	            {label : "接收科室：", dataIndex : 'depart', fontSize : 11, position : ["42","2%","90%",5]},
-    	        	{label : "仓库:供应室器械仓库", dataIndex : '', fontSize : 11, position : ["42","75%","90%",5]},
-    	        	{label : "制单人:", dataIndex : 'printUser', fontSize : 11, position : ["42","35%","90%",5]},
-    	        	{label : "打印时间:", dataIndex : 'printTime', fontSize : 11, position : ["65","35%","90%",5]},
-    	        	{label : "备注:", dataIndex : 'remark', fontSize : 11, position : ["65","2%","90%",5]},
-            	    {label : "领用人:", dataIndex : '', fontSize : 11, position : ["8.9cm","5%","90%",5]},
-            	    {label : "发货人:", dataIndex : '', fontSize : 11, position : ["8.9cm","30%","90%",5]},
-            	    {label : "下送人:", dataIndex : '', fontSize : 11, position : ["8.9cm","55%","90%",5]},
+    	            {label : "东莞东华医院  供应室器械仓库领用出库单", dataIndex : '', fontSize : 15, position : ["15","25%","99%",5]},
+    	            {label : "接收科室：", dataIndex : 'depart', fontSize : 11, position : ["57","2%","90%",5]},
+    	            {label : "日期:", dataIndex : 'printDate', fontSize : 11, position : ["57","33%","90%",5]},
+    	        	//{label : "仓库:供应室器械仓库", dataIndex : '', fontSize : 11, position : ["42","75%","90%",5]},
+    	        	//{label : "制单人:", dataIndex : 'printUser', fontSize : 11, position : ["42","35%","90%",5]},
+    	        	
+    	        	{label : "备注:", dataIndex : 'remark', fontSize : 11, position : ["57","75%","90%",5]},
+    	        	{label : "打印时间:", dataIndex : 'printTime', fontSize : 11, position : ["8.9cm","5%","90%",5]},
+    	        	{label : "发货人:", dataIndex : 'sender', fontSize : 11, position : ["8.9cm","35%","90%",5]},
+            	    {label : "下送人:", dataIndex : '', fontSize : 11, position : ["8.9cm","50%","90%",5]},
+            	    {label : "领用人:", dataIndex : '', fontSize : 11, position : ["8.9cm","65%","90%",5]},
             	    //{label : "复核人:", dataIndex : '', fontSize : 11, position : ["11cm","5%","90%",5]},
-            	    //{label : "审核人:", dataIndex : '', fontSize : 11, position : ["11cm","40%","90%",5]},
+            	    {label : "审核人:", dataIndex : '', fontSize : 11, position : ["8.9cm","80%","90%",5]},
         	    	{barcodes : [
-        				{codeType : "128Auto", dataIndex : 'departBarcode', position : ["5","74%","40mm","8mm"],
+        				{codeType : "128Auto", dataIndex : 'departBarcode', position : ["15","74%","40mm","8mm"],
         					styles : [{itemNameID: 0, styleName: 'ShowBarText', styleValue: true},
         				          {itemNameID: 0, styleName: 'FontSize', styleValue: 6},
         				          {itemNameID: 0, styleName: 'NotOnlyHighPrecision', styleValue: true}
         				]
         			    }
         		    ]}
     	        ],
-    	        currentPageNumber : {label : "第#页", fontSize : 11, position : ["8.9cm","75%","90%",5]},
-    	        totalPageAmount : {label : "共&页", fontSize : 11, position : ["8.9cm","81%","90%",5]},
+    	        currentPageNumber : {label : "页: # / ", fontSize : 11, position : ["57","55%","90%",5]},
+    	        totalPageAmount : {label : "&", fontSize : 11, position : ["57","63%","90%",5]},
     	        goodsTable :{
     	        	rowHeight : 25,
-    	        	position : ["85","0.2cm","20.5cm","6.5cm"],
+    	        	position : ["85","0.2cm","20.4cm","6.5cm"],
     	        	headRepeat : true,
-    	        	fontSize:10,
+    	        	fontSize:11,
+    	        	style:'"border-left:0px;border-right:0px;border-top:#000000 1px solid;border-bottom:#000000 1px solid;"',
     	        	columns : [
     	        	    {header : "序号", dataIndex : 'serialNumber', width : '5%', align : 'center', fontSize : 11},
     	                {header : "名称", dataIndex : 'name', width : 145, align : 'left', fontSize : 11},
     	                {header : "规格", dataIndex : 'specification', width : '9%', align : 'center', fontSize : 11},
     	                {header : "包装规格", dataIndex : 'packageSpec', width : '9%', align : 'center', fontSize : 11},
     	                {header : "单位", dataIndex : 'unit', width : '4%', align : 'center', fontSize : 11},
     	                {header : "数量", dataIndex : 'amount', width : '4%', align : 'right', fontSize : 11},
-    	                {header : "批次/灭菌日期", dataIndex : 'batchNumber', width : '9%', align : 'center', fontSize : 11},
+    	                {header : "批次/灭菌日期", dataIndex : 'batchNumber', width : '10%', align : 'center', fontSize : 11},
     	                {header : "失效日期", dataIndex : 'expireDate', width : '8%', align : 'center', fontSize : 11},
-    	                {header : "单价", dataIndex : 'price', width : '8%', align : 'center', fontSize : 11},
+    	                {header : "单价", dataIndex : 'price', width : '6%', align : 'center', fontSize : 11},
     	                {header : "金额", dataIndex : 'totalPrice', width : '9%', align : 'center', fontSize : 11},
-    	                {header : "生产厂家", dataIndex : 'manufacturer', width : '16%', align : 'center', fontSize : 11}
+    	                {header : "生产厂家", dataIndex : 'manufacturer', width : '17%', align : 'center', fontSize : 11}
     	            ]
     	        }
 }
@@ -1091,8 +1094,8 @@
 	
 	// 划线
 	if(obj.markTousse){
-		LODOP.ADD_PRINT_LINE('54mm','0mm','54mm','60mm',0,1);
-		LODOP.ADD_PRINT_LINE('64mm','0mm','64mm','60mm',0,1);
+		LODOP.ADD_PRINT_LINE('50mm','0mm','50mm','60mm',0,1);
+		LODOP.ADD_PRINT_LINE('60mm','0mm','60mm','60mm',0,1);
 	}
 	// 设置默认字体
 	setDefaultFontNameSizeBold('宋体',15,1);
@@ -1116,20 +1119,29 @@
 	
 	// 打印表格
 	var tableStr = getMaterialsTabHtml_middleLable(obj);
-	addPrintTable(tableStr,"12mm","1mm","RightMargin:1mm","42mm");
+	addPrintTable(tableStr,"12mm","1mm","RightMargin:1mm","38mm");
 	setAlignment('center');// 居中对齐
 	
-	LODOP.ADD_PRINT_TEXT("55mm","1mm","34mm","5mm", "灭菌:"+obj.sterilizationDate);
+	LODOP.ADD_PRINT_TEXT("51mm","1mm","34mm","5mm", "灭菌:"+obj.sterilizationDate);
 	setFontSizeBold(11,0);// 设置字体
-	LODOP.ADD_PRINT_TEXT("55mm","33mm","30mm","5mm", "装配员:"+obj.operator);
+	LODOP.ADD_PRINT_TEXT("51mm","33mm","30mm","5mm", "装配员:"+obj.operator);
 	setFontSizeBold(11,0);// 设置字体
-	LODOP.ADD_PRINT_TEXT("60mm","1mm","34mm","5mm", "失效:"+obj.validDate);
+	LODOP.ADD_PRINT_TEXT("56mm","1mm","34mm","5mm", "失效:"+obj.validDate);
 	setFontSizeBold(11,0);// 设置字体
-	LODOP.ADD_PRINT_TEXT("60mm","33mm","30mm","5mm", "审核员:"+obj.reviewer);
+	LODOP.ADD_PRINT_TEXT("56mm","33mm","30mm","5mm", "审核员:"+obj.reviewer);
 	setFontSizeBold(11,0);// 设置字体
 	
-	LODOP.ADD_PRINT_BARCODE("67mm","10mm","40mm","11mm","128Auto", obj.barcode);// 条码2
+	fontSize = getFontSizeByStr(obj.name,[
+		                                        {maxLen:10,fontSize:10},
+		                                  		{maxLen:20,fontSize:8},
+		                                		{maxLen:1000,fontSize:6}
+		                                  		]);
+	LODOP.ADD_PRINT_TEXT("76mm","0mm","RightMargin:0mm","3mm", obj.name);
+	setFontSizeBold(fontSize,1);// 设置字体
 	setAlignment('center');// 对齐
+	
+	LODOP.ADD_PRINT_BARCODE("64mm","10mm","40mm","11mm","128Auto", obj.barcode);// 条码2
+	setAlignment('center');// 对齐
 }
 
 var foreignTousseMiddleLableConfig = {