|
|
@@ -12,7 +12,7 @@
|
|
|
<view v-if="dropdownShow" :style="{top}" class="select-fixed_bx">
|
|
|
<slot>
|
|
|
<view class="select-item-box">
|
|
|
- <view class="title">时间</view>
|
|
|
+ <view class="title">快捷</view>
|
|
|
<view class="item-child_box">
|
|
|
<button
|
|
|
v-for="(item,index) in getDictionariesInfo.dateDefaultOption"
|
|
|
@@ -23,14 +23,27 @@
|
|
|
</button>
|
|
|
</view>
|
|
|
</view>
|
|
|
+
|
|
|
+
|
|
|
<view class="select-item-box">
|
|
|
- <view class="title">时间段</view>
|
|
|
+ <view class="title">按月份</view>
|
|
|
+ <picker mode="date" :value="date" :start="startDate" :end="endDate" fields="month" @change="bindMonthChange" >
|
|
|
+ <view class="item-child_box">
|
|
|
+ <view class="admin-button-com mini-btn default custom" >{{showMonth||'选择月份'}}</view>
|
|
|
+ </view>
|
|
|
+ </picker>
|
|
|
+ </view>
|
|
|
+
|
|
|
+
|
|
|
+ <view class="select-item-box">
|
|
|
+ <view class="title">自定义</view>
|
|
|
<view class="item-child_box" >
|
|
|
<view class="admin-button-com mini-btn default custom" @click="showDatePicker(0)">{{startDate || '选择开始日期'}}</view>
|
|
|
<view class="admin-button-com mini-btn default custom" @click="showDatePicker(1)">{{endDate || '选择结束日期'}}</view>
|
|
|
<view class="admin-button-com mini-btn blue custom" @click="customDateConfirm()">确认</view>
|
|
|
</view>
|
|
|
</view>
|
|
|
+
|
|
|
</slot>
|
|
|
</view>
|
|
|
<mx-date-picker :show="showPicker" format="yyyy-mm-dd" type="date" :value="defaultPickerDate" :show-tips="true" @confirm="confirmPicker" @cancel="cancelPicker" />
|
|
|
@@ -80,7 +93,8 @@ export default {
|
|
|
startDate:'',
|
|
|
endDate:'',
|
|
|
dateIndex:0,
|
|
|
- defaultDateName:'今天'
|
|
|
+ defaultDateName:'今天',
|
|
|
+ showMonth:null
|
|
|
}
|
|
|
},
|
|
|
watch:{
|
|
|
@@ -102,6 +116,13 @@ export default {
|
|
|
onLoad(){
|
|
|
},
|
|
|
methods:{
|
|
|
+ bindMonthChange(e){
|
|
|
+ this.dropdownShow = !this.dropdownShow
|
|
|
+ this.dropdownShow = false;
|
|
|
+ this.defaultDateName = e.target.value
|
|
|
+ console.log(e)
|
|
|
+ this.$emit('selectDateFn',{searchTime:'byMonth',startTime:e.target.value})
|
|
|
+ },
|
|
|
showDatePicker(index){//显示
|
|
|
this.showPicker = true;
|
|
|
this.dateIndex = index
|
|
|
@@ -124,7 +145,7 @@ export default {
|
|
|
return false
|
|
|
}
|
|
|
this.dropdownShow = false
|
|
|
- this.defaultDateName = '时间段'
|
|
|
+ this.defaultDateName = '自定义'
|
|
|
this.$emit('selectDateFn',{searchTime:'custom',startTime:this.startDate,endTime:this.endDate})
|
|
|
},
|
|
|
cancelPicker(){
|