|
|
@@ -24,13 +24,29 @@
|
|
|
<view class="data-search-range-item" @click="lookEndTime=true" v-if="!endTime">结束日期</view>
|
|
|
<div class="data-search-range-itemselect" @click="lookEndTime=true" v-else>{{endTime}}</div>
|
|
|
</view>
|
|
|
- <view class="iconfont iconjuxing27kaobei" v-if="beginTime||endTime" @click="beginTime='';endTime=''"></view>
|
|
|
+ <view class="iconfont iconjuxing27kaobei" v-if="beginTime||endTime" @click="beginTime='';endTime='';choose=-1"></view>
|
|
|
+ </view>
|
|
|
+ <view class="data-search-title mt-30">创建订单时间段</view>
|
|
|
+ <view class="flex-n fac data-search-range mt-10">
|
|
|
+ <image class="common_icon" src="../../../../static/icon_time.png"></image>
|
|
|
+ <view class="flex-n fac fjb">
|
|
|
+ <view class="data-search-range-item" @click="lookCreateTimeBegin=true" v-if="!createTimeBegin">开始日期</view>
|
|
|
+ <div class="data-search-range-itemselect" @click="lookCreateTimeBegin=true" v-else>{{createTimeBegin}}</div>
|
|
|
+ <view class="">
|
|
|
+ -
|
|
|
+ </view>
|
|
|
+ <view class="data-search-range-item" @click="lookCreateTimeEnd=true" v-if="!createTimeEnd">结束日期</view>
|
|
|
+ <div class="data-search-range-itemselect" @click="lookCreateTimeEnd=true" v-else>{{createTimeEnd}}</div>
|
|
|
+ </view>
|
|
|
+ <view class="iconfont iconjuxing27kaobei" v-if="createTimeBegin||createTimeEnd" @click="createTimeBegin='';createTimeEnd=''"></view>
|
|
|
</view>
|
|
|
<view class="data-search-btn" @click="submit">
|
|
|
确定
|
|
|
</view>
|
|
|
<z-date-select :visible.sync="lookBeginTime" v-model="beginTime" :endDate="endTime"></z-date-select>
|
|
|
<z-date-select :visible.sync="lookEndTime" v-model="endTime" :startDate="beginTime"></z-date-select>
|
|
|
+ <z-date-select :visible.sync="lookCreateTimeBegin" v-model="createTimeBegin" :endDate="createTimeEnd"></z-date-select>
|
|
|
+ <z-date-select :visible.sync="lookCreateTimeEnd" v-model="createTimeEnd" :startDate="createTimeBegin"></z-date-select>
|
|
|
</z-slide>
|
|
|
<z-date-select></z-date-select>
|
|
|
</view>
|
|
|
@@ -50,6 +66,10 @@
|
|
|
lookEndTime: false,
|
|
|
beginTime: '',
|
|
|
endTime: '',
|
|
|
+ createTimeBegin:'',
|
|
|
+ createTimeEnd:'',
|
|
|
+ lookCreateTimeBegin:false,
|
|
|
+ lookCreateTimeEnd:false,
|
|
|
choose: -1
|
|
|
}
|
|
|
},
|
|
|
@@ -61,18 +81,19 @@
|
|
|
this.show = this.visible;
|
|
|
if(newval){
|
|
|
this.choose=this.select;
|
|
|
+ this.getTimeRange();
|
|
|
}
|
|
|
},
|
|
|
- beginTime(newval, oldval) {
|
|
|
- if (newval) {
|
|
|
- this.choose = -1;
|
|
|
- }
|
|
|
- },
|
|
|
- endTime(newval, oldval) {
|
|
|
- if (newval) {
|
|
|
- this.choose = -1;
|
|
|
- }
|
|
|
- }
|
|
|
+ // beginTime(newval, oldval) {
|
|
|
+ // if (newval) {
|
|
|
+ // this.choose = -1;
|
|
|
+ // }
|
|
|
+ // },
|
|
|
+ // endTime(newval, oldval) {
|
|
|
+ // if (newval) {
|
|
|
+ // this.choose = -1;
|
|
|
+ // }
|
|
|
+ // }
|
|
|
},
|
|
|
methods: {
|
|
|
chooseArea(num) {
|
|
|
@@ -80,18 +101,12 @@
|
|
|
this.choose = -1;
|
|
|
} else {
|
|
|
this.choose = num;
|
|
|
+ this.getTimeRange();
|
|
|
}
|
|
|
},
|
|
|
- submit() {
|
|
|
- console.log(111)
|
|
|
+ getTimeRange(){
|
|
|
var beginDate = '',
|
|
|
endDate = '';
|
|
|
- if (this.beginTime != '' && this.endTime == '' || this.beginTime == '' && this.endTime != '') {
|
|
|
- return uni.showToast({
|
|
|
- title: '请选择完整时间段',
|
|
|
- icon: 'none'
|
|
|
- })
|
|
|
- }
|
|
|
var end = '';
|
|
|
var start = '';
|
|
|
if (this.choose == 0) {
|
|
|
@@ -152,8 +167,21 @@
|
|
|
beginDate =this.beginTime.replace(/\//g,"-");
|
|
|
endDate = this.endTime.replace(/\//g,"-");
|
|
|
}
|
|
|
+ this.beginTime=beginDate;
|
|
|
+ this.endTime=endDate;
|
|
|
console.log(beginDate,endDate)
|
|
|
- this.$emit('searchDate',{beginDate:beginDate,endDate:endDate});
|
|
|
+ },
|
|
|
+ submit() {
|
|
|
+ console.log(111)
|
|
|
+
|
|
|
+ if (this.beginTime != '' && this.endTime == '' || this.beginTime == '' && this.endTime != '') {
|
|
|
+ return uni.showToast({
|
|
|
+ title: '请选择完整时间段',
|
|
|
+ icon: 'none'
|
|
|
+ })
|
|
|
+ }
|
|
|
+
|
|
|
+ this.$emit('searchDate',{beginDate:this.beginTime,endDate:this.endTime,createTimeBegin:this.createTimeBegin.replace(/\//g,"-"),createTimeEnd:this.createTimeEnd.replace(/\//g,"-")});
|
|
|
this.$refs.slide.close();
|
|
|
}
|
|
|
}
|
123