|
@@ -176,6 +176,9 @@ export default {
|
|
|
}
|
|
|
if(data[i].end_date != data[i].start_date && data[i].end_date != this.valueDateList[0]) {
|
|
|
data[i].end_date = this.dayjs(this.valueDateList[0]).add('1','day').format('YYYY-MM-DD')
|
|
|
+ if(data[i].end_date < data[i].start_date) {
|
|
|
+ data[i].end_date = this.dayjs(data[i].start_date).add('1','day').format('YYYY-MM-DD')
|
|
|
+ }
|
|
|
}
|
|
|
|
|
|
this.mergeList.push(obj)
|