Commit d596d5bb8e801069e4498552028fdefd23562e7b
1 parent
8f9f0c04
还原 addDateRange js 函数
Showing
1 changed file
with
8 additions
and
5 deletions
ruoyi-ui/src/utils/ruoyi.js
| ... | ... | @@ -54,12 +54,15 @@ export function resetForm(refName) { |
| 54 | 54 | } |
| 55 | 55 | |
| 56 | 56 | // 添加日期范围 |
| 57 | -export function addDateRange (params = {}, dateRange) { | |
| 58 | - if (dateRange != null && dateRange !== '') { | |
| 59 | - params.beginTime = this.dateRange[0] | |
| 60 | - params.endTime = this.dateRange[1] | |
| 57 | +export function addDateRange(params, dateRange) { | |
| 58 | + var search = params; | |
| 59 | + search.beginTime = ""; | |
| 60 | + search.endTime = ""; | |
| 61 | + if (null != dateRange && '' != dateRange) { | |
| 62 | + search.beginTime = this.dateRange[0]; | |
| 63 | + search.endTime = this.dateRange[1]; | |
| 61 | 64 | } |
| 62 | - return params | |
| 65 | + return search; | |
| 63 | 66 | } |
| 64 | 67 | |
| 65 | 68 | // 回显数据字典 | ... | ... |