|
|
@ -134,14 +134,10 @@ class Calendar { |
|
|
let disableBefore = true |
|
|
let disableBefore = true |
|
|
let disableAfter = true |
|
|
let disableAfter = true |
|
|
if (this.startDate) { |
|
|
if (this.startDate) { |
|
|
// let dateCompBefore = this.dateCompare(this.startDate, fullDate)
|
|
|
|
|
|
// disableBefore = this.dateCompare(dateCompBefore ? this.startDate : fullDate, nowDate)
|
|
|
|
|
|
disableBefore = this.dateCompare(this.startDate, nowDate) |
|
|
disableBefore = this.dateCompare(this.startDate, nowDate) |
|
|
} |
|
|
} |
|
|
|
|
|
|
|
|
if (this.endDate) { |
|
|
if (this.endDate) { |
|
|
// let dateCompAfter = this.dateCompare(fullDate, this.endDate)
|
|
|
|
|
|
// disableAfter = this.dateCompare(nowDate, dateCompAfter ? this.endDate : fullDate)
|
|
|
|
|
|
disableAfter = this.dateCompare(nowDate, this.endDate) |
|
|
disableAfter = this.dateCompare(nowDate, this.endDate) |
|
|
} |
|
|
} |
|
|
let multiples = this.multipleStatus.data |
|
|
let multiples = this.multipleStatus.data |
|
|
@ -200,8 +196,7 @@ class Calendar { |
|
|
if (!date) { |
|
|
if (!date) { |
|
|
date = new Date() |
|
|
date = new Date() |
|
|
} |
|
|
} |
|
|
const dateInfo = this.canlender.find((item) => item.fullDate === this.getDate(date).fullDate) |
|
|
|
|
|
return dateInfo |
|
|
|
|
|
|
|
|
return this.canlender.find((item) => item.fullDate === this.getDate(date).fullDate) |
|
|
} |
|
|
} |
|
|
|
|
|
|
|
|
/** |
|
|
/** |
|
|
@ -212,11 +207,7 @@ class Calendar { |
|
|
startDate = new Date(startDate.replace('-', '/').replace('-', '/')) |
|
|
startDate = new Date(startDate.replace('-', '/').replace('-', '/')) |
|
|
// 计算详细项的截止时间
|
|
|
// 计算详细项的截止时间
|
|
|
endDate = new Date(endDate.replace('-', '/').replace('-', '/')) |
|
|
endDate = new Date(endDate.replace('-', '/').replace('-', '/')) |
|
|
if (startDate <= endDate) { |
|
|
|
|
|
return true |
|
|
|
|
|
} else { |
|
|
|
|
|
return false |
|
|
|
|
|
} |
|
|
|
|
|
|
|
|
return startDate <= endDate |
|
|
} |
|
|
} |
|
|
|
|
|
|
|
|
/** |
|
|
/** |
|
|
@ -227,11 +218,7 @@ class Calendar { |
|
|
before = new Date(before.replace('-', '/').replace('-', '/')) |
|
|
before = new Date(before.replace('-', '/').replace('-', '/')) |
|
|
// 计算详细项的截止时间
|
|
|
// 计算详细项的截止时间
|
|
|
after = new Date(after.replace('-', '/').replace('-', '/')) |
|
|
after = new Date(after.replace('-', '/').replace('-', '/')) |
|
|
if (before.getTime() - after.getTime() === 0) { |
|
|
|
|
|
return true |
|
|
|
|
|
} else { |
|
|
|
|
|
return false |
|
|
|
|
|
} |
|
|
|
|
|
|
|
|
return before.getTime() - after.getTime() === 0 |
|
|
} |
|
|
} |
|
|
|
|
|
|
|
|
/** |
|
|
/** |
|
|
@ -260,16 +247,16 @@ class Calendar { |
|
|
* @param {Object} end |
|
|
* @param {Object} end |
|
|
*/ |
|
|
*/ |
|
|
geDateAll(begin, end) { |
|
|
geDateAll(begin, end) { |
|
|
var arr = [] |
|
|
|
|
|
var ab = begin.split('-') |
|
|
|
|
|
var ae = end.split('-') |
|
|
|
|
|
var db = new Date() |
|
|
|
|
|
|
|
|
let arr = [] |
|
|
|
|
|
let ab = begin.split('-') |
|
|
|
|
|
let ae = end.split('-') |
|
|
|
|
|
let db = new Date() |
|
|
db.setFullYear(ab[0], ab[1] - 1, ab[2]) |
|
|
db.setFullYear(ab[0], ab[1] - 1, ab[2]) |
|
|
var de = new Date() |
|
|
|
|
|
|
|
|
let de = new Date() |
|
|
de.setFullYear(ae[0], ae[1] - 1, ae[2]) |
|
|
de.setFullYear(ae[0], ae[1] - 1, ae[2]) |
|
|
var unixDb = db.getTime() - 24 * 60 * 60 * 1000 |
|
|
|
|
|
var unixDe = de.getTime() - 24 * 60 * 60 * 1000 |
|
|
|
|
|
for (var k = unixDb; k <= unixDe; ) { |
|
|
|
|
|
|
|
|
let unixDb = db.getTime() - 24 * 60 * 60 * 1000 |
|
|
|
|
|
let unixDe = de.getTime() - 24 * 60 * 60 * 1000 |
|
|
|
|
|
for (let k = unixDb; k <= unixDe; ) { |
|
|
k = k + 24 * 60 * 60 * 1000 |
|
|
k = k + 24 * 60 * 60 * 1000 |
|
|
arr.push(this.getDate(new Date(parseInt(k))).fullDate) |
|
|
arr.push(this.getDate(new Date(parseInt(k))).fullDate) |
|
|
} |
|
|
} |
|
|
@ -313,7 +300,7 @@ class Calendar { |
|
|
* 鼠标 hover 更新多选状态 |
|
|
* 鼠标 hover 更新多选状态 |
|
|
*/ |
|
|
*/ |
|
|
setHoverMultiple(fullDate) { |
|
|
setHoverMultiple(fullDate) { |
|
|
let { before, after } = this.multipleStatus |
|
|
|
|
|
|
|
|
let { before } = this.multipleStatus |
|
|
|
|
|
|
|
|
if (!this.range) return |
|
|
if (!this.range) return |
|
|
if (this.lastHover) return |
|
|
if (this.lastHover) return |
|
|
|