Index: ssts-web/src/main/webapp/disinfectsystem/recyclingApplication/goodsApplicationView.js =================================================================== diff -u -r38361 -r38362 --- ssts-web/src/main/webapp/disinfectsystem/recyclingApplication/goodsApplicationView.js (.../goodsApplicationView.js) (revision 38361) +++ ssts-web/src/main/webapp/disinfectsystem/recyclingApplication/goodsApplicationView.js (.../goodsApplicationView.js) (revision 38362) @@ -4233,10 +4233,10 @@ } } if(queryPeriod > 0 && queryPeriod <= 10000){ - defaultOperationStart = getDefaultDate(today,queryPeriod) + '00:00'; - defaultOperationEnd = getDefaultDate(today) + '23:59'; - var value1 = Date.parse(defaultOperationStart); - var value2 = Date.parse(defaultOperationEnd); + defaultOperationStart = getDefaultDate(newDate,queryPeriod) + '00:00'; + defaultOperationEnd = getDefaultDate(newDate) + '23:59'; + var value1 = Date.parse(newDate + ' 00:00') - 1000 * 60 * 60 * 24 * queryPeriod; + var value2 = Date.parse(newDate + ' 23:59'); $Id('parm_s_startTime').value = value1; $Id('parm_s_endTime').value = value2; } Index: ssts-web/src/main/webapp/disinfectsystem/recyclingApplication/goodsApplicationView.jsp =================================================================== diff -u -r37721 -r38362 --- ssts-web/src/main/webapp/disinfectsystem/recyclingApplication/goodsApplicationView.jsp (.../goodsApplicationView.jsp) (revision 37721) +++ ssts-web/src/main/webapp/disinfectsystem/recyclingApplication/goodsApplicationView.jsp (.../goodsApplicationView.jsp) (revision 38362) @@ -56,6 +56,8 @@ request.setAttribute("isBeApplication",isBeApplication); SimpleDateFormat dateFormat = new SimpleDateFormat("yyyy-MM-dd HH:mm"); request.setAttribute("today", dateFormat.format(new Date())); + SimpleDateFormat newDateFormat =new SimpleDateFormat("yyyy/MM/dd"); + request.setAttribute("newDate", newDateFormat.format(new Date())); //申请单列表是否启用鼠标悬停事件 request.setAttribute("mouseHoverEventOfApply", userData.getMouseHoverEventOfApply()); @@ -514,6 +516,7 @@ var today = '<%=request.getAttribute("today")%>'; +var newDate = '<%=request.getAttribute("newDate")%>'; var toussePriceFluctuation = '<%=request.getAttribute("toussePriceFluctuation")%>'; var ACTION_TYPE_CONFIRM_RETURN = '<%=ForeignTousseApplication.ACTION_TYPE_CONFIRM_RETURN%>'; //确认归还