Commit 01da9c1a by damodmg

更新

parent 3dfe1372
......@@ -400,7 +400,7 @@ export default {
if (this.form.dataRangeList[i].dataRange) {
let selectTimePrev = new Date(this.form.dataRangeList[i].dataRange[1]).valueOf();
//和前前一个的存在的结束时间比较
if (selectTime < selectTimePrev) {
if (selectTime <= selectTimePrev) {
this.$message.error('日期不可重叠!');
this.form.dataRangeList[index].dataRange = null;
}
......@@ -411,7 +411,7 @@ export default {
if (this.form.dataRangeList[j].dataRange) {
let selectTimeAfter = new Date(this.form.dataRangeList[j].dataRange[0]).valueOf();
//和后一个的存在的开始时间比较
if (selectTime > selectTimeAfter || selectTimeEnd > selectTimeAfter) {
if (selectTime >= selectTimeAfter || selectTimeEnd >= selectTimeAfter) {
this.$message.error('日期不可重叠!');
this.form.dataRangeList[index].dataRange = null;
}
......@@ -423,7 +423,7 @@ export default {
if (this.form.dataRangeList[j].dataRange) {
let selectTimeAfter = new Date(this.form.dataRangeList[j].dataRange[0]).valueOf();
//和后一个的存在的开始时间比较
if (selectTime > selectTimeAfter || selectTimeEnd > selectTimeAfter) {
if (selectTime >= selectTimeAfter || selectTimeEnd >= selectTimeAfter) {
this.$message.error('日期不可重叠!');
this.form.dataRangeList[index].dataRange = null;
}
......
......@@ -370,7 +370,7 @@ export default {
if (this.pickedModal.dataRangeList[i].dataRange) {
let selectTimePrev = new Date(this.pickedModal.dataRangeList[i].dataRange[1]).valueOf();
//和前前一个的存在的结束时间比较
if (selectTime < selectTimePrev) {
if (selectTime <= selectTimePrev) {
this.$message.error('日期不可重叠!');
this.pickedModal.dataRangeList[index].dataRange = null;
}
......@@ -381,7 +381,7 @@ export default {
if (this.pickedModal.dataRangeList[j].dataRange) {
let selectTimeAfter = new Date(this.pickedModal.dataRangeList[j].dataRange[0]).valueOf();
//和后一个的存在的开始时间比较
if (selectTime > selectTimeAfter || selectTimeEnd > selectTimeAfter) {
if (selectTime >= selectTimeAfter || selectTimeEnd >= selectTimeAfter) {
this.$message.error('日期不可重叠!');
this.pickedModal.dataRangeList[index].dataRange = null;
}
......@@ -393,7 +393,7 @@ export default {
if (this.pickedModal.dataRangeList[j].dataRange) {
let selectTimeAfter = new Date(this.pickedModal.dataRangeList[j].dataRange[0]).valueOf();
//和后一个的存在的开始时间比较
if (selectTime > selectTimeAfter || selectTimeEnd > selectTimeAfter) {
if (selectTime >= selectTimeAfter || selectTimeEnd >= selectTimeAfter) {
this.$message.error('日期不可重叠!');
this.pickedModal.dataRangeList[index].dataRange = null;
}
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment