From 14e63a4959f7812e4b4e40409f68bb3820bb52a1 Mon Sep 17 00:00:00 2001
From: aihe <961836564@qq.com>
Date: Tue, 30 Jul 2024 11:09:47 +0800
Subject: [PATCH] uu

---
 components/tpx-date-input/tpx-date-input.vue   |  1 +
 components/tpx-scroll-view/tpx-scroll-view.vue | 11 +++++++++--
 pages/print/courierNote.vue                    | 16 ++++++++++++----
 3 files changed, 22 insertions(+), 6 deletions(-)

diff --git a/components/tpx-date-input/tpx-date-input.vue b/components/tpx-date-input/tpx-date-input.vue
index 7f855dc..f735a62 100644
--- a/components/tpx-date-input/tpx-date-input.vue
+++ b/components/tpx-date-input/tpx-date-input.vue
@@ -170,6 +170,7 @@
 				}, 300)
 			},
 			handleToolsRangChange(val) {
+				this.rangeVal = val
 				if(val == -1) {
 					this.handleSwitchCladar()
 				} else {
diff --git a/components/tpx-scroll-view/tpx-scroll-view.vue b/components/tpx-scroll-view/tpx-scroll-view.vue
index d4dc5ee..01f554c 100644
--- a/components/tpx-scroll-view/tpx-scroll-view.vue
+++ b/components/tpx-scroll-view/tpx-scroll-view.vue
@@ -13,7 +13,7 @@
 		</view>
 		
 		<!-- 空数据页 -->
-		<view v-if="resObject.list.length == 0">
+		<view v-if="!showLoadMore && resObject.list.length == 0">
 			<tpx-empty :size="size"></tpx-empty>
 		</view>
 	</scroll-view>
@@ -43,6 +43,11 @@
 			}
 		},
 		props: {
+			createReload: {
+				default () {
+					return true
+				}
+			},
 			autoReload: {
 				default () {
 					return true
@@ -93,7 +98,9 @@
 			}
 		},
 		created() {
-			this.getDataList(true)
+			if(this.createReload) {
+				this.getDataList(true)
+			}
 		},
 		onHide() {
 
diff --git a/pages/print/courierNote.vue b/pages/print/courierNote.vue
index c214924..7554ced 100644
--- a/pages/print/courierNote.vue
+++ b/pages/print/courierNote.vue
@@ -4,20 +4,20 @@
 			<template v-slot:body>
 				<view class="pos-abt-all">
 					<tpx-scroll-view v-model:resObject="resData" :searchParam="searchParam" :getListFun="getListFun"
-						ref="listRef"
+						ref="listRef" :autoReload="false" :createReload="false"
 					>
 						<view class="blcok-white-noradius" style="margin-top: 0;">
 							<u-row justify="between">
 								<view style="width: 140rpx;" class="font-weight">运单号</view>
 								<view style="flex:1;">
 									<tpx-scan-input v-model:value="searchParam.billCode" placeholder="请输入或扫码"
-										@change="handleScanValChange" iconPos="right"></tpx-scan-input>
+										@scanChange="handleScanValChange" iconPos="right"></tpx-scan-input>
 								</view>
 							</u-row>
 							<u-row justify="between" custom-style="margin-top:20rpx;">
 								<view style="width: 140rpx;" class="font-weight">下单时间</view>
 								<view style="flex:1;">
-									<tpx-date-input v-model:value="searchParam._date" placeholder="请选择时间"></tpx-date-input>
+									<tpx-date-input ref="dateRef" v-model:value="searchParam._date" placeholder="请选择时间"></tpx-date-input>
 								</view>
 							</u-row>
 							<u-row custom-style="margin-top:20rpx;" justify="end">
@@ -177,6 +177,10 @@
 		onLoad() {
 			this.initData();
 		},
+		onReady(){
+			// 默认选择今天
+			this.$refs.dateRef.handleToolsRangChange('1')
+		},
 		onUnload() {
 
 		},
@@ -194,10 +198,14 @@
 			},
 			initData() {
 			},
+			triggerListReload(){
+				this?.$refs?.listRef?.getDataList?.(true) // 重置到第一页数据
+			},
 			handleScanValChange: debounce(function(val){
+				this.triggerListReload()
 			}),
 			handleSearch(){
-				
+				this.triggerListReload()
 			},
 			async handleSubmit() {
 				const imgUrls = await this.getPrintImages()