Merge branch 'v_c_application_feature_1031' into 'develop'

V c application feature 1031

See merge request !28

src/pages/ApplyConsumption/businessRecord/components/device/device.vue

@@ -4,7 +4,7 @@
 		<view class="store_data" v-if="!isperiod">
 			<view class="rowboxh">
 				<view class="rowl" @tap="selectStore">
-					<view class="rowltxt2">{{StoreInfo_['storeName']||'全部门店'}}</view>
+					<view class="rowltxt2" style="max-width: 219rpx; white-space: nowrap; overflow-x: clip;text-overflow: ellipsis;">{{StoreInfo_['storeName']||'全部门店'}}</view>
 					<image :class="showPicker?'xiaframes':'xia'" style="margin-left: 16rpx;"
 						:src="ImgUrl+'xzf/h5/xia.png'" mode="aspectFit"></image>
 				</view>

src/pages/ApplyConsumption/businessRecord/components/store/store.vue

@@ -10,7 +10,9 @@
 		<view class="store_data" v-if="!isperiod">
 			<view class="rowboxh">
 				<view class="rowl" @tap="selectStore">
-					<view class="rowltxt2">{{StoreInfo_['storeName']||'全部门店'}}</view>
+					<view class="rowltxt2"
+						style="max-width: 219rpx; white-space: nowrap; overflow-x: clip;text-overflow: ellipsis;">
+						{{StoreInfo_['storeName']||'全部门店'}}</view>
 					<image :class="showPicker?'xiaframes':'xia'" style="margin-left: 16rpx;"
 						:src="ImgUrl+'xzf/h5/xia.png'" mode="aspectFit"></image>
 				</view>

src/pages/ApplyConsumption/businessRecord/consumeRecord/consumeRecord.vue

@@ -31,7 +31,7 @@
 			</van-tab>
 		</van-tabs>
 		<!-- 选择日期组件 -->
-		<van-calendar v-model="calendar" :min-date="minDate" :max-range="93" :show-confirm="true" position="bottom"
+		<van-calendar v-model="calendar"  :min-date="minDate" :max-range="93" :show-confirm="true" position="bottom"
 			color="#01CB88" type="range" @confirm="onConfirm" />
 		<!-- 门店选择 -->
 		<van-popup v-model="showPicker" round position="bottom">
@@ -39,7 +39,7 @@
 				<van-picker title="门店选择" show-toolbar :columns="stores" @confirm="onConfirmStore"
 					@cancel="onCancelStore" @change="onChangeStore">
 					<template #option="option">
-						<view class="">
+						<view class="" style="white-space: nowrap; text-overflow: ellipsis; width: 100%;text-align: center;">
 							{{option.storeName}}
 						</view>
 					</template>
@@ -197,7 +197,7 @@
 				console.warn(item, index)
 				uni.setStorageSync("details", item)
 				uni.navigateTo({
-					url: "../transactionDetails/transactionDetails",
+					url: `../transactionDetails/transactionDetails?starttime=${this.starttime}&endtime=${this.endtime}`,
 					success: () => {
 						loading.clear();
 					}
@@ -220,7 +220,7 @@
 
 			},
 			onCancelStore() {
-				this.selectStore()
+				this.showPicker = false
 			},
 			// 选择门店
 			selectStore() {

src/pages/ApplyConsumption/businessRecord/transactionDetails/transactionDetails.vue

@@ -126,6 +126,10 @@
 			}
 		},
 		onLoad: function(options) {
+			if (options['endtime'] && options['starttime']) {
+				this.starttime = options['starttime']
+				this.endtime = options['endtime']
+			}
 			this.DeviceInfo()
 			this.DeviceFlows()
 		},