diff --git a/src/views/inspection/inspectiontasks.vue b/src/views/inspection/inspectiontasks.vue index 04fdae2..cff2358 100644 --- a/src/views/inspection/inspectiontasks.vue +++ b/src/views/inspection/inspectiontasks.vue @@ -109,6 +109,10 @@ callback(new Error('请输入任务执行开始时间')); } else if(this.currStartDate > value.replaceAll('/','').slice(0, 8)) { callback(new Error('输入的任务执行开始时间小于任务开始日期')); + }else if(this.resultForm.executeEndDate !== '' && this.resultForm.executeEndDate !== null) { + if(this.resultForm.executeEndDate.trim().replaceAll('/','') < value.trim().replaceAll('/','')) { + callback(new Error('输入的任务执行开始时间大于任务执行结束时间')); + } } else { callback(); } diff --git a/src/views/inspection/inspectiontasksDetail.vue b/src/views/inspection/inspectiontasksDetail.vue index c3c4970..63769ec 100644 --- a/src/views/inspection/inspectiontasksDetail.vue +++ b/src/views/inspection/inspectiontasksDetail.vue @@ -52,7 +52,18 @@ import request from "@/router/axios"; export default { name: "inspectiontasksDetail", data () { - var validateTime = (rule, value, callback) => { + var validateStartTime = (rule, value, callback) => { + if (value === '') { + callback(new Error('请输入任务开始日期')); + } else if(this.information_form.taskEndDate !== '' && this.information_form.taskEndDate !== null) { + if(this.information_form.taskEndDate < value) { + callback(new Error('输入的任务开始日期大于任务完成日期')); + } + } else { + callback(); + } + }; + var validateEndTime = (rule, value, callback) => { if (value === '') { callback(new Error('请输入任务完成日期')); } else if(this.information_form.taskStartDate > value) { @@ -132,11 +143,7 @@ export default { labelWidth: 120, format: 'yyyy年MM月dd日', valueFormat: "yyyyMMdd", - rules: [{ - required: true, - message: "请输入任务开始日期", - trigger: "blur" - }] + rules: [{required: true, validator: validateStartTime, trigger: 'blur' }] }, { label: "任务完成日期", @@ -146,7 +153,7 @@ export default { labelWidth: 120, format: 'yyyy年MM月dd日', valueFormat: "yyyyMMdd", - rules: [{required: true, validator: validateTime, trigger: 'blur' }] + rules: [{required: true, validator: validateEndTime, trigger: 'blur' }] }, { label: "对象编号",