Index: ssts-web/src/main/java/com/forgon/disinfectsystem/inventoryrecord/action/InventoryRecordAction.java =================================================================== diff -u -r19113 -r19465 --- ssts-web/src/main/java/com/forgon/disinfectsystem/inventoryrecord/action/InventoryRecordAction.java (.../InventoryRecordAction.java) (revision 19113) +++ ssts-web/src/main/java/com/forgon/disinfectsystem/inventoryrecord/action/InventoryRecordAction.java (.../InventoryRecordAction.java) (revision 19465) @@ -126,6 +126,7 @@ obj.put("sequence", goods.getSequence()); obj.put("unit", goods.getUnit()); obj.put("type", goods.getType()); + obj.put("expDate", goods.getExpDateString()); if(DisposableGoods.TYPE_EXPENSIVEDIPOSABLEGOODS.equals(goods.getGoodsType())){ List expensiveGoodsItems = goods.getItems(); JSONArray expensiveGoodsArray = new JSONArray(); Index: ssts-web/src/main/webapp/disinfectsystem/stocktakerecordmanager/inventoryDisposableGoodsForm.js =================================================================== diff -u -r19113 -r19465 --- ssts-web/src/main/webapp/disinfectsystem/stocktakerecordmanager/inventoryDisposableGoodsForm.js (.../inventoryDisposableGoodsForm.js) (revision 19113) +++ ssts-web/src/main/webapp/disinfectsystem/stocktakerecordmanager/inventoryDisposableGoodsForm.js (.../inventoryDisposableGoodsForm.js) (revision 19465) @@ -60,7 +60,8 @@ {name : 'expensiveGoodsInfo'}, {name : 'sequence'}, {name : 'unit'}, - {name : 'type'} + {name : 'type'}, + {name : 'expDate'} ] ) }); @@ -184,6 +185,7 @@ {header : "物品类型",dataIndex : 'type',width : 60, sortable:true, menuDisabled : true}, {header : "规格",dataIndex : 'specification',width : 60,menuDisabled : true}, {header : "批次",width : 50,dataIndex : 'batchNumber',menuDisabled : true}, + {header : "失效时期",width : 80,dataIndex : 'expDate',menuDisabled : true}, {header : "账面数量",dataIndex : 'amount',width : 40,menuDisabled : true,renderer : isChange}, {header : "盘点数量",dataIndex : 'inventoryAmount',css: 'background: #F0F0F0;',width : 40,menuDisabled : true, editor : new top.Ext.form.TextField({