Index: ssts-web/src/main/webapp/disinfectsystem/assestManagement/expensiveGoods/expensiveGoodsGodownOutEntryView.js =================================================================== diff -u -r21024 -r21026 --- ssts-web/src/main/webapp/disinfectsystem/assestManagement/expensiveGoods/expensiveGoodsGodownOutEntryView.js (.../expensiveGoodsGodownOutEntryView.js) (revision 21024) +++ ssts-web/src/main/webapp/disinfectsystem/assestManagement/expensiveGoods/expensiveGoodsGodownOutEntryView.js (.../expensiveGoodsGodownOutEntryView.js) (revision 21026) @@ -103,6 +103,7 @@ {name : 'status'}, {name : 'barcode'}, {name : 'expDate' ,type : 'date'}, + {name : 'expDateStr'}, {name : 'price'}, {name : 'firstBodyCode'}, {name : 'secondBodyCode'}, @@ -227,6 +228,7 @@ barcode : expensiveGoodsInstance.barcode, // certification:certification, expDate : expensiveGoodsInstance.expDate, + expDateStr : expensiveGoodsInstance.expDateStr, price : Ext.num(parseFloat(expensiveGoodsInstance.price),0), firstBodyCode:expensiveGoodsInstance.firstBodyCode, secondBodyCode:expensiveGoodsInstance.secondBodyCode, @@ -525,6 +527,7 @@ {name : 'status'}, {name : 'barcode'}, {name : 'expDate' ,type : 'date'}, + {name : 'expDateStr'}, {name : 'price'}, {name : 'firstBodyCode'}, {name : 'secondBodyCode'}, @@ -541,7 +544,7 @@ {header : "物品名称",dataIndex : 'expensiveGoodsName',width : 200,menuDisabled : true}, {header : "条码",dataIndex : 'barcode',width : 100,menuDisabled : true}, // {header : "状态",dataIndex : 'status',width : 80,menuDisabled : true}, - {header : "失效日期",width : 80,dataIndex : 'expDate',menuDisabled : true, renderer:top.Ext.util.Format.dateRenderer('Y-m-d')}, + {header : "失效日期",width : 80,dataIndex : 'expDateStr',menuDisabled : true}, {header : "单价",dataIndex : 'price',width : 50,menuDisabled : true}, {header : "自身条码1",dataIndex : 'firstBodyCode',width : 100,menuDisabled : true}, {header : "自身条码2",dataIndex : 'secondBodyCode',width : 100,menuDisabled : true},