日期

ghsApp/src/admin/statistics/cgStat.vue

@@ -8,8 +8,8 @@
 		</view>
 
 		<view class="top-bar">
-			<DateSelect class="bar" :menuObj="menuTimeObj" :selectItemId.sync="selectTimeId" :typeTime="true" :typeSelect="1" top="0" @selectSussess="selectSussess" />
-			<ShopSelectCp class="bar" :menuObj.sync="menuObj" :selectItemId.sync="shopId" top="0" @selectSussess="selectShopSussess" />
+			<DateSelect class="bar" :menuObj="menuTimeObj" :selectItemId.sync="selectTimeId" top="0" @selectSussess="selectDateFn" />
+			<ShopSelect class="bar" :menuObj.sync="menuObj" :selectItemId.sync="shopId" top="0" @selectSussess="selectShopFn" />
 		</view>
 
 		<view class="main-view">
@@ -33,14 +33,6 @@
 			</view>
 		</view>
 
-		<rangeDatePick
-			:show="isShow"
-			start="2000-01-01"
-			end="2200-12-01"
-			:value="customizationTime"
-			@change="timeChange"
-			@cancel="timeCancel"
-			themeColor="#4C83D6" fields="day"></rangeDatePick>
 	</view>
 </view>
 </template>
@@ -51,13 +43,12 @@ import AppWrapperEmpty from "@/components/app-wrapper-empty";
 import SelectList from "@/components/plugin/selectList";
 import { getStatCgGhsProfile } from "@/api/statistics/index";
 import { list,selectShop } from "@/mixins";
-import ShopSelectCp from "@/components/module/shopSelect";
+import ShopSelect from "@/components/module/shopSelect";
 import DateSelect from "@/components/module/dateSelect";
