Merge remote-tracking branch 'origin/dev' into dev

This commit is contained in:
aixianling
2022-04-11 11:04:02 +08:00

View File

@@ -63,13 +63,13 @@
<el-row type="flex">
<el-col :span="20">
<el-form-item label="开始日期" prop="startDate">
<el-date-picker v-model="form.startDate" value-format="yyyy-MM-dd" type="date" placeholder="选择日期" style="width:410px">
<el-date-picker v-model="form.startDate" value-format="yyyy-MM-dd" :picker-options="startTime" type="date" placeholder="选择日期" style="width:410px">
</el-date-picker>
</el-form-item>
</el-col>
<el-col :span="20">
<el-form-item label="截止日期" prop="endDate">
<el-date-picker v-model="form.endDate" value-format="yyyy-MM-dd" type="date" placeholder="选择日期" style="width:410px">
<el-date-picker v-model="form.endDate" value-format="yyyy-MM-dd" :picker-options="endTime" type="date" placeholder="选择日期" style="width:410px">
</el-date-picker>
</el-form-item>
</el-col>
@@ -157,6 +157,26 @@ export default {
data: {},
isEdit: false,
id: '',
startTime: {
disabledDate: time => {
if (this.form.endTime) {
return (
time.getTime() > new Date(this.form.endTime).getTime()
);
} else {
return time.getTime() > Date.now();
}
}
},
endTime: {
disabledDate: time => {
if (this.form.startDate) {
return (
time.getTime() < new Date(this.form.startDate).getTime()
);
}
}
},
}
},
computed: {
@@ -178,6 +198,7 @@ export default {
}
},
},
created() {
this.$dict.load('landCirculateType')