From 9a11f818f304bc13bbd920313792e9560734922f Mon Sep 17 00:00:00 2001
From: hcong <1050828145@qq.com>
Date: 星期五, 27 九月 2024 15:31:25 +0800
Subject: [PATCH] 合并冲突
---
src/components/search-option/FYOptionTime.vue | 9 +--------
1 files changed, 1 insertions(+), 8 deletions(-)
diff --git a/src/components/search-option/FYOptionTime.vue b/src/components/search-option/FYOptionTime.vue
index 801fbde..ac1292c 100644
--- a/src/components/search-option/FYOptionTime.vue
+++ b/src/components/search-option/FYOptionTime.vue
@@ -14,6 +14,7 @@
import dayjs from 'dayjs';
const MONTH = 'month';
+const DATE = 'date';
export default {
props: {
@@ -42,14 +43,6 @@
handleChange(value) {
this.$emit('update:value', value);
},
- timeFormat() {
- switch (this.type) {
- case MONTH:
- return 'YYYY-MM';
- default:
- return 'YYYY-MM';
- }
- }
},
mounted() {
if (this.initValue) {
--
Gitblit v1.9.3