diff --git a/ZR.Admin.WebApi/wwwroot/CodeGenTemplate/TplVue.txt b/ZR.Admin.WebApi/wwwroot/CodeGenTemplate/TplVue.txt index af71c5a..debee24 100644 --- a/ZR.Admin.WebApi/wwwroot/CodeGenTemplate/TplVue.txt +++ b/ZR.Admin.WebApi/wwwroot/CodeGenTemplate/TplVue.txt @@ -169,8 +169,7 @@ $end getList() { $foreach(item in genTable.Columns) $if(item.HtmlType == "datetime" && item.IsQuery == true) - this.queryParams["begin${item.CsharpField}"] = this.addDateRange2(this.dateRange${item.CsharpField}, 0); - this.queryParams["end${item.CsharpField}"] = this.addDateRange2(this.dateRange${item.CsharpField}, 1); + this.addDateRange(this.queryParams, this.dateRange${item.CsharpField}, ${item.CsharpField}); $end $end this.loading = true; diff --git a/ZR.Admin.WebApi/wwwroot/CodeGenTemplate/TplVueSelect.txt b/ZR.Admin.WebApi/wwwroot/CodeGenTemplate/TplVueSelect.txt index 64812dd..14d4359 100644 --- a/ZR.Admin.WebApi/wwwroot/CodeGenTemplate/TplVueSelect.txt +++ b/ZR.Admin.WebApi/wwwroot/CodeGenTemplate/TplVueSelect.txt @@ -150,8 +150,7 @@ $end getList() { $foreach(item in genTable.Columns) $if(item.HtmlType == "datetime" && item.IsQuery == true) - this.queryParams["begin${item.CsharpField}"] = this.addDateRange2(this.dateRange${item.CsharpField}, 0); - this.queryParams["end${item.CsharpField}"] = this.addDateRange2(this.dateRange${item.CsharpField}, 1); + this.addDateRange(this.queryParams, this.dateRange${item.CsharpField}, ${item.CsharpField}); $end $end this.loading = true; diff --git a/ZR.Vue/src/utils/ruoyi.js b/ZR.Vue/src/utils/ruoyi.js index 7df1a27..4e4f5aa 100644 --- a/ZR.Vue/src/utils/ruoyi.js +++ b/ZR.Vue/src/utils/ruoyi.js @@ -53,14 +53,36 @@ export function resetForm(refName) { } } +// // 添加日期范围 +// export function addDateRange(params, dateRange) { +// var search = params; +// search.beginTime = ""; +// search.endTime = ""; +// if (null != dateRange && '' != dateRange) { +// search.beginTime = dateRange[0]; +// search.endTime = dateRange[1]; +// } +// return search; +// } + +/** + * 添加日期范围 + * @param { beginTime: '', endTime: '', page: 1} params + * @param {*} dateRange 日期范围数组 + * @param {*} propName C#属性名首字母大写 + * @returns + */ // 添加日期范围 -export function addDateRange(params, dateRange) { - var search = params; - search.beginTime = ""; - search.endTime = ""; - if (null != dateRange && '' != dateRange) { - search.beginTime = dateRange[0]; - search.endTime = dateRange[1]; +export function addDateRange(params, dateRange, propName) { + let search = params; + search = typeof (search) === 'object' && search !== null && !Array.isArray(search) ? search : {}; + dateRange = Array.isArray(dateRange) ? dateRange : []; + if (typeof (propName) === 'undefined') { + search['beginTime'] = dateRange[0]; + search['endTime'] = dateRange[1]; + } else { + search['begin' + propName] = dateRange[0]; + search['end' + propName] = dateRange[1]; } return search; }