Index: ssts-web/src/main/webapp/disinfectsystem/reportforms/stocktakeView.js =================================================================== diff -u -r38587 -r40484 --- ssts-web/src/main/webapp/disinfectsystem/reportforms/stocktakeView.js (.../stocktakeView.js) (revision 38587) +++ ssts-web/src/main/webapp/disinfectsystem/reportforms/stocktakeView.js (.../stocktakeView.js) (revision 40484) @@ -125,12 +125,12 @@ columnWidth : .2, layout : 'form', items : [{ - xtype : 'datefield', + xtype : 'datefieldWithMin', fieldLabel : '开始日期', id : 'startDate', name : 'startDate', editable : false, - format : 'Y-m-d', + format : 'Y-m-d H:i', altFormats:'Y-m-d|Y-n-j|y-n-j|y-m-j|y-m-d|y-n-d|Y-n-d|Y-m-j|Ymd|Ynj|ynj|ymj|ymd|ynd|Ynd|Ymj|Y/m/d|Y/n/j|y/n/j|y/m/j|y/m/d|y/n/d|Y/n/d|Y/m/j', allowBlank : false, anchor : '95%', @@ -140,12 +140,12 @@ columnWidth : .2, layout : 'form', items : [{ - xtype : 'datefield', + xtype : 'datefieldWithMin', fieldLabel : '结束日期', id : 'endDate', name : 'endDate', editable : false, - format : 'Y-m-d', + format : 'Y-m-d H:i', altFormats:'Y-m-d|Y-n-j|y-n-j|y-m-j|y-m-d|y-n-d|Y-n-d|Y-m-j|Ymd|Ynj|ynj|ymj|ymd|ynd|Ynd|Ymj|Y/m/d|Y/n/j|y/n/j|y/m/j|y/m/d|y/n/d|Y/n/d|Y/m/j', allowBlank : false, anchor : '95%',