Index: ssts-web/src/main/webapp/disinfectsystem/invoice/invoiceItemSummary.js
===================================================================
diff -u -r21617 -r22859
--- ssts-web/src/main/webapp/disinfectsystem/invoice/invoiceItemSummary.js	(.../invoiceItemSummary.js)	(revision 21617)
+++ ssts-web/src/main/webapp/disinfectsystem/invoice/invoiceItemSummary.js	(.../invoiceItemSummary.js)	(revision 22859)
@@ -26,15 +26,31 @@
 			    {name : 'index',mapping : 'index'},
 			    {name : 'displayName',mapping : 'displayName'}, 
 			    {name : 'batchNumber',mapping : 'batchNumber'}, 
-			    {name : 'amount',mapping : 'amount'}
+			    {name : 'amount',mapping : 'amount'},
+			    {name : 'middlePackageUnitAmount'},
+			    {name : 'unit'},
+			    {name : 'middlePackageUnit'}
 			   ]
 			)
 		});
 		
 		var cm = new Ext.grid.ColumnModel([
       		    {id : 'displayName',header : "物品名称",dataIndex : 'displayName',width : 160, menuDisabled: true},
       		    {header : "批次",dataIndex : 'batchNumber',width : 60, menuDisabled: true},
-      		    {header : "数量",dataIndex : 'amount',width : 40, menuDisabled: true},
+      		    {header : "数量",dataIndex : 'amount',width : 40, menuDisabled: true,renderer: function(v,p,record){
+      		    	var unit = record.data.unit;
+      		    	if(!isUndefinedOrNullOrEmpty(unit)){
+      		    		return v+' '+unit;
+      		    	}
+  					return v;
+  				}},
+  				{header : "数量(申领单位)",dataIndex : 'middlePackageUnitAmount',width : 40, menuDisabled: true,renderer: function(v,p,record){
+  					var middlePackageUnit = record.data.middlePackageUnit;
+      		    	if(!isUndefinedOrNullOrEmpty(v) && !isUndefinedOrNullOrEmpty(middlePackageUnit)){
+      		    		return v+' '+middlePackageUnit;
+      		    	}
+  					return '';
+  				}},
       		    {header : "操作",dataIndex : '',width : 20, menuDisabled: true,
       		    	renderer: function(v,p,record){
       					var str = "<img src=\"" + WWWROOT + "/images/web/stop.png\" title=\"删除\" onclick=\"getCurrentTab().InvoiceItemSummary.removeGridItem("+record.get('index')+") \">";