Index: ssts-web/src/main/webapp/disinfectsystem/customform/formInstanceReportView.jsp
===================================================================
diff -u -r29513 -r40893
--- ssts-web/src/main/webapp/disinfectsystem/customform/formInstanceReportView.jsp (.../formInstanceReportView.jsp) (revision 29513)
+++ ssts-web/src/main/webapp/disinfectsystem/customform/formInstanceReportView.jsp (.../formInstanceReportView.jsp) (revision 40893)
@@ -33,6 +33,8 @@
<%@ include file="/common/includeExtJsAndCss.jsp"%>
+
+
Index: ssts-web/src/main/webapp/disinfectsystem/customform/formInstanceReportView.js
===================================================================
diff -u -r32364 -r40893
--- ssts-web/src/main/webapp/disinfectsystem/customform/formInstanceReportView.js (.../formInstanceReportView.js) (revision 32364)
+++ ssts-web/src/main/webapp/disinfectsystem/customform/formInstanceReportView.js (.../formInstanceReportView.js) (revision 40893)
@@ -66,6 +66,8 @@
},departRecord)
});
+ var dt = new Date();
+ var newDate = dt.getFullYear() + "/" + (dt.getMonth() + 1) + "/" + dt.getDay();
var form = new Ext.form.FormPanel({
title : entityName,
region : 'north',
@@ -90,28 +92,32 @@
columnWidth : .2,
layout : 'form',
labelWidth : 80,
- items : [new Ext.form.DateField({
- id:'startDate',
- name : 'startDate',
- fieldLabel : '开始日期',
- readOnly : false,
- format:'Y-m-d',
- value : new Date(),
- anchor : '100%'
- })]
+ items : [{
+ xtype: 'datefieldWithMin',
+ fieldLabel: '开始日期',
+ id:'startDate',
+ name : 'startDate',
+ 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',
+ format: 'Y-m-d H:i:s',
+ readOnly : false,
+ value : new Date(newDate +' 00:00:00'),
+ anchor : '100%'
+ }]
},{
columnWidth : .2,
layout : 'form',
labelWidth : 80,
- items : [new Ext.form.DateField({
- id:'endDate',
- name : 'endDate',
- fieldLabel : '结束日期',
- readOnly : false,
- format:'Y-m-d',
- value : new Date(),
- anchor : '100%'
- })]
+ items : [{
+ xtype: 'datefieldWithMin',
+ fieldLabel: '结束日期',
+ id:'endDate',
+ name : 'endDate',
+ 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',
+ format: 'Y-m-d H:i:s',
+ readOnly : false,
+ value : new Date(newDate +' 23:59:59'),
+ anchor : '100%'
+ }]
},{
columnWidth : .35,
layout : 'form',