This commit is contained in:
parent
cbbb193fcc
commit
87ea672899
|
|
@ -441,10 +441,10 @@ const addAndEditModelRules = ref({
|
||||||
const today = new Date()
|
const today = new Date()
|
||||||
today.setHours(0, 0, 0, 0) // 清除时间部分,只比较日期
|
today.setHours(0, 0, 0, 0) // 清除时间部分,只比较日期
|
||||||
selectedDate.setHours(0, 0, 0, 0)
|
selectedDate.setHours(0, 0, 0, 0)
|
||||||
console.log(selectedDate, 'selectedDate', today, 'today')
|
|
||||||
if (selectedDate > today) {
|
if (selectedDate > today) {
|
||||||
return false
|
return false
|
||||||
} else {
|
} else {
|
||||||
|
return true
|
||||||
callback()
|
callback()
|
||||||
}
|
}
|
||||||
},
|
},
|
||||||
|
|
@ -468,6 +468,7 @@ const addAndEditModelRules = ref({
|
||||||
if (selectedDate < today) {
|
if (selectedDate < today) {
|
||||||
return false
|
return false
|
||||||
} else {
|
} else {
|
||||||
|
return true
|
||||||
callback()
|
callback()
|
||||||
}
|
}
|
||||||
},
|
},
|
||||||
|
|
@ -490,8 +491,14 @@ const addAndEditModelRules = ref({
|
||||||
selectedDate.setHours(0, 0, 0, 0) // 清除时间部分,只比较日期
|
selectedDate.setHours(0, 0, 0, 0) // 清除时间部分,只比较日期
|
||||||
rectDate.setHours(0, 0, 0, 0) // 清除时间部分,只比较日期
|
rectDate.setHours(0, 0, 0, 0) // 清除时间部分,只比较日期
|
||||||
vioDate.setHours(0, 0, 0, 0) // 清除时间部分,只比较日期
|
vioDate.setHours(0, 0, 0, 0) // 清除时间部分,只比较日期
|
||||||
if (selectedDate > rectDate) return false
|
if (selectedDate > rectDate) {
|
||||||
if (selectedDate < vioDate) return false
|
return false
|
||||||
|
} else if (selectedDate < vioDate) {
|
||||||
|
return false
|
||||||
|
} else {
|
||||||
|
return true
|
||||||
|
callback()
|
||||||
|
}
|
||||||
},
|
},
|
||||||
message: '整改日期不能在检查日期之前且不能在整改期限之后',
|
message: '整改日期不能在检查日期之前且不能在整改期限之后',
|
||||||
trigger: ['change', 'blur'],
|
trigger: ['change', 'blur'],
|
||||||
|
|
|
||||||
|
|
@ -453,10 +453,11 @@ const addAndEditModelRules = ref({
|
||||||
const today = new Date()
|
const today = new Date()
|
||||||
today.setHours(0, 0, 0, 0) // 清除时间部分,只比较日期
|
today.setHours(0, 0, 0, 0) // 清除时间部分,只比较日期
|
||||||
selectedDate.setHours(0, 0, 0, 0)
|
selectedDate.setHours(0, 0, 0, 0)
|
||||||
console.log(selectedDate, 'selectedDate', today, 'today')
|
|
||||||
if (selectedDate > today) {
|
if (selectedDate > today) {
|
||||||
return false
|
return false
|
||||||
} else {
|
} else {
|
||||||
|
return true
|
||||||
callback()
|
callback()
|
||||||
}
|
}
|
||||||
},
|
},
|
||||||
|
|
@ -480,6 +481,7 @@ const addAndEditModelRules = ref({
|
||||||
if (selectedDate < today) {
|
if (selectedDate < today) {
|
||||||
return false
|
return false
|
||||||
} else {
|
} else {
|
||||||
|
return true
|
||||||
callback()
|
callback()
|
||||||
}
|
}
|
||||||
},
|
},
|
||||||
|
|
@ -502,8 +504,14 @@ const addAndEditModelRules = ref({
|
||||||
selectedDate.setHours(0, 0, 0, 0) // 清除时间部分,只比较日期
|
selectedDate.setHours(0, 0, 0, 0) // 清除时间部分,只比较日期
|
||||||
rectDate.setHours(0, 0, 0, 0) // 清除时间部分,只比较日期
|
rectDate.setHours(0, 0, 0, 0) // 清除时间部分,只比较日期
|
||||||
vioDate.setHours(0, 0, 0, 0) // 清除时间部分,只比较日期
|
vioDate.setHours(0, 0, 0, 0) // 清除时间部分,只比较日期
|
||||||
if (selectedDate > rectDate) return false
|
if (selectedDate > rectDate) {
|
||||||
if (selectedDate < vioDate) return false
|
return false
|
||||||
|
} else if (selectedDate < vioDate) {
|
||||||
|
return false
|
||||||
|
} else {
|
||||||
|
return true
|
||||||
|
callback()
|
||||||
|
}
|
||||||
},
|
},
|
||||||
message: '整改日期不能在违章日期之前且不能在整改期限之后',
|
message: '整改日期不能在违章日期之前且不能在整改期限之后',
|
||||||
trigger: ['change', 'blur'],
|
trigger: ['change', 'blur'],
|
||||||
|
|
|
||||||
Loading…
Reference in New Issue