Commit 9152b8778586ae7df6a7fe7d249bd5cc6d164283
Merge remote-tracking branch 'origin/lggj' into lggj
Showing
2 changed files
with
4 additions
and
4 deletions
src/main/resources/static/pages/forms/statement/statisticsDailyCalc.html
| @@ -173,12 +173,12 @@ | @@ -173,12 +173,12 @@ | ||
| 173 | $("#date").datetimepicker({ | 173 | $("#date").datetimepicker({ |
| 174 | format : 'YYYY-MM-DD', | 174 | format : 'YYYY-MM-DD', |
| 175 | locale : 'zh-cn', | 175 | locale : 'zh-cn', |
| 176 | -// maxDate : dateTime | 176 | + maxDate : dateTime |
| 177 | }); | 177 | }); |
| 178 | $("#date2").datetimepicker({ | 178 | $("#date2").datetimepicker({ |
| 179 | format : 'YYYY-MM-DD', | 179 | format : 'YYYY-MM-DD', |
| 180 | locale : 'zh-cn', | 180 | locale : 'zh-cn', |
| 181 | -// maxDate : dateTime | 181 | + maxDate : dateTime |
| 182 | }); | 182 | }); |
| 183 | $("#date").val(dateTime); | 183 | $("#date").val(dateTime); |
| 184 | $("#date2").val(dateTime); | 184 | $("#date2").val(dateTime); |
src/main/resources/static/pages/forms/statement/statisticsDailyCalc2.html
| @@ -175,12 +175,12 @@ | @@ -175,12 +175,12 @@ | ||
| 175 | $("#date").datetimepicker({ | 175 | $("#date").datetimepicker({ |
| 176 | format : 'YYYY-MM-DD', | 176 | format : 'YYYY-MM-DD', |
| 177 | locale : 'zh-cn', | 177 | locale : 'zh-cn', |
| 178 | -// maxDate : dateTime | 178 | + maxDate : dateTime |
| 179 | }); | 179 | }); |
| 180 | $("#date2").datetimepicker({ | 180 | $("#date2").datetimepicker({ |
| 181 | format : 'YYYY-MM-DD', | 181 | format : 'YYYY-MM-DD', |
| 182 | locale : 'zh-cn', | 182 | locale : 'zh-cn', |
| 183 | -// maxDate : dateTime | 183 | + maxDate : dateTime |
| 184 | }); | 184 | }); |
| 185 | $("#date").val(dateTime); | 185 | $("#date").val(dateTime); |
| 186 | $("#date2").val(dateTime); | 186 | $("#date2").val(dateTime); |