diff --git a/src/pages/qualityInspection/components/addAndEditForm.vue b/src/pages/qualityInspection/components/addAndEditForm.vue index 9f8ece1..a49a8bd 100644 --- a/src/pages/qualityInspection/components/addAndEditForm.vue +++ b/src/pages/qualityInspection/components/addAndEditForm.vue @@ -441,10 +441,10 @@ const addAndEditModelRules = ref({ const today = new Date() today.setHours(0, 0, 0, 0) // 清除时间部分,只比较日期 selectedDate.setHours(0, 0, 0, 0) - console.log(selectedDate, 'selectedDate', today, 'today') if (selectedDate > today) { return false } else { + return true callback() } }, @@ -468,6 +468,7 @@ const addAndEditModelRules = ref({ if (selectedDate < today) { return false } else { + return true callback() } }, @@ -490,8 +491,14 @@ const addAndEditModelRules = ref({ selectedDate.setHours(0, 0, 0, 0) // 清除时间部分,只比较日期 rectDate.setHours(0, 0, 0, 0) // 清除时间部分,只比较日期 vioDate.setHours(0, 0, 0, 0) // 清除时间部分,只比较日期 - if (selectedDate > rectDate) return false - if (selectedDate < vioDate) return false + if (selectedDate > rectDate) { + return false + } else if (selectedDate < vioDate) { + return false + } else { + return true + callback() + } }, message: '整改日期不能在检查日期之前且不能在整改期限之后', trigger: ['change', 'blur'], diff --git a/src/pages/safetyViolations/components/addAndEditForm.vue b/src/pages/safetyViolations/components/addAndEditForm.vue index 7a1535d..c300085 100644 --- a/src/pages/safetyViolations/components/addAndEditForm.vue +++ b/src/pages/safetyViolations/components/addAndEditForm.vue @@ -453,10 +453,11 @@ const addAndEditModelRules = ref({ const today = new Date() today.setHours(0, 0, 0, 0) // 清除时间部分,只比较日期 selectedDate.setHours(0, 0, 0, 0) - console.log(selectedDate, 'selectedDate', today, 'today') + if (selectedDate > today) { return false } else { + return true callback() } }, @@ -480,6 +481,7 @@ const addAndEditModelRules = ref({ if (selectedDate < today) { return false } else { + return true callback() } }, @@ -502,8 +504,14 @@ const addAndEditModelRules = ref({ selectedDate.setHours(0, 0, 0, 0) // 清除时间部分,只比较日期 rectDate.setHours(0, 0, 0, 0) // 清除时间部分,只比较日期 vioDate.setHours(0, 0, 0, 0) // 清除时间部分,只比较日期 - if (selectedDate > rectDate) return false - if (selectedDate < vioDate) return false + if (selectedDate > rectDate) { + return false + } else if (selectedDate < vioDate) { + return false + } else { + return true + callback() + } }, message: '整改日期不能在违章日期之前且不能在整改期限之后', trigger: ['change', 'blur'],