diff --git a/ruoyi-admin/src/main/resources/templates/system/filedestory/edit.html b/ruoyi-admin/src/main/resources/templates/system/filedestory/edit.html index 8632107..feade6e 100644 --- a/ruoyi-admin/src/main/resources/templates/system/filedestory/edit.html +++ b/ruoyi-admin/src/main/resources/templates/system/filedestory/edit.html @@ -21,7 +21,7 @@
- +
diff --git a/ruoyi-admin/src/main/resources/templates/system/fileprovide/add.html b/ruoyi-admin/src/main/resources/templates/system/fileprovide/add.html index b65cd32..af46cfa 100644 --- a/ruoyi-admin/src/main/resources/templates/system/fileprovide/add.html +++ b/ruoyi-admin/src/main/resources/templates/system/fileprovide/add.html @@ -45,7 +45,7 @@
- +
diff --git a/ruoyi-admin/src/main/resources/templates/system/fileprovide/fileprovide.html b/ruoyi-admin/src/main/resources/templates/system/fileprovide/fileprovide.html index 82b572d..a8184a7 100644 --- a/ruoyi-admin/src/main/resources/templates/system/fileprovide/fileprovide.html +++ b/ruoyi-admin/src/main/resources/templates/system/fileprovide/fileprovide.html @@ -42,9 +42,6 @@ 添加 - - 修改 - 删除 diff --git a/ruoyi-admin/src/main/resources/templates/system/network/network/add.html b/ruoyi-admin/src/main/resources/templates/system/network/network/add.html index 06156a6..35956f7 100644 --- a/ruoyi-admin/src/main/resources/templates/system/network/network/add.html +++ b/ruoyi-admin/src/main/resources/templates/system/network/network/add.html @@ -31,13 +31,13 @@
-
+
-
+
@@ -46,7 +46,7 @@
-
+
-
+
- +
@@ -83,4 +83,4 @@ }); - \ No newline at end of file + diff --git a/ruoyi-admin/src/main/resources/templates/system/network/network/edit.html b/ruoyi-admin/src/main/resources/templates/system/network/network/edit.html index bccf9bc..f634122 100644 --- a/ruoyi-admin/src/main/resources/templates/system/network/network/edit.html +++ b/ruoyi-admin/src/main/resources/templates/system/network/network/edit.html @@ -32,13 +32,13 @@
-
+
-
+
@@ -47,7 +47,7 @@
-
+
-
+
- +
@@ -85,4 +85,4 @@ }); - \ No newline at end of file + diff --git a/ruoyi-admin/src/main/resources/templates/system/property/property/add.html b/ruoyi-admin/src/main/resources/templates/system/property/property/add.html index ece3da0..7c6bb55 100644 --- a/ruoyi-admin/src/main/resources/templates/system/property/property/add.html +++ b/ruoyi-admin/src/main/resources/templates/system/property/property/add.html @@ -7,19 +7,19 @@
-
+
-
+
-
+
@@ -28,25 +28,25 @@
-
+
-
+
-
+
-
+
@@ -55,22 +55,22 @@
-
+
-
+
-
+
- +
@@ -102,4 +102,4 @@ }); - \ No newline at end of file + diff --git a/ruoyi-admin/src/main/resources/templates/system/property/property/edit.html b/ruoyi-admin/src/main/resources/templates/system/property/property/edit.html index acb1f14..2192187 100644 --- a/ruoyi-admin/src/main/resources/templates/system/property/property/edit.html +++ b/ruoyi-admin/src/main/resources/templates/system/property/property/edit.html @@ -14,19 +14,19 @@
-
+
-
+
-
+
@@ -35,25 +35,25 @@
-
+
-
+
-
+
-
+
@@ -62,22 +62,22 @@
-
+
-
+
-
+
- +
@@ -109,4 +109,4 @@ }); - \ No newline at end of file + diff --git a/ruoyi-admin/src/main/resources/templates/system/train/add.html b/ruoyi-admin/src/main/resources/templates/system/train/add.html index e76d9c7..d11e8bc 100644 --- a/ruoyi-admin/src/main/resources/templates/system/train/add.html +++ b/ruoyi-admin/src/main/resources/templates/system/train/add.html @@ -19,19 +19,19 @@
-
+
-
+
-
+
-
+
-
- -
-
- - -
-
-
- +
-
- - +
+ + +
-
+
@@ -87,14 +79,14 @@
-
+
-
+
@@ -109,18 +101,60 @@ $("#form-train-add").validate({ focusCleanup: true }); + layui.use('laydate', function(){ + var laydate = layui.laydate; + + var startDate = laydate.render({ + elem: '#laydate-startTime', + 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: '#laydate-endTime', + theme: 'molv', + trigger: 'click', + done: function(value, date) { + // Start date cannot be after end date + if (value !== '') { + startDate.config.max = { + year: date.year, + month: date.month - 1, + date: date.date + }; + } else { + startDate.config.max = { + year: '', + month: '', + date: '' + }; + } + } + }); + }); function submitHandler() { if ($.validate.form()) { $.operate.save(prefix + "/add", $('#form-train-add').serialize()); } } - $("input[name='trainDate']").datetimepicker({ - format: "yyyy-mm-dd", - minView: "month", - autoclose: true - }); + // $("input[name='trainDate']").datetimepicker({ + // format: "yyyy-mm-dd", + // minView: "month", + // autoclose: true + // }); $("input[name='createDate']").datetimepicker({ format: "yyyy-mm-dd", @@ -134,11 +168,11 @@ autoclose: true }); - $("input[name='trainTimeend']").datetimepicker({ - format: "yyyy-mm-dd", - minView: "month", - autoclose: true - }); + // $("input[name='trainTimeend']").datetimepicker({ + // format: "yyyy-mm-dd", + // minView: "month", + // autoclose: true + // }); - \ No newline at end of file + diff --git a/ruoyi-admin/src/main/resources/templates/system/train/edit.html b/ruoyi-admin/src/main/resources/templates/system/train/edit.html index 8860258..71d8478 100644 --- a/ruoyi-admin/src/main/resources/templates/system/train/edit.html +++ b/ruoyi-admin/src/main/resources/templates/system/train/edit.html @@ -20,19 +20,19 @@
-
+
-
+
-
+
-
+
-
- +
+
-
- - +
+ + +
-
+
-
- -
-
- - -
-
-
@@ -87,19 +79,54 @@ $("#form-train-edit").validate({ focusCleanup: true }); + layui.use('laydate', function(){ + var laydate = layui.laydate; + + var startDate = laydate.render({ + elem: '#laydate-startTime', + 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: '#laydate-endTime', + theme: 'molv', + trigger: 'click', + done: function(value, date) { + // Start date cannot be after end date + if (value !== '') { + startDate.config.max = { + year: date.year, + month: date.month - 1, + date: date.date + }; + } else { + startDate.config.max = { + year: '', + month: '', + date: '' + }; + } + } + }); + }); function submitHandler() { if ($.validate.form()) { $.operate.save(prefix + "/edit", $('#form-train-edit').serialize()); } } - - $("input[name='trainDate']").datetimepicker({ - format: "yyyy-mm-dd", - minView: "month", - autoclose: true - }); - $("input[name='createDate']").datetimepicker({ format: "yyyy-mm-dd", minView: "month", @@ -111,12 +138,6 @@ minView: "month", autoclose: true }); - - $("input[name='trainTimeend']").datetimepicker({ - format: "yyyy-mm-dd", - minView: "month", - autoclose: true - }); - \ No newline at end of file + diff --git a/ruoyi-admin/src/main/resources/templates/system/train/examine.html b/ruoyi-admin/src/main/resources/templates/system/train/examine.html index 8cfe53f..0c9d110 100644 --- a/ruoyi-admin/src/main/resources/templates/system/train/examine.html +++ b/ruoyi-admin/src/main/resources/templates/system/train/examine.html @@ -56,11 +56,12 @@
- +
-
- - +
+ + +
@@ -70,15 +71,6 @@
-
- -
-
- - -
-
-
@@ -117,19 +109,55 @@ $("#form-train-examine").validate({ focusCleanup: true }); + layui.use('laydate', function(){ + var laydate = layui.laydate; + var startDate = laydate.render({ + elem: '#laydate-startTime', + 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: '#laydate-endTime', + theme: 'molv', + trigger: 'click', + done: function(value, date) { + // Start date cannot be after end date + if (value !== '') { + startDate.config.max = { + year: date.year, + month: date.month - 1, + date: date.date + }; + } else { + startDate.config.max = { + year: '', + month: '', + date: '' + }; + } + } + }); + }); function submitHandler() { if ($.validate.form()) { $.operate.save(prefix + "/examine", $('#form-train-examine').serialize()); } } $("input[name='updateStaffid']").val([[${user.userName}]]) - $("input[name='trainDate']").datetimepicker({ - format: "yyyy-mm-dd", - minView: "month", - autoclose: true - }); - $("input[name='createDate']").datetimepicker({ format: "yyyy-mm-dd", minView: "month", @@ -141,12 +169,6 @@ minView: "month", autoclose: true }); - - $("input[name='trainTimeend']").datetimepicker({ - format: "yyyy-mm-dd", - minView: "month", - autoclose: true - }); - \ No newline at end of file + diff --git a/ruoyi-admin/src/main/resources/templates/system/train/train.html b/ruoyi-admin/src/main/resources/templates/system/train/train.html index e563138..f4b3f2e 100644 --- a/ruoyi-admin/src/main/resources/templates/system/train/train.html +++ b/ruoyi-admin/src/main/resources/templates/system/train/train.html @@ -135,7 +135,7 @@ }, { field: 'trainTimeend', - title: '培训结束时间' + title: '培训结束日期' }, { field: 'createStaffid', @@ -204,4 +204,4 @@ } - \ No newline at end of file +