Przeglądaj źródła

时间限制&升级到最新版

RuoYi 6 lat temu
rodzic
commit
7d5167b373

BIN
src/main/resources/static/ajax/libs/layui/css/modules/laydate/default/font/iconfont.eot


Plik diff jest za duży
+ 45 - 0
src/main/resources/static/ajax/libs/layui/css/modules/laydate/default/font/iconfont.svg


BIN
src/main/resources/static/ajax/libs/layui/css/modules/laydate/default/font/iconfont.ttf


BIN
src/main/resources/static/ajax/libs/layui/css/modules/laydate/default/font/iconfont.woff


Plik diff jest za duży
+ 0 - 2
src/main/resources/static/ajax/libs/layui/css/modules/laydate/default/laydate.css


Plik diff jest za duży
+ 2 - 2
src/main/resources/static/ajax/libs/layui/lay/modules/laydate.js


+ 36 - 2
src/main/resources/static/ruoyi/js/common.js

@@ -30,8 +30,42 @@ $(function() {
 	if ($(".select-time").length > 0) {
 		layui.use('laydate', function() {
 		    var laydate = layui.laydate;
-		    laydate.render({ elem: '#startTime', theme: 'molv' });
-		    laydate.render({ elem: '#endTime', theme: 'molv' });
+		    var startDate = laydate.render({
+		        elem: '#startTime',
+		        max: $('#endTime').val(),
+		        theme: 'molv',
+		        trigger: 'click',
+		        done: function(value, date) {
+		            // 结束时间大于开始时间
+		            if (value !== '') {
+		                endDate.config.min.year = date.year;
+		                endDate.config.min.month = date.month - 1;
+		                endDate.config.min.date = date.date;
+		            } else {
+		                endDate.config.min.year = '';
+		                endDate.config.min.month = '';
+		                endDate.config.min.date = '';
+		            }
+		        }
+		    });
+		    var endDate = laydate.render({
+		        elem: '#endTime',
+		        min: $('#startTime').val(),
+		        theme: 'molv',
+		        trigger: 'click',
+		        done: function(value, date) {
+		            // 开始时间小于结束时间
+		            if (value !== '') {
+		                startDate.config.max.year = date.year;
+		                startDate.config.max.month = date.month - 1;
+		                startDate.config.max.date = date.date;
+		            } else {
+		                startDate.config.max.year = '';
+		                startDate.config.max.month = '';
+		                startDate.config.max.date = '';
+		            }
+		        }
+		    });
 		});
 	}
 	// tree 关键字搜索绑定