From fe39a7bc7bb45f73646aa944150f57129e480ac7 Mon Sep 17 00:00:00 2001
From: wangzhijun <wangazhi@sohu.com>
Date: 星期三, 09 十二月 2020 16:16:53 +0800
Subject: [PATCH] 模板controller导入；模板vue列表页当有查询条件时报错
---
ruoyi-ui/src/utils/ruoyi.js | 14 +++++++++-----
1 files changed, 9 insertions(+), 5 deletions(-)
diff --git a/ruoyi-ui/src/utils/ruoyi.js b/ruoyi-ui/src/utils/ruoyi.js
index e8243f6..549d284 100644
--- a/ruoyi-ui/src/utils/ruoyi.js
+++ b/ruoyi-ui/src/utils/ruoyi.js
@@ -54,13 +54,17 @@
}
// 娣诲姞鏃ユ湡鑼冨洿
-export function addDateRange(params, dateRange) {
+export function addDateRange(params, dateRange, propName) {
var search = params;
- search.beginTime = "";
- search.endTime = "";
+ search.params = {};
if (null != dateRange && '' != dateRange) {
- search.beginTime = dateRange[0];
- search.endTime = dateRange[1];
+ if (typeof(propName) === "undefined") {
+ search.params["beginTime"] = dateRange[0];
+ search.params["endTime"] = dateRange[1];
+ } else {
+ search.params[propName + "BeginTime"] = dateRange[0];
+ search.params[propName + "EndTime"] = dateRange[1];
+ }
}
return search;
}
--
Gitblit v1.9.3