Index: ssts-web/src/main/webapp/disinfectsystem/invoice/materialInvoiceView.js =================================================================== diff -u -r18588 -r18608 --- ssts-web/src/main/webapp/disinfectsystem/invoice/materialInvoiceView.js (.../materialInvoiceView.js) (revision 18588) +++ ssts-web/src/main/webapp/disinfectsystem/invoice/materialInvoiceView.js (.../materialInvoiceView.js) (revision 18608) @@ -62,7 +62,7 @@ departJsonStore.load(); //材料 -var materialStore = new Ext.data.Store({ +var materialEntryStore = new Ext.data.Store({ proxy : new Ext.data.HttpProxy({ url : WWWROOT + '/disinfectSystem/baseData/materialDefinitionAction!getMaterialDefinitionDatas.do?selectType=material', method : 'POST' @@ -938,6 +938,7 @@ {name : 'totalPrice'}, {name : 'sender'}, {name : 'sendTime'}, + {name : 'sendTime'}, {name : 'remark'} ]; @@ -947,7 +948,7 @@ {type: 'string', dataIndex: 'depart'}, {type: 'string', dataIndex: 'totalPrice'}, {type: 'string', dataIndex: 'sender'}, - {type: 'date', dataIndex: 'time'}, + {type: 'date', dataIndex: 'sendTime'}, {type: 'string', dataIndex: 'remark'} ]} ); @@ -1031,7 +1032,7 @@ valueField : 'id', displayField : 'name', width : 165, - store : materialStore, + store : materialEntryStore, forceSelection : true, lazyInit : true, triggerAction : 'all',