wezone
/
Ry-master
10
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

Merge branch 'master' of https://gitee.com/y_project/RuoYi-Vue 

 Conflicts:
	ruoyi-ui/src/utils/ruoyi.js
This commit is contained in:
疯狂的狮子li 2020-08-17 12:57:06 +08:00
parent 25afde4796 d596d5bb8e
commit def4377226
1 changed files with 8 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

13
ruoyi-ui/src/utils/ruoyi.js
View File

@ -54,12 +54,15 @@ export function resetForm(refName) {
} }
// 添加日期范围 // 添加日期范围
export function addDateRange (params = {}, dateRange) { export function addDateRange(params, dateRange) {
if (dateRange != null && dateRange !== '') { var search = params;
params.beginTime = this.dateRange[0] search.beginTime = "";
params.endTime = this.dateRange[1] search.endTime = "";
if (null != dateRange && '' != dateRange) {
search.beginTime = this.dateRange[0];
search.endTime = this.dateRange[1];
} }
return params return search;
} }
// 回显数据字典 // 回显数据字典