Index: ssts-web/src/main/webapp/disinfectsystem/reportforms/tousseTournoverDaysStatisticsReport.js =================================================================== diff -u -r37021 -r37023 --- ssts-web/src/main/webapp/disinfectsystem/reportforms/tousseTournoverDaysStatisticsReport.js (.../tousseTournoverDaysStatisticsReport.js) (revision 37021) +++ ssts-web/src/main/webapp/disinfectsystem/reportforms/tousseTournoverDaysStatisticsReport.js (.../tousseTournoverDaysStatisticsReport.js) (revision 37023) @@ -143,6 +143,23 @@ var startDay = fullYear + "/01/01"; var currentDate = fullYear + "/" + (dt.getMonth() + 1) + "/" + dt.getDate(); + var tousseDefinitionStore = new Ext.data.Store({ + proxy: new Ext.data.HttpProxy({ + url: WWWROOT + '/disinfectSystem/baseData/tousseDefinitionAction!getTousseAndDiposableGoodsData.do', + method: 'POST' + }), + reader: new Ext.data.JsonReader({ + totalProperty: 'totalCount', + root: 'data' + }, [ + { name: 'id', mapping: 'id' }, + { name: 'spelling', mapping: 'spelling' }, + { name: 'name', mapping: 'name' }, + { name: 'displayName', mapping: 'displayName' }, + { name: 'amount', mapping: 'amount' }] + ) + }); + var form = new Ext.form.FormPanel({ title: entityName, region: 'north', @@ -300,11 +317,22 @@ columnWidth: .2, layout: 'form', items: [{ - xtype: 'textfield', - fieldLabel: "器械包名称", - anchor: '95%', - name: "tousseName", - id: "tousseName" + xtype : 'combo', + id : 'tousseName', + name : 'tousseName', + queryParam : 'spell', + fieldLabel : '器械包名称', + minChars : 0, + valueField : 'name', + displayField : 'name', + store : tousseDefinitionStore, + forceSelection : true, + lazyInit : true, + anchor : '95%', + triggerAction : 'all', + hideTrigger : true, + typeAhead : false, + allowBlank : true }] }, { columnWidth: .2,