Merge branch 'dev_1.0.0' of https://e.coding.net/g-cphe0354/cashier_front/cashier_admin_app into dev_1.0.0

pageConsumables/outbound.vue

@@ -100,6 +100,9 @@
 		onMounted,
 		getCurrentInstance
 	} from 'vue';
+	import {
+		onShow,
+	} from '@dcloudio/uni-app';
 	import color from '@/commons/color.js';
 	import go from '@/commons/utils/go.js';
 	import {
@@ -131,10 +134,11 @@
 		}
 	})
 	onMounted(() => {
-		getList()
 		datas.item = JSON.parse(props.item)
 	})
-
+onShow(() => {
+		getList()
+	})
 	function toggle() {
 		go.to('PAGES_ADD_SUPPLIER')
 	}

pageConsumables/warehouseEntry.vue

@@ -104,6 +104,9 @@
 		onMounted,
 		getCurrentInstance
 	} from 'vue';
+	import {
+		onShow,
+	} from '@dcloudio/uni-app';
 	import color from '@/commons/color.js';
 	import go from '@/commons/utils/go.js';
 	import {
@@ -134,10 +137,12 @@
 		}
 	})
 	onMounted(() => {
-		getList()
 		datas.item = JSON.parse(props.item)
 		datas.form = assign(datas.form, ...datas.item)
 	})
+	onShow(() => {
+		getList()
+	})
 	const refs = getCurrentInstance()
 
 	function toggle() {

pageSalesSummary/components/my-date-pickerview.vue

@@ -24,7 +24,7 @@
 				<picker-view-column>
 					<view class="item" v-for="(item,index) in days" :key="index">{{item}}日</view>
 				</picker-view-column>
-				<picker-view-column>
+	<!-- 			<picker-view-column>
 					<view class="item" v-for="(item,index) in hours" :key="index">{{item}}时</view>
 				</picker-view-column>
 				<picker-view-column>
@@ -32,7 +32,7 @@
 				</picker-view-column>
 				<picker-view-column>
 					<view class="item" v-for="(item,index) in seconds" :key="index">{{item}}秒</view>
-				</picker-view-column>
+				</picker-view-column> -->
 			</picker-view>
 			<view class="u-text-center color-999">至</view>
 			<picker-view :immediate-change="true" :value="value1" @pickend="pickend1" @change="bindChange1"
@@ -46,7 +46,7 @@
 				<picker-view-column>
 					<view class="item" v-for="(item,index) in days1" :key="index">{{item}}日</view>
 				</picker-view-column>
-				<picker-view-column>
+		<!-- 		<picker-view-column>
 					<view class="item" v-for="(item,index) in hours" :key="index">{{item}}时</view>
 				</picker-view-column>
 				<picker-view-column>
@@ -54,7 +54,7 @@
 				</picker-view-column>
 				<picker-view-column>
 					<view class="item" v-for="(item,index) in seconds" :key="index">{{item}}秒</view>
-				</picker-view-column>
+				</picker-view-column> -->
 			</picker-view>
 
 			<!-- 站位 -->

pageSalesSummary/index.vue

@@ -192,8 +192,10 @@
 			startTime = dayjs().startOf('month').format('YYYY-MM-DD') + ' 00:00:00'
 			endTime = dayjs().endOf('month').format('YYYY-MM-DD') + ' 23:59:59'
 		} else if (selected.value == 'custom') {
-			startTime = start
+			let s = start.substring(0, start.indexOf(' '))
-			endTime = end
+			let e = end.substring(0, end.indexOf(' '))
+			startTime = s + ' 00:00:00'
+			endTime = e + ' 23:59:59'
 		}
 		summaryTrade({
 			shopId: uni.getStorageSync('shopId'),

pageUser/add-user/add-user.vue

@@ -202,6 +202,7 @@
 
 
 	onLoad(params => {
+		console.log(params,'调试111')
 		if (params.id) {
 			let items = params
 			uni.setNavigationBarTitle({

pageUser/index/index.vue

@@ -283,7 +283,10 @@
 		activeUser: null
 	})
 	let close = () => {
-		datas.form = {}
+		datas.form = {
+			operationType: 'in',
+			type: 'inMoney'
+		}
 	}
 	const confirm = () => {
 		datas.show = false;

pages/index/components/statistics.vue

@@ -50,10 +50,12 @@
 	let selected = ref('today')
 	let showAll = ref(false);
 	let $list = []
+
 	function toggleShowAll() {
 		showAll.value = !showAll.value
 		setList()
 	}
+
 	function setList() {
 		list.value = showAll.value ? $list : $list.slice(0, 4)
 	}
@@ -90,6 +92,7 @@
 			})
 		}
 	});
+
 	function getlist(start, end) {
 		let startTime, endTime;
 		if (selected.value == 'today') {
@@ -113,8 +116,10 @@
 			startTime = dayjs().startOf('month').format('YYYY-MM-DD') + ' 00:00:00'
 			endTime = dayjs().endOf('month').format('YYYY-MM-DD') + ' 23:59:59'
 		} else if (selected.value == 'custom') {
-			startTime = start
+			let s = start.substring(0, start.indexOf(' '))
-			endTime = end
+			let e = end.substring(0, end.indexOf(' '))
+			startTime = s + ' 00:00:00'
+			endTime = e + ' 23:59:59'
 		}
 		summaryTrade({
 			shopId: uni.getStorageSync('shopId'),