diff --git a/src/pages/qualityInspection/components/addAndEditForm.vue b/src/pages/qualityInspection/components/addAndEditForm.vue index b0b2967..9f8ece1 100644 --- a/src/pages/qualityInspection/components/addAndEditForm.vue +++ b/src/pages/qualityInspection/components/addAndEditForm.vue @@ -435,6 +435,22 @@ const addAndEditModelRules = ref({ message: '请选择检查日期', trigger: ['blur', 'change'], }, + { + validator: (value, callback) => { + const selectedDate = new Date(addAndEditModel.vioDate) + 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 { + callback() + } + }, + message: '检查日期不能超过今天', + trigger: ['change', 'blur'], + }, ], rectDate: [ { @@ -443,6 +459,21 @@ const addAndEditModelRules = ref({ message: '请选择整改期限', trigger: ['blur', 'change'], }, + { + validator: (value, callback) => { + const selectedDate = new Date(addAndEditModel.rectDate) + const today = new Date() + today.setHours(0, 0, 0, 0) // 清除时间部分,只比较日期 + selectedDate.setHours(0, 0, 0, 0) + if (selectedDate < today) { + return false + } else { + callback() + } + }, + message: '整改期限不能晚于今天', + trigger: ['change', 'blur'], + }, ], rectTime: [ { @@ -451,6 +482,20 @@ const addAndEditModelRules = ref({ message: '请选择整改日期', trigger: ['blur', 'change'], }, + { + validator: (value, callback) => { + const selectedDate = new Date(addAndEditModel.rectTime) + const rectDate = new Date(addAndEditModel.rectDate) + const vioDate = new Date(addAndEditModel.vioDate) + 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 + }, + message: '整改日期不能在检查日期之前且不能在整改期限之后', + trigger: ['change', 'blur'], + }, ], checkUserName: [ { diff --git a/src/pages/safetyViolations/components/addAndEditForm.vue b/src/pages/safetyViolations/components/addAndEditForm.vue index 0f2227c..7a1535d 100644 --- a/src/pages/safetyViolations/components/addAndEditForm.vue +++ b/src/pages/safetyViolations/components/addAndEditForm.vue @@ -447,6 +447,22 @@ const addAndEditModelRules = ref({ message: '请选择整违章日期', trigger: ['blur', 'change'], }, + { + validator: (value, callback) => { + const selectedDate = new Date(addAndEditModel.vioDate) + 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 { + callback() + } + }, + message: '违章日期不能超过今天', + trigger: ['change', 'blur'], + }, ], rectDate: [ { @@ -455,6 +471,21 @@ const addAndEditModelRules = ref({ message: '请选择整改期限', trigger: ['blur', 'change'], }, + { + validator: (value, callback) => { + const selectedDate = new Date(addAndEditModel.rectDate) + const today = new Date() + today.setHours(0, 0, 0, 0) // 清除时间部分,只比较日期 + selectedDate.setHours(0, 0, 0, 0) + if (selectedDate < today) { + return false + } else { + callback() + } + }, + message: '整改期限不能晚于今天', + trigger: ['change', 'blur'], + }, ], rectTime: [ { @@ -463,6 +494,20 @@ const addAndEditModelRules = ref({ message: '请选择整改日期', trigger: ['blur', 'change'], }, + { + validator: (value, callback) => { + const selectedDate = new Date(addAndEditModel.rectTime) + const rectDate = new Date(addAndEditModel.rectDate) + const vioDate = new Date(addAndEditModel.vioDate) + 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 + }, + message: '整改日期不能在违章日期之前且不能在整改期限之后', + trigger: ['change', 'blur'], + }, ], vioPlace: [ {