From 0fca4367d759fb02f6b490478331c634b11c6a50 Mon Sep 17 00:00:00 2001
From: Tevin <tingquanren@163.com>
Date: Thu, 18 Jul 2024 11:32:27 +0800
Subject: [PATCH] 修复公共工具集，周数转日期的计算问题
---
forms/datePicker/CDateRangeAction.vue | 26 ++++++++++++++++++--------
1 files changed, 18 insertions(+), 8 deletions(-)
diff --git a/forms/datePicker/CDateRangeAction.vue b/forms/datePicker/CDateRangeAction.vue
index 65c19d6..5c86a3d 100644
--- a/forms/datePicker/CDateRangeAction.vue
+++ b/forms/datePicker/CDateRangeAction.vue
@@ -15,12 +15,11 @@
class="c-data-range-float"
ref="floadLayer"
>
- <AtDrawer
+ <CDrawer
class="c-data-range-drawer"
- ref="floatDrawer"
- mask
+ direction="top"
:show="drawerShow"
- :onClose="evt => drawerShow=false"
+ :onClose="evt => handleClose()"
>
<view class="title">
<view v-if="placeholder">{{placeholder}}</view>
@@ -28,7 +27,9 @@
</view>
<view class="date">
<picker
- mode='date'
+ mode="date"
+ :start="pickerStart"
+ :end="pickerEnd"
:value="startDate"
@change="evt => handleStartDateChange(evt.detail.value)"
>
@@ -41,7 +42,9 @@
</view>
</picker>
<picker
- mode='date'
+ mode="date"
+ :start="pickerStart"
+ :end="pickerEnd"
:value="endDate"
@change="evt => handleEndDateChange(evt.detail.value)"
>
@@ -61,7 +64,7 @@
:circle="false"
:onClick="evt => handleFinish()"
>确定</AtButton>
- </AtDrawer>
+ </CDrawer>
</view>
</view>
</template>
@@ -70,6 +73,7 @@
import Taro from '@tarojs/taro';
import { $ } from '@tarojs/extend';
import { AtDrawer, AtButton } from 'taro-ui-vue';
+import { CDrawer } from '@components/layout/drawer';
import './cDateRangeAction.scss';
export default {
@@ -77,6 +81,7 @@
components: {
AtDrawer,
AtButton,
+ CDrawer,
},
props: {
// 项值
@@ -87,10 +92,13 @@
placeholder: String,
},
data() {
+ const year = new Date().getFullYear();
return {
drawerShow: false,
startDate: '',
endDate: '',
+ pickerStart: year - 30 + '-01-01',
+ pickerEnd: year + 30 + '-12-31',
};
},
computed: {},
@@ -100,6 +108,9 @@
const curDates = (this.value || ',').split(',');
this.startDate = curDates[0];
this.endDate = curDates[1];
+ },
+ handleClose() {
+ this.drawerShow = false;
},
handleStartDateChange(date) {
if (date && this.endDate) {
@@ -146,7 +157,6 @@
const $cFilter = $(this.$refs.floadLayer).parents('.c-filter');
if ($cFilter.length > 0) {
$cFilter.eq(0).after(this.$refs.floadLayer);
- $cFilter.parent().css('transform', 'translate(0,0)');
}
},
};
--
Gitblit v1.9.1