Index: ssts-web/src/main/webapp/disinfectsystem/config/fsszyy/print/printConfig.js
===================================================================
diff -u -r28544 -r28724
--- ssts-web/src/main/webapp/disinfectsystem/config/fsszyy/print/printConfig.js	(.../printConfig.js)	(revision 28544)
+++ ssts-web/src/main/webapp/disinfectsystem/config/fsszyy/print/printConfig.js	(.../printConfig.js)	(revision 28724)
@@ -196,10 +196,9 @@
         footer: {
         	fontSize : 12,
         	content : [
-        	    {label : "<br>主管:      ", dataIndex : ''},
-        	    {label : "   领料人:      ", dataIndex : ''},
-        	    {label : "   发料人: ", dataIndex : 'printUser'},
-        	    {label : "   发货日期:", dataIndex : 'printTime'}
+        	    {label : "<br>领料人:      ", dataIndex : ''},
+        	    {label : "     发料人: ", dataIndex : 'printUser'},
+        	    {label : "     发货日期:", dataIndex : 'printTime'}
         	]
         },
     	barcodes : [
@@ -261,9 +260,8 @@
     	        	{label : "制单人:", dataIndex : 'printUser', fontSize : 11, position : ["20","35%","90%",5]},
     	        	{label : "打印时间:", dataIndex : 'printTime', fontSize : 11, position : ["35","35%","90%",5]},
     	        	{label : "备注:", dataIndex : 'remark', fontSize : 11, position : ["30","2%","90%",5]},
-            	    {label : "主管:", dataIndex : '', fontSize : 11, position : ["8cm","5%","90%",5]},
-            	    {label : "领料人:", dataIndex : '', fontSize : 11, position : ["8cm","40%","90%",5]},
-            	    {label : "发料人:", dataIndex : 'sender', fontSize : 11, position : ["8cm","75%","90%",5]},
+            	    {label : "领料人:", dataIndex : '', fontSize : 11, position : ["8cm","5%","90%",5]},
+            	    {label : "发料人:", dataIndex : 'sender', fontSize : 11, position : ["8cm","40%","90%",5]},
         	    	{barcodes : [
         				{codeType : "128Auto", dataIndex : 'departBarcode', position : ["1mm","74%","40mm","8mm"],
         					styles : [{itemNameID: 0, styleName: 'ShowBarText', styleValue: true},
@@ -282,16 +280,16 @@
     	        	position : ["60","1%","87%","5.5cm"],
     	        	headRepeat : true,
     	        	columns : [
-    	        	    {header : "序号", dataIndex : 'serialNumber', width : '20', align : 'center', fontSize : 10},
+    	        	    {header : "序号", dataIndex : 'serialNumber', width : '10', align : 'center', fontSize : 10},
     	                {header : "名称", dataIndex : 'name', width : '60', align : 'left', fontSize : 10},
- //   	                {header : "规格", dataIndex : 'specification', width : '10%', align : 'center', fontSize : 10},
+    	                {header : "规格", dataIndex : 'specification', width : '10%', align : 'center', fontSize : 10},
 //    	                {header : "包装规格", dataIndex : 'packageSpec', width : '10%', align : 'center', fontSize : 11},
 //    	                {header : "单位", dataIndex : 'unit', width : '5%', align : 'center', fontSize : 10},
     	                {header : "数量", dataIndex : 'amount', width : '40', align : 'center', fontSize : 10},
 //    	                {header : "批次/灭菌日期", dataIndex : 'batchNumber', width : 105, align : 'center', fontSize : 11},
 //    	                {header : "失效日期", dataIndex : 'expireDate', width : 85, align : 'center', fontSize : 11},
     	                {header : "单价", dataIndex : 'price', width : '60', align : 'center', fontSize : 10,align : 'right'},
-    	                {header : "金额", dataIndex : 'totalPrice', width : '65', align : 'left', fontSize : 10,align : 'right'}
+    	                {header : "金额", dataIndex : 'totalPrice', width : '65', align : 'left', fontSize : 10,align : 'left'}
     	            ]
     	        }
 }
@@ -308,9 +306,8 @@
 	        	{label : "制单人:", dataIndex : 'printUser', fontSize : 11, position : ["80","75%","90%",5]},
 	        	{label : "申请时间:", dataIndex : 'applicationTime', fontSize : 11, position : ["80","35%","90%",5]},
 	        	{label : "备注:", dataIndex : 'remark', fontSize : 11, position : ["80","2%","90%",5]},
-        	    {label : "主管:", dataIndex : '', fontSize : 11, position : ["415","5%","90%",5]},
-        	    {label : "领料人:", dataIndex : '', fontSize : 11, position : ["415","40%","90%",5]},
-        	    {label : "发货员:", dataIndex : 'sender', fontSize : 11, position : ["415","75%","90%",5]},
+        	    {label : "领料人:", dataIndex : '', fontSize : 11, position : ["415","5%","90%",5]},
+        	    {label : "发货员:", dataIndex : 'sender', fontSize : 11, position : ["415","40%","90%",5]},
         	    {label : "发货日期:", dataIndex : 'sendTime', fontSize : 11, position : ["445","5%","90%",5]},
     	    	{barcodes : [
     				{codeType : "128Auto", dataIndex : 'departBarcode', position : ["2mm","74%","40mm","8mm"],
@@ -379,8 +376,7 @@
         footer: {
         	fontSize : 15,
         	content : [
-        	    {label : "<br>主管:      ", dataIndex : ''},
-        	    {label : "   领料人:      ", dataIndex : ''},
+        	    {label : "<br>领料人:      ", dataIndex : ''},
         	    {label : "   打印人: ", dataIndex : 'printUser'},
         	    {label : "   打印日期:", dataIndex : 'printTime'}
         	]
@@ -1085,39 +1081,39 @@
 }
 function printRecyclingInvoiceTotalConfig_GroupByTousseGroupName(time,obj,name,loginUser){
 	if(name == 'printRecyclingInvoiceTotalConfig_GroupByDepart'){
-		var tableHtml ="<table border ='1' cellspacing='0' style='width:100%;'>";
+		var tableHtml ="<table border ='1' cellspacing='0' style='width:90%;'>";
 		for(var item in obj.data){
 			tableHtml += "<tr height='20px' style='width:100%;font-size: 15px;text-align:left;'>";
 			tableHtml += "<td colspan='5' style='width:100%;font-size: 15px;padding-left:10px'>"+item+"</td>";
 			tableHtml += "</tr>";
 			tableHtml += "<tr height='20px' style='width:100%;font-size: 15px;text-align:center;'>";
 			tableHtml += "<td style='width:10%;font-size: 15px;'>序号</td>";
 			tableHtml += "<td style='width:30%;font-size: 15px;'>名称</td>";
-			tableHtml += "<td style='width:20%;font-size: 15px;'>数量</td>";
-			tableHtml += "<td style='width:20%;font-size: 15px;'>单价</td>";
+			tableHtml += "<td style='width:15%;font-size: 15px;'>数量</td>";
+			tableHtml += "<td style='width:15%;font-size: 15px;'>单价</td>";
 			tableHtml += "<td style='width:20%;font-size: 15px;'>金额</td>";
 			tableHtml += "</tr>";
 			for(var i=0;i<obj.data[item].length;i++){
 				tableHtml += "<tr height='20px' style='width:100%;font-size: 15px;text-align:center;'>";
 				tableHtml += "<td style='width:10%;font-size: 15px;'>"+(i+1)+"</td>";
 				tableHtml += "<td style='width:30%;font-size: 15px;'>"+obj.data[item][i].tosseName+"</td>";
-				tableHtml += "<td style='width:20%;font-size: 15px;'>"+obj.data[item][i].amount+"</td>";
-				tableHtml += "<td style='width:20%;font-size: 15px;'>"+obj.data[item][i].price+"</td>";
+				tableHtml += "<td style='width:15%;font-size: 15px;'>"+obj.data[item][i].amount+"</td>";
+				tableHtml += "<td style='width:15%;font-size: 15px;'>"+obj.data[item][i].price+"</td>";
 				tableHtml += "<td style='width:20%;font-size: 15px;'>"+obj.data[item][i].totalPrice+"</td>";
 				tableHtml += "</tr>";
 			}
 		}
 		tableHtml += "</table>";
-		var headHtml = "<div style='font-size:22px;text-align: center;height:50px;line-height:50px;'><b>回收清单</b></div>";
-		var printTimeHtml = "<div style='width:100%;font-size: 15px;height:40px;text-align: left;'>制单人：&nbsp;"+loginUser+"&nbsp;&nbsp;&nbsp;&nbsp;打印时间：&nbsp;"+time+"</div>";
+		var headHtml = "<div style='width:90%;font-size:22px;text-align: center;height:50px;line-height:50px;'><b>回收清单</b></div>";
+		var printTimeHtml = "<div style='width:90%;font-size: 15px;height:40px;text-align: left;'>制单人：&nbsp;"+loginUser+"&nbsp;&nbsp;&nbsp;&nbsp;打印时间：&nbsp;"+time+"</div>";
 		//打印设置
 		var LODOP = getLodop(document.getElementById('LODOP'),document.getElementById('LODOP_EM'));
 		//打印医院名称
-		LODOP.ADD_PRINT_HTM(10,"5%",100,30,'佛山中医院');
+		LODOP.ADD_PRINT_HTM(10,"3%",100,30,'佛山中医院');
 		//打印日期
-		LODOP.ADD_PRINT_HTM(90,"5%","90%","100%",printTimeHtml);
+		LODOP.ADD_PRINT_HTM(90,"3%","90%","100%",printTimeHtml);
 		//项目内容
-		LODOP.ADD_PRINT_TABLE(110,"5%","90%","100%",tableHtml);
+		LODOP.ADD_PRINT_TABLE(110,"3%","90%","100%",tableHtml);
 		//标题
 		LODOP.ADD_PRINT_HTM(30,20,"95%",30,headHtml);
 		LODOP.PRINT();