|
@@ -33,13 +33,19 @@ $(document).ready(function() {
|
|
|
const val = res.$el.val();
|
|
|
const oldVal = res.$el.attr('data-old-date') || '';
|
|
|
// 日期格式判断
|
|
|
- if (val !== '' && !(isNaN(val) && !isNaN(Date.parse(val)))) {
|
|
|
- toastr.error('日期格式有误!');
|
|
|
- res.$el.val(oldVal);
|
|
|
- if (oldVal === '') {
|
|
|
- res.clear();
|
|
|
- } else {
|
|
|
- res.selectDate(new Date(oldVal));
|
|
|
+ if (val !== '') {
|
|
|
+ const valArr = val.split(' ~ ');
|
|
|
+ for (const v of valArr) {
|
|
|
+ if (!(isNaN(v) && !isNaN(Date.parse(v)))) {
|
|
|
+ toastr.error('日期格式有误!');
|
|
|
+ res.$el.val(oldVal);
|
|
|
+ if (oldVal === '') {
|
|
|
+ res.clear();
|
|
|
+ } else {
|
|
|
+ res.selectDate(new Date(oldVal));
|
|
|
+ }
|
|
|
+ return;
|
|
|
+ }
|
|
|
}
|
|
|
} else if(val !== oldVal) {
|
|
|
const data = {
|
|
@@ -140,13 +146,19 @@ $(document).ready(function() {
|
|
|
const val = res.$el.val();
|
|
|
const oldVal = res.$el.attr('data-old-date') || '';
|
|
|
// 日期格式判断
|
|
|
- if (val !== '' && !(isNaN(val) && !isNaN(Date.parse(val)))) {
|
|
|
- toastr.error('日期格式有误!');
|
|
|
- res.$el.val(oldVal);
|
|
|
- if (oldVal === '') {
|
|
|
- res.clear();
|
|
|
- } else {
|
|
|
- res.selectDate(new Date(oldVal));
|
|
|
+ if (val !== '') {
|
|
|
+ const valArr = val.split(' ~ ');
|
|
|
+ for (const v of valArr) {
|
|
|
+ if (!(isNaN(v) && !isNaN(Date.parse(v)))) {
|
|
|
+ toastr.error('日期格式有误!');
|
|
|
+ res.$el.val(oldVal);
|
|
|
+ if (oldVal === '') {
|
|
|
+ res.clear();
|
|
|
+ } else {
|
|
|
+ res.selectDate(new Date(oldVal));
|
|
|
+ }
|
|
|
+ return;
|
|
|
+ }
|
|
|
}
|
|
|
} else if(val !== oldVal) {
|
|
|
const data = {
|
|
@@ -305,7 +317,7 @@ $(document).ready(function() {
|
|
|
<div class="form-group row">
|
|
|
<label for="uname" class="ml-3 col-form-label">培训时间:</label>
|
|
|
<div class="col-sm-10">
|
|
|
- <input data-language="zh" data-old-date="${jxdata.date}" data-type="date" placeholder="请选择时间" type="text" data-date-format="yyyy-MM-dd" class="jx-date datepicker-here form-control form-control-sm" value="${jxdata.date ? jxdata.date : ''}">
|
|
|
+ <input data-language="zh" data-old-date="${jxdata.date}" data-type="date" placeholder="请选择时间" type="text" data-range="true" data-multiple-dates-separator=" ~ " class="jx-date datepicker-here form-control form-control-sm" value="${jxdata.date ? jxdata.date : ''}">
|
|
|
</div>
|
|
|
</div>
|
|
|
<div class="form-group row">
|