Index: ssts-web/src/main/webapp/disinfectsystem/assestManagement/expensiveGoods/expensiveGoodsInstanceView.js
===================================================================
diff -u -r21028 -r21055
--- ssts-web/src/main/webapp/disinfectsystem/assestManagement/expensiveGoods/expensiveGoodsInstanceView.js	(.../expensiveGoodsInstanceView.js)	(revision 21028)
+++ ssts-web/src/main/webapp/disinfectsystem/assestManagement/expensiveGoods/expensiveGoodsInstanceView.js	(.../expensiveGoodsInstanceView.js)	(revision 21055)
@@ -346,6 +346,7 @@
 		{header : "单价",width : 80,dataIndex : 'price'},
 		{header : "状态",width : 80,dataIndex : 'status'},
 		{header : "科室",width : 80,dataIndex : 'locationForDisplay'},
+		{header : "仓库",width : 80,dataIndex : 'warehouseName'},
 		{header : "自带条码1",width : 120,dataIndex : 'firstBodyCode'},
 		{header : "自带条码2",width : 120,dataIndex : 'secondBodyCode'},
 		{header : "自带条码3",width : 120,dataIndex : 'thirdBodyCode'}
@@ -372,6 +373,7 @@
 	    {name : 'price'}, 
 	    {name : 'status'},
 	    {name : 'locationForDisplay'},
+	    {name : 'warehouseName'},
 	    {name : 'firstBodyCode'},
 	    {name : 'secondBodyCode'},
 	    {name : 'thirdBodyCode'},