From 823056d5bc4a541b43fb1bf24f3c373d7a960ef1 Mon Sep 17 00:00:00 2001
From: quanyawei <401863037@qq.com>
Date: Tue, 10 Oct 2023 10:29:56 +0800
Subject: [PATCH] Merge branch 'feature_1.0'
---
src/components/Form/DatePicker.vue | 12 ++++++++++--
1 files changed, 10 insertions(+), 2 deletions(-)
diff --git a/src/components/Form/DatePicker.vue b/src/components/Form/DatePicker.vue
index 0f027e7..2a0d80f 100644
--- a/src/components/Form/DatePicker.vue
+++ b/src/components/Form/DatePicker.vue
@@ -1,10 +1,18 @@
<template>
- <el-date-picker
+ <!-- <el-date-picker
v-model="value1"
type="month"
placeholder="���������"
value-format="yyyy-MM"
- />
+ /> -->
+ <el-date-picker
+ v-model="value1"
+ type="monthrange"
+ range-separator="���"
+ start-placeholder="������������"
+ value-format="yyyy-MM-dd HH"
+ end-placeholder="������������">
+ </el-date-picker>
</template>
<script>
--
Gitblit v1.8.0