Index: ssts-web/src/main/webapp/disinfectsystem/config/gdszyy/print/printConfig.js
===================================================================
diff -u -r29123 -r29129
--- ssts-web/src/main/webapp/disinfectsystem/config/gdszyy/print/printConfig.js	(.../printConfig.js)	(revision 29123)
+++ ssts-web/src/main/webapp/disinfectsystem/config/gdszyy/print/printConfig.js	(.../printConfig.js)	(revision 29129)
@@ -160,7 +160,7 @@
 	isPrintTousse : true,
 	isPrintDisinfectGoods : true,
     isPrintDisposableGoods : true, // 打印申请单是否打印一次性物品
-    isMergePrintTousseAndDisposable : false, // 器械包和一次性物品是否合并打印
+    isMergePrintTousseAndDisposable : true, // 器械包和一次性物品是否合并打印
     printByOriginalApplications : true, //不合并打印情况下是否按原始单据逐份打印
     printApplyInfo : false,
     printOrder : 1, // 1:优先打印一次性物品， 2：优先打印器械包
@@ -186,7 +186,7 @@
             {label : "部门：", dataIndex : 'depart', fontSize : 12, position : ["55","2%","90%",5]},
         	{label : "单号：", dataIndex : 'serialNum', fontSize : 11, position : ["55","35%","90%",5]},
         	{label : "仓库:消毒供应中心", dataIndex : '', fontSize : 11, position : ["55","75%","90%",5]},
-        	{label : "制单人:", dataIndex : 'printUser', fontSize : 11, position : ["80","75%","90%",5]},
+        	{label : "申请人:", dataIndex : 'applicant', 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 : 'remark', fontSize : 11, position : ["80","2%","90%",5]}
@@ -211,7 +211,7 @@
         	content : [
         	    //{label : "<br>主管:      ", dataIndex : ''},
         	    {label : "<br>领料人:      ", dataIndex : ''},
-        	    {label : "   发料人: ", dataIndex : 'printUser'},
+        	    {label : "   发货人: ", dataIndex : 'printUser'},
         	    {label : "   发货日期:", dataIndex : 'printTime'}
         	]
         },
@@ -439,19 +439,21 @@
             {label : "部门回收凭证", dataIndex : '', fontSize : 15, position : ["20","15%","99%",5]},
             {label : "申请科室：", dataIndex : 'depart', fontSize : 11, position : ["55","2%","90%",5]},
         	{label : "单号：", dataIndex : 'serialNum', fontSize : 11, position : ["55","35%","90%",5]},
+        	{label : "提交时间:", dataIndex : 'applicationTime', fontSize : 11, position : ["55","70%","90%",5]},
 
         	{label : "申请人:", dataIndex : 'applicant', fontSize : 11, position : ["80","75%","90%",5]},
-        	{label : "提交时间:", dataIndex : 'applicationTime', fontSize : 11, position : ["80","45%","90%",5]},
         	{label : "备注:", dataIndex : 'remark', fontSize : 11, position : ["80","2%","90%",5]}
         ],
         goodsTable :{
         	rowHeight : 25,
         	position : ["100","1%","97%","2000"],
         	content : [
                 {header : "序号", dataIndex : 'serialNumber', width : "10%", align : 'center', fontSize : 11},
-                {header : "名称", dataIndex : 'goodsName', width : "45%", align : 'left', fontSize : 11},
-                {header : "数量", dataIndex : 'goodsAmount', width : "15%", align : 'center', fontSize : 11},
-                {header : "备注", dataIndex : '', width : "30%", align : 'center', fontSize : 11}
+                {header : "名称", dataIndex : 'goodsName', width : "35%", align : 'left', fontSize : 11},
+                {header : "规格", dataIndex : 'sp', width : "15%", align : 'center', fontSize : 11},
+                {header : "单位", dataIndex : 'unit', width : "10%", align : 'center', fontSize : 11},
+                {header : "数量", dataIndex : 'goodsAmount', width : "10%", align : 'center', fontSize : 11},
+                {header : "备注", dataIndex : '', width : "20%", align : 'center', fontSize : 11}
                 //{header : "单价", dataIndex : 'price', width : 60, align : 'right', fontSize : 11},
                 //{header : "金额", dataIndex : 'rowPrice', width : 75, align : 'right', fontSize : 11}
             ]
@@ -1203,6 +1205,7 @@
 }
 function printDisposableGoodsInvoicePlanSummary(obj){
 	doGetLodop();
+	LODOP.SET_PRINT_PAGESIZE(3,'24.1cm','2cm','');
 	var tableStyle = "font-family: verdana, arial, sans-serif;font-size: 14px;color: #333333;border-width: 1px;border-color: #666666;border-collapse: collapse;margin-bottom:4mm;width: 22.1cm;";
 	var tableThStyle = "border-width: 1px;padding: 5px;border-style: solid;border-color: #666666;font-size: 14px;"
 	var tableTdStyle = "border-width: 1px;padding: 5px;border-style: solid;border-color: #666666;background-color: #ffffff;font-size: 14px;";
@@ -1242,7 +1245,6 @@
 	}
 	html += '</div>';
 	LODOP.ADD_PRINT_HTM(0,0,"95%","100%","<body leftmargin='8px' topmargin=0>"+html+"</body>");
-	LODOP.SET_PRINT_PAGESIZE(3,'24.1cm','2cm','');
 	LODOP.SET_SHOW_MODE("HIDE_PAPER_BOARD",1);
 	LODOP.PRINT();
 }
@@ -1307,7 +1309,7 @@
     //打印器械包明细单
 	tousseDefinitionMaterials:tousseDefinitionMaterialsConfig_qifuyy,
 	//打印一次性物品汇总单
-	printDisposableGoodsInvoicePlanSummary:printDisposableGoodsInvoicePlanSummary_gdszyy
+	printDisposableGoodsInvoicePlanSummary:printDisposableGoodsInvoicePlanSummary_gdszyy,
 	//定制打印一次性物品汇总单的物资编码(必填)
-	//inventorySerialNumber:['31010100013','31010100014','31010100015','31010100018','31011200007']
+	inventorySerialNumber:['31012600010','31012600009','31011600010','31011600001','31012600034','31012600040','31012600033','31012600032','31012600031','31012600038','31012600039','31012600030','31012600037','31012600036','31012600035','31010900002','31010100039','31010100040']
 };
\ No newline at end of file