Index: ssts-web/src/main/webapp/disinfectsystem/invoice/invoiceView.js
===================================================================
diff -u -r13915 -r13927
--- ssts-web/src/main/webapp/disinfectsystem/invoice/invoiceView.js	(.../invoiceView.js)	(revision 13915)
+++ ssts-web/src/main/webapp/disinfectsystem/invoice/invoiceView.js	(.../invoiceView.js)	(revision 13927)
@@ -21,6 +21,7 @@
 	fields : [
 	    {name : 'id'},
 	    {name : 'barcode'},
+	    {name : 'expensiveDGBarcode'},
 	    {name : 'name'},
 	    {name : 'specification'},
 	    {name : 'showTousseName'},
@@ -474,7 +475,13 @@
 	
 	var cm = new Ext.grid.ColumnModel([
 		{id : 'id',dataIndex : 'id',hidden : true},
-		{header : "条码",dataIndex : 'barcode',width : 80,menuDisabled : true},
+		{header : "条码",dataIndex : 'barcode',width : 80,menuDisabled : true,
+			renderer : function(v, p, record) {
+			if(!isUndefinedOrNullOrEmpty(record.data.expensiveDGBarcode)){
+				return record.data.expensiveDGBarcode;
+			}
+			return record.data.barcode;
+		}},
 		{header : "物品名称",dataIndex : 'showTousseName',width : 170,menuDisabled : true},
 		{header : "name",dataIndex : 'name',hidden : true,menuDisabled : true},
 		{header : "批次/灭菌日期",dataIndex : 'batchNumber',width : 100,menuDisabled : true},