-import rangeDatePick from '@/components/pyh-rdtpicker/pyh-rdtpicker.vue';
 import AppSearchModule from "@/components/module/app-search";
 import {mapActions, mapGetters} from "vuex";
 export default {
-	components: { SelectList, AppWrapperEmpty,ShopSelectCp,rangeDatePick,AppSearchModule,DateSelect },
+	components: { SelectList, AppWrapperEmpty,ShopSelect,AppSearchModule,DateSelect },
 	mixins: [list,selectShop],
 	computed: {		...mapGetters(["getDictionariesInfo","getLoginInfo"])	},
 	data() {
@@ -131,12 +122,12 @@ export default {
 			}
 		},
 		// 选择分店
-		selectShopSussess(val){
+		selectShopFn(val){
 			this.params.shopId = val.selectItem.id;
 			this.init();
 		},
 		//选择时间
-		selectSussess(val) {
+		selectDateFn(val) {
 			this.params.selectTime = this.selectTimeId;
 			if(val.custom==1){
 				this.isShow = false;
@@ -147,19 +138,19 @@ export default {
 				this.init();
 			}
 		},
-		//选择时间-自定义时间
+		//选择时间-时间段
 		selectTime(){
 			this.customizationTime = [time,time],
 				this.isShow = true;
 		},
-		//选择自定义时间确定
+		//选择时间段确定
 		timeChange(e){
 			this.isShow = false;
 			this.params.startTime = e[0]
 			this.params.endTime = e[1]
 			this.init();
 		},
-		//选择自定义时间取消
+		//选择时间段取消
 		timeCancel(e){
 			this.isShow = false
 		},

ghsApp/src/components/module/dateSelect.vue

@@ -1,8 +1,7 @@
 <template>
     <view class="select-bg_bx">
         <view v-if="isShowTit" @click="switchCut" :class="['select-title',dropdownShow?'select_corlor':'']">
-            <text v-if="typeTime">{{selectItemId?menuObjActive:menuObj.title}}</text>
-            <text v-else>{{menuObjActive?menuObjActive:getMyShopInfo.shopName}}</text>
+            <text>{{selectItemId?menuObjActive:menuObj.title}}</text>
             <text v-if="placeholder" style="color: #ccc;">{{placeholder}}</text>
             <i v-if="isShowMore" class="iconfont iconsanjiao_xia"></i>
         </view>
@@ -24,27 +23,28 @@
                         </button>
                     </view>
                 </view>
-                <view v-if="typeSelect === 1" class="select-item-box">
-                    <view class="title">自定义</view>
-                    <view class="item-child_box" ><view class="admin-button-com mini-btn default custom" @click="DatePicker()">选择时间段（滑动切换月份）</view></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="setDateConfirm()">确认</view>
+                    </view>
                 </view>
             </slot>
         </view>
-        <mx-date-picker :show="showPicker" format="yyyy-mm-dd" type="range" :value="defaultPickerDate" 
-            :show-tips="false" :begin-text="'开始'" :end-text="'结束'" @confirm="confirmPicker" @cancel="cancelPicker" />
+        <mx-date-picker :show="showPicker" format="yyyy-mm-dd" type="date" :value="defaultPickerDate" :show-tips="true" @confirm="confirmPicker" @cancel="cancelPicker" />
     </view>
 </template>
 
 <script>
 import DropdownList from "@/components/plugin/dropdown-list";
-import AppDatePicker from "@/components/app-date-picker";
-import rangeDatePick from '@/components/pyh-rdtpicker/pyh-rdtpicker.vue';
 import MxDatePicker from '@/components/mx-datepicker/mx-datepicker.vue';
 import {mapGetters} from "vuex";
 export default {
     name:'dateSelect',
     components:{
-        DropdownList,AppDatePicker,rangeDatePick,MxDatePicker
+        DropdownList,MxDatePicker
     },
     props:{
         menuObj:{
@@ -55,11 +55,6 @@ export default {
                 list: [{name:'昨天',id:'0'},{name:'今天',id:'1'},{name:'本月',id:'2'},{name:'上月',id:'3'},{name:'今年',id:'4'}]
             })
         },
-        // 1 时间  2 其他
-        typeSelect:{
-            type:Number,
-            default: 2
-        },
         top:{
             type: String,
             default: 'auto'
@@ -71,10 +66,6 @@ export default {
         isShowTit:{
             type: Boolean,
             default: true
-        },
-            typeTime:{
-            type: Boolean,
-            default: false
         },
         isShowMore:{
             type: Boolean,
@@ -87,11 +78,14 @@ export default {
     },
     data(){
         return {
-            defaultPickerDate:['2019-01-01','2019-01-06'],
+            defaultPickerDate:'2019-01-01',
             showPicker: false,
             dropdownShow: false,
             selectItem:'',
             menuObjActive:'',
+            startDate:'',
+            endDate:'',
+            dateIndex:0
         }
     },
     computed:{
@@ -108,28 +102,39 @@ export default {
     },
     mounted(){
         let nowDate = new Date();
-
-        let startDate = new Date(nowDate.getTime() - 24*60*60*1000*3)
-        let start = startDate.Format("yyyy-MM-dd")
-		
 		let end = nowDate.Format("yyyy-MM-dd")
-        this.defaultPickerDate = [start,end]
+        this.defaultPickerDate = end
     },
     onLoad(){
     },
     methods:{
-        DatePicker(){//显示
+        showDatePicker(index){//显示
             this.showPicker = true;
+            this.dateIndex = index
         },
         confirmPicker(e) {//选择
-
-            this.showPicker = false;
-            this.dropdownShow = false;
+             if(this.dateIndex == 0){
+                this.startDate = e.value
+             }else{
+                this.endDate = e.value
+             }
+             this.showPicker = false;
+        },
+        setDateConfirm() {
+            if(this.$util.isEmpty(this.startDate)){
+                this.$msg('请选择开始日期')
+                return false
+            }
+            if(this.$util.isEmpty(this.endDate)){
+                this.$msg('请选择开始日期')
+                return false
+            }
             this.$emit('update:selectItemId','custom')            
             this.$emit('selectSussess',{
-                custom:1,start:e['value'][0],end:e['value'][1]
+                custom:1,start:this.startDate,end:this.endDate
             })
-            this.menuObjActive = '自定义';
+            this.menuObjActive = '时间段';
+            this.dropdownShow = false
         },
         cancelPicker(e){//取消
             this.showPicker = false;
@@ -138,7 +143,7 @@ export default {
             this.dropdownShow = !this.dropdownShow
         },
         changeItem(val){
-            if(val.id== this.selectItemId&&val.name!='自定义'){
+            if(val.id== this.selectItemId&&val.name!='时间段'){
                 return false
             }
             this.$emit('update:selectItemId',val.id)