Browse Source

优化 addDateRange js 函数

fungleo 4 years ago
parent
commit
503dd64e3f
1 changed files with 6 additions and 9 deletions
  1. 6 9
      ruoyi-ui/src/utils/ruoyi.js

+ 6 - 9
ruoyi-ui/src/utils/ruoyi.js

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