Index: ssts-web/src/main/webapp/disinfectsystem/returnMaterialRecord/returnMaterialRecordView.js =================================================================== diff -u -r14593 -r14598 --- ssts-web/src/main/webapp/disinfectsystem/returnMaterialRecord/returnMaterialRecordView.js (.../returnMaterialRecordView.js) (revision 14593) +++ ssts-web/src/main/webapp/disinfectsystem/returnMaterialRecord/returnMaterialRecordView.js (.../returnMaterialRecordView.js) (revision 14598) @@ -190,13 +190,16 @@ } } }); - - var dt = new Date(); - var v = dt.getMonth() + 1; - if(v<10){ - v = "0" + v; + + function getStartDayOfMonth(dt){ + var v = dt.getMonth() + 1; + if(v<10){ + v = "0" + v; + } + return dt.getFullYear() + "/" + v + "/01"; } - var startDayOfMonth = dt.getFullYear() + "/" + v + "/01"; + var startDayOfMonth = getStartDayOfMonth(new Date()); + var form = new Ext.Panel({ layout : 'table', frame : true, @@ -325,4 +328,19 @@ }] }); + Ext.Ajax.request({ + url : WWWROOT + '/system/serverTimeAction!getServerDateTime.do', + params:{dateformat:"yyyy/MM/dd"}, + success : function(response, options) { + var result = Ext.decode(response.responseText); + if(result.success){ + var servertime = result.serverTime; + var startDayOfMonth = getStartDayOfMonth(new Date(servertime)); + Ext.getCmp('startDate').setValue(new Date(startDayOfMonth)); + Ext.getCmp('endDate').setValue(new Date(servertime)); + } + }, + failure : function(response, options) { + } + }); }); \ No newline at end of file