|
|
@@ -1,11 +1,11 @@
|
|
|
<template>
|
|
|
<view class="ex-page">
|
|
|
<view class="top-bar">
|
|
|
- <DorpdownSelect class="bar"
|
|
|
+ <DateSelect class="bar"
|
|
|
:menuObj="menuTimeObj"
|
|
|
:selectItemId.sync="selectTimeId"
|
|
|
:typeTime="true"
|
|
|
- :typeSelect="1" top="0px"
|
|
|
+ :typeSelect="1" top="0"
|
|
|
@selectSussess="selectSussess" />
|
|
|
<DorpdownSelect class="bar"
|
|
|
:menuObj.sync="menuObj"
|
|
|
@@ -45,16 +45,7 @@
|
|
|
</block>
|
|
|
</view>
|
|
|
</scroll-view>
|
|
|
- <!-- 时间段选择-->
|
|
|
- <rangeDatePick
|
|
|
- :show="isShow"
|
|
|
- start="2000-01-01"
|
|
|
- end="2200-12-01"
|
|
|
- :value="customizationTime"
|
|
|
- @change="timeChange"
|
|
|
- @cancel="timeCancel"
|
|
|
- themeColor="#4C83D6" fields="day"></rangeDatePick>
|
|
|
- <!-- <kd-entrance></kd-entrance> -->
|
|
|
+
|
|
|
</view>
|
|
|
</template>
|
|
|
<script>
|
|
|
@@ -65,10 +56,10 @@ import SelectList from "@/components/plugin/selectList";
|
|
|
import { getStatProfit } from "@/api/statistics/index";
|
|
|
import { list,selectShop } from "@/mixins";
|
|
|
import DorpdownSelect from "@/components/module/shopSelect";
|
|
|
-import rangeDatePick from '@/components/pyh-rdtpicker/pyh-rdtpicker.vue';
|
|
|
+import DateSelect from "@/components/module/dateSelect";
|
|
|
import {mapActions, mapGetters} from "vuex";
|
|
|
export default {
|
|
|
- components: { SelectList, AppWrapperEmpty,DorpdownSelect,rangeDatePick },
|
|
|
+ components: { SelectList, AppWrapperEmpty,DorpdownSelect,DateSelect},
|
|
|
mixins: [list,selectShop],
|
|
|
computed: { ...mapGetters(["getDictionariesInfo","getLoginInfo"]) },
|
|
|
data() {
|
|
|
@@ -170,8 +161,11 @@ export default {
|
|
|
//选择时间
|
|
|
selectSussess(val) {
|
|
|
this.params.selectTime = this.selectTimeId;
|
|
|
- if(val.select=='自定义'){
|
|
|
- this.selectTime();
|
|
|
+ if(val.custom==1){
|
|
|
+ this.isShow = false;
|
|
|
+ this.params.startTime = val.start
|
|
|
+ this.params.endTime = val.end
|
|
|
+ this.init();
|
|
|
}else{
|
|
|
this.init();
|
|
|
}
|