ruoyi
/
RuoYi
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

update ruoyi-admin/src/main/resources/static/ruoyi/js/common.js. 

修复-多组日期范围-公共加载不生效bug，并增加限制选择半年内的日期范围。
This commit is contained in:
CSXing 2022-06-14 01:41:04 +00:00 committed by Gitee
parent d1b3f4f397
commit 2feccb2a8a
No known key found for this signature in database
GPG Key ID: 173E9B9CA92EEF8F
1 changed files with 62 additions and 40 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

68
ruoyi-admin/src/main/resources/static/ruoyi/js/common.js
View File

@ -3,8 +3,7 @@
* Copyright (c) 2019 ruoyi
*/
var startLayDate;
var endLayDate;
var startLayDate=[], endLayDate=[], iLayDate=0; //[chenshuixing]修复多组日期范围无效 2022-06-14
$(function() {
// layer扩展皮肤
@ -47,47 +46,70 @@ $(function() {
}
});
// laydate 时间控件绑定
// laydate 时间控件绑定 [chenshuixing]修复多组日期范围无效 2022-06-14
if ($(".select-time").length > 0) {
// 遍历
$('.select-time').each(function(){
var mindate = new Date();
mindate.setMonth(mindate.getMonth()-6);
mindate = $.common.dateFormat(mindate,"yyyy-MM-dd");
var maxdate = new Date();
maxdate.setMonth(maxdate.getMonth()+6);
maxdate = $.common.dateFormat(maxdate,"yyyy-MM-dd");
var startObj = $(this).find('input[id^=startTime]');
var endObj = $(this).find('input[id^=endTime]');
layui.use('laydate', function() {
var laydate = layui.laydate;
startLayDate = laydate.render({
elem: '#startTime',
max: $('#endTime').val(),
var bdObj = laydate.render({
index: iLayDate,
elem: '#'+startObj[0].id,
min: mindate,
max: endObj.val(),
theme: 'molv',
type: $('#startTime').attr("data-type") || 'date',
type: startObj.attr("data-type") || 'date',
trigger: 'click',
done: function(value, date) {
// 结束时间大于开始时间
if (value !== '') {
endLayDate.config.min.year = date.year;
endLayDate.config.min.month = date.month - 1;
endLayDate.config.min.date = date.date;
endLayDate[this.index].config.min.year = date.year;
endLayDate[this.index].config.min.month = date.month - 1;
endLayDate[this.index].config.min.date = date.date;
} else {
endLayDate.config.min.year = '';
endLayDate.config.min.month = '';
endLayDate.config.min.date = '';
endLayDate[this.index].config.min.year = '';
endLayDate[this.index].config.min.month = '';
endLayDate[this.index].config.min.date = '';
}
}
});
endLayDate = laydate.render({
elem: '#endTime',
min: $('#startTime').val(),
var edObj = laydate.render({
index: iLayDate,
elem: '#'+endObj[0].id,
min: startObj.val(),
max: maxdate,
theme: 'molv',
type: $('#endTime').attr("data-type") || 'date',
type: endObj.attr("data-type") || 'date',
trigger: 'click',
done: function(value, date) {
// 开始时间小于结束时间
if (value !== '') {
startLayDate.config.max.year = date.year;
startLayDate.config.max.month = date.month - 1;
startLayDate.config.max.date = date.date;
startLayDate[this.index].config.max.year = date.year;
startLayDate[this.index].config.max.month = date.month - 1;
startLayDate[this.index].config.max.date = date.date;
} else {
startLayDate.config.max.year = '2099';
startLayDate.config.max.month = '12';
startLayDate.config.max.date = '31';
startLayDate[this.index].config.max.year = '2099';
startLayDate[this.index].config.max.month = '12';
startLayDate[this.index].config.max.date = '31';
}
}
})
startLayDate.push(bdObj);
endLayDate.push(edObj);
iLayDate++;
});
});
}