|
@@ -55,18 +55,17 @@ export function resetForm(refName) {
|
|
|
|
|
|
// 添加日期范围
|
|
|
export function addDateRange(params, dateRange, propName) {
|
|
|
- var search = params;
|
|
|
- search.params = {};
|
|
|
- if (null != dateRange && '' != dateRange) {
|
|
|
- if (typeof (propName) === "undefined") {
|
|
|
- search.params["beginTime"] = dateRange[0];
|
|
|
- search.params["endTime"] = dateRange[1];
|
|
|
- } else {
|
|
|
- search.params["begin" + propName] = dateRange[0];
|
|
|
- search.params["end" + propName] = dateRange[1];
|
|
|
- }
|
|
|
- }
|
|
|
- return search;
|
|
|
+ let search = params
|
|
|
+ search.params = typeof (search.params) === 'object' && search.params !== null && !Array.isArray(search.params) ? search.params : {}
|
|
|
+ dateRange = Array.isArray(dateRange) ? dateRange : []
|
|
|
+ if (typeof (propName) === 'undefined') {
|
|
|
+ search.params['beginTime'] = dateRange[0]
|
|
|
+ search.params['endTime'] = dateRange[1]
|
|
|
+ } else {
|
|
|
+ search.params['begin' + propName] = dateRange[0]
|
|
|
+ search.params['end' + propName] = dateRange[1]
|
|
|
+ }
|
|
|
+ return search
|
|
|
}
|
|
|
|
|
|
// 回显数据字典
|