Index: ssts-web/src/main/webapp/disinfectsystem/assestManagement/expensiveGoods/expensiveGoodsInstanceView.js
===================================================================
diff -u -r20864 -r21028
--- ssts-web/src/main/webapp/disinfectsystem/assestManagement/expensiveGoods/expensiveGoodsInstanceView.js	(.../expensiveGoodsInstanceView.js)	(revision 20864)
+++ ssts-web/src/main/webapp/disinfectsystem/assestManagement/expensiveGoods/expensiveGoodsInstanceView.js	(.../expensiveGoodsInstanceView.js)	(revision 21028)
@@ -339,7 +339,8 @@
    		{header : "条码",width : 100,dataIndex : 'barcode'},
 		{id : 'expensiveGoodsName',header : "名称",width : 150,dataIndex : 'expensiveGoods.name'},
 		{header : "规格",width : 100,dataIndex : 'expensiveGoods.specification'},
-		{header : "入库日期",width : 150,dataIndex : 'entryDate'},
+		{header : "入库日期",width : 150,dataIndex : 'entryDate',renderer : myDateFormat},
+		{header : "失效日期",width : 150,dataIndex : 'expDate',renderer : myDateFormat},
 		{header : "入库类型",width : 80,dataIndex : 'entryType'},
 		{header : "打印时间",width : 80,dataIndex : 'printTime'},
 		{header : "单价",width : 80,dataIndex : 'price'},
@@ -365,6 +366,7 @@
 	    {name : 'expensiveGoods.name'},
 	    {name : 'expensiveGoods.specification'},
 	    {name : 'entryDate'},
+	    {name : 'expDate'},
 	    {name : 'entryType'},
 	    {name : 'printTime'}, 
 	    {name : 'price'},