wenyongda/ZrAdminNetCore
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

新增添加日期范围

Browse Source
This commit is contained in:
不做码农 2022-01-24 20:50:40 +08:00
parent f11857fbe8
commit e4d666f001
3 changed files with 31 additions and 11 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
ZR.Admin.WebApi/wwwroot/CodeGenTemplate/TplVue.txt
View File

@ -169,8 +169,7 @@ $end
getList() { getList() {
$foreach(item in genTable.Columns) $foreach(item in genTable.Columns)
$if(item.HtmlType == "datetime" && item.IsQuery == true) $if(item.HtmlType == "datetime" && item.IsQuery == true)
this.queryParams["begin${item.CsharpField}"] = this.addDateRange2(this.dateRange${item.CsharpField}, 0); this.addDateRange(this.queryParams, this.dateRange${item.CsharpField}, ${item.CsharpField});
this.queryParams["end${item.CsharpField}"] = this.addDateRange2(this.dateRange${item.CsharpField}, 1);
$end $end
$end $end
this.loading = true; this.loading = true;

3
ZR.Admin.WebApi/wwwroot/CodeGenTemplate/TplVueSelect.txt
View File

@ -150,8 +150,7 @@ $end
getList() { getList() {
$foreach(item in genTable.Columns) $foreach(item in genTable.Columns)
$if(item.HtmlType == "datetime" && item.IsQuery == true) $if(item.HtmlType == "datetime" && item.IsQuery == true)
this.queryParams["begin${item.CsharpField}"] = this.addDateRange2(this.dateRange${item.CsharpField}, 0); this.addDateRange(this.queryParams, this.dateRange${item.CsharpField}, ${item.CsharpField});
this.queryParams["end${item.CsharpField}"] = this.addDateRange2(this.dateRange${item.CsharpField}, 1);
$end $end
$end $end
this.loading = true; this.loading = true;

36
ZR.Vue/src/utils/ruoyi.js
View File

@ -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) { export function addDateRange(params, dateRange, propName) {
var search = params; let search = params;
search.beginTime = ""; search = typeof (search) === 'object' && search !== null && !Array.isArray(search) ? search : {};
search.endTime = ""; dateRange = Array.isArray(dateRange) ? dateRange : [];
if (null != dateRange && '' != dateRange) { if (typeof (propName) === 'undefined') {
search.beginTime = dateRange[0]; search['beginTime'] = dateRange[0];
search.endTime = dateRange[1]; search['endTime'] = dateRange[1];
} else {
search['begin' + propName] = dateRange[0];
search['end' + propName] = dateRange[1];
} }
return search; return search;
} }