Index: ssts-web/src/main/webapp/disinfectsystem/assestManagement/expensiveGoods/expensiveGoodsInstanceView.js =================================================================== diff -u -r20862 -r20864 --- ssts-web/src/main/webapp/disinfectsystem/assestManagement/expensiveGoods/expensiveGoodsInstanceView.js (.../expensiveGoodsInstanceView.js) (revision 20862) +++ ssts-web/src/main/webapp/disinfectsystem/assestManagement/expensiveGoods/expensiveGoodsInstanceView.js (.../expensiveGoodsInstanceView.js) (revision 20864) @@ -384,21 +384,16 @@ var filters = new Ext.grid.GridFilters({ filters:[ - {type: 'string', dataIndex: 'name'}, - {type: 'string', dataIndex: 'externalCode'}, - {type: 'numeric', dataIndex: 'amount'}, - {type: 'numeric', dataIndex: 'minApplyAmount'}, - {type: 'numeric', dataIndex: 'maxApplyAmount'}, - {type: 'string', dataIndex: 'unit'}, - {type: 'numeric', dataIndex: 'sequence'}, - {type: 'numeric', dataIndex: 'minStorage'}, - {type: 'numeric', dataIndex: 'maxStorage'}, - {type: 'string', dataIndex: 'spelling'}, - {type: 'string', dataIndex: 'wbCode'}, - {type: 'string', dataIndex: 'isPartOfTousseMaterial'}, - {type: 'string', dataIndex: 'isApplicationMaterial'}, - {type: 'string', dataIndex: 'isSupplyRoomGoods'}, - {type: 'numeric', dataIndex: 'referencePrice'} + {type: 'string', dataIndex: 'barcode'}, + {type: 'string', dataIndex: 'expensiveGoods.name'}, + {type: 'string', dataIndex: 'expensiveGoods.specification'}, + {type: 'string', dataIndex: 'entryType'}, + {type: 'numeric', dataIndex: 'price'}, + {type: 'string', dataIndex: 'status'}, + {type: 'string', dataIndex: 'locationForDisplay'}, + {type: 'string', dataIndex: 'firstBodyCode'}, + {type: 'string', dataIndex: 'secondBodyCode'}, + {type: 'string', dataIndex: 'thirdBodyCode'} ]} );