日期check 追加

main
Dayu 11 months ago
parent 21dadccf39
commit 9870db3da0
  1. 4
      src/views/inspection/inspectiontasks.vue
  2. 21
      src/views/inspection/inspectiontasksDetail.vue

@ -109,6 +109,10 @@
callback(new Error('请输入任务执行开始时间')); callback(new Error('请输入任务执行开始时间'));
} else if(this.currStartDate > value.replaceAll('/','').slice(0, 8)) { } else if(this.currStartDate > value.replaceAll('/','').slice(0, 8)) {
callback(new Error('输入的任务执行开始时间小于任务开始日期')); 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 { } else {
callback(); callback();
} }

@ -52,7 +52,18 @@ import request from "@/router/axios";
export default { export default {
name: "inspectiontasksDetail", name: "inspectiontasksDetail",
data () { 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 === '') { if (value === '') {
callback(new Error('请输入任务完成日期')); callback(new Error('请输入任务完成日期'));
} else if(this.information_form.taskStartDate > value) { } else if(this.information_form.taskStartDate > value) {
@ -132,11 +143,7 @@ export default {
labelWidth: 120, labelWidth: 120,
format: 'yyyy年MM月dd日', format: 'yyyy年MM月dd日',
valueFormat: "yyyyMMdd", valueFormat: "yyyyMMdd",
rules: [{ rules: [{required: true, validator: validateStartTime, trigger: 'blur' }]
required: true,
message: "请输入任务开始日期",
trigger: "blur"
}]
}, },
{ {
label: "任务完成日期", label: "任务完成日期",
@ -146,7 +153,7 @@ export default {
labelWidth: 120, labelWidth: 120,
format: 'yyyy年MM月dd日', format: 'yyyy年MM月dd日',
valueFormat: "yyyyMMdd", valueFormat: "yyyyMMdd",
rules: [{required: true, validator: validateTime, trigger: 'blur' }] rules: [{required: true, validator: validateEndTime, trigger: 'blur' }]
}, },
{ {
label: "对象编号", label: "对象编号",

Loading…
Cancel
Save