From c7bd6db3190ff5c4b55d004db0b9fa944604925f Mon Sep 17 00:00:00 2001 From: riku <risaku@163.com> Date: 星期五, 18 十月 2024 11:09:15 +0800 Subject: [PATCH] Merge branch 'lsf-topTask' --- src/components/search-option/FYOptionTime.vue | 26 ++++++++++++++++++-------- 1 files changed, 18 insertions(+), 8 deletions(-) diff --git a/src/components/search-option/FYOptionTime.vue b/src/components/search-option/FYOptionTime.vue index ac1292c..82e2a64 100644 --- a/src/components/search-option/FYOptionTime.vue +++ b/src/components/search-option/FYOptionTime.vue @@ -1,10 +1,12 @@ <template> - <el-form-item label="鏃堕棿" :prop="prop"> + <el-form-item :label="label" :prop="prop"> <el-date-picker v-model="date" @change="handleChange" :type="type" placeholder="閫夋嫨鏃堕棿" + start-placeholder="閫夋嫨寮�濮嬫椂闂�" + end-placeholder="閫夋嫨缁撴潫鏃堕棿" style="width: 150px" /> </el-form-item> @@ -15,6 +17,7 @@ const MONTH = 'month'; const DATE = 'date'; +const RANGE = 'datetimerange'; export default { props: { @@ -23,30 +26,37 @@ default: MONTH }, // 杩斿洖缁撴灉 - value: Date, + value: Date || Array, // 鏄惁榛樿杩斿洖鍒濆閫夐」 initValue: { type: Boolean, default: true }, - prop: String + label: { + type: String, + default: '鏃堕棿' + }, + prop: { + type: String, + default: 'time' + } }, - emits: ['update:value'], + emits: ['update:value', 'change'], data() { return { date: this.value }; }, - computed:{ - }, + computed: {}, methods: { handleChange(value) { this.$emit('update:value', value); - }, + this.$emit('change', value); + } }, mounted() { if (this.initValue) { - this.date = new Date() + this.date = new Date(); this.handleChange(this.date); } } -- Gitblit v1.9.3