From def437722600ecea0a45a305c64ca70c0a6cf486 Mon Sep 17 00:00:00 2001
From: 疯狂的狮子li <15040126243@163.com>
Date: 星期一, 17 八月 2020 12:57:06 +0800
Subject: [PATCH] Merge branch 'master' of https://gitee.com/y_project/RuoYi-Vue
---
ruoyi-ui/src/utils/ruoyi.js | 13 ++++++++-----
1 files changed, 8 insertions(+), 5 deletions(-)
diff --git a/ruoyi-ui/src/utils/ruoyi.js b/ruoyi-ui/src/utils/ruoyi.js
index 838fc1f..e77b155 100644
--- a/ruoyi-ui/src/utils/ruoyi.js
+++ b/ruoyi-ui/src/utils/ruoyi.js
@@ -54,12 +54,15 @@
}
// 娣诲姞鏃ユ湡鑼冨洿
-export function addDateRange (params = {}, dateRange) {
- if (dateRange != null && dateRange !== '') {
- params.beginTime = this.dateRange[0]
- params.endTime = this.dateRange[1]
+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 params
+ return search;
}
// 鍥炴樉鏁版嵁瀛楀吀
--
Gitblit v1.9.3