Index: ssts-web/src/main/webapp/disinfectsystem/reportforms/instrumentSetDemandReport.js =================================================================== diff -u -r41497 -r41523 --- ssts-web/src/main/webapp/disinfectsystem/reportforms/instrumentSetDemandReport.js (.../instrumentSetDemandReport.js) (revision 41497) +++ ssts-web/src/main/webapp/disinfectsystem/reportforms/instrumentSetDemandReport.js (.../instrumentSetDemandReport.js) (revision 41523) @@ -2,7 +2,7 @@ function reloadReport() { var startDate = $Id('startDate').value; - var endDate = $Id('endDate').value; + var endDate = $Id('startDate').value; var depart = Ext.getCmp('depart').getValue(); var tousseName = Ext.getCmp('tousseName').getRawValue(); var brancheOfHospitalName = Ext.getCmp('brancheOfHospitalIds').getRawValue(); @@ -107,7 +107,7 @@ border: 0, // bodyStyle : 'padding: 10px 10px 0px 10px;', frame: true, - height: 140, + height: 130, bodyStyle: 'padding:0px auto;margin:0px',// padding:1px;padding-top:5px; labelWidth: 90, items: [{ @@ -118,7 +118,7 @@ items: [new Ext.form.DateField({ id: 'startDate', name: 'startDate', - fieldLabel: '开始日期', + fieldLabel: '日期', readOnly: false, format: 'Y-m-d', value: newDate, @@ -127,18 +127,6 @@ }, { columnWidth: .25, layout: 'form', - items: [new Ext.form.DateField({ - id: 'endDate', - name: 'endDate', - fieldLabel: '结束日期', - readOnly: false, - format: 'Y-m-d', - value: newDate, - anchor: '95%' - })] - }, { - columnWidth: .25, - layout: 'form', items: [{ xtype: 'multiSelect', fieldLabel: '院区', @@ -252,7 +240,6 @@ iconCls: 'icon_set', handler: function () { Ext.getCmp('startDate').setValue(new Date()); - Ext.getCmp('endDate').setValue(new Date()); Ext.getCmp('tousseName').setValue(""); Ext.getCmp('disinfectProgram').setValue(""); Ext.getCmp('disinfectProgram').setRawValue("");