From 15e9d76b08f29e16ec64d66919374f799dbb0e4a Mon Sep 17 00:00:00 2001
From: aihe <961836564@qq.com>
Date: Thu, 23 May 2024 18:25:29 +0800
Subject: [PATCH] uu

---
 pages/deliveryDeal/arriveList.vue | 159 ++++++++++++++----------------
 pages/deliveryDeal/paiList.vue    | 159 ++++++++++++++----------------
 pages/deliveryDeal/sendList.vue   | 159 ++++++++++++++----------------
 3 files changed, 222 insertions(+), 255 deletions(-)

diff --git a/pages/deliveryDeal/arriveList.vue b/pages/deliveryDeal/arriveList.vue
index 86ac4e9..6b3d39f 100644
--- a/pages/deliveryDeal/arriveList.vue
+++ b/pages/deliveryDeal/arriveList.vue
@@ -1,81 +1,71 @@
 <template>
-	<tpx-layout>
-		<template v-slot:body>
-			<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="submitParam.yundanhao" placeholder="请输入或扫码"
-							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="submitParam.date" placeholder="请选择时间"></tpx-date-input>
-					</view>
-				</u-row>
-				
-				<view class="mt-30">
-					<u-button @click="handleSubmit()" type="primary" size="large" shape="square"
-						custom-style="height:80rpx;font-size: 30rpx;border-radius: 14rpx;">查询</u-button>
-				</view>
-				
-			</view>
-			
-			<view class="blcok-white-noradius">
-				<!-- <u-row justify="between">
-					<text class="font-weight">运单列表</text>
-					<view >
+	<tpx-page>
+		<tpx-layout>
+			<template v-slot:body>
+				<view class="pos-abt-all">
+					<tpx-scroll-view v-model:resObject="resData" :searchParam="searchParam" :getListFun="getListFun"
+						ref="listRef"
+					>
+						<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>
+								</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>
+								</view>
+							</u-row>
+							<!-- <view class="mt-30">
+								<u-button @click="handleSubmit()" type="primary" size="large" shape="square"
+									custom-style="height:80rpx;font-size: 30rpx;border-radius: 14rpx;">查询</u-button>
+							</view> -->
+							
+						</view>
 						
-					</view>
-				</u-row> -->
-				
-				<view class="">
-					<view class="pb-20">
-						<u-row>
-							<u-col span="8">
-								<text class="font-weight">运单号</text>
-							</u-col>
-							<u-col span="4">
-								<text class="font-weight">到件时间</text>
-							</u-col>
-						</u-row>
-					</view>
-					<view v-for="(item, index) in yundanList" class="yditem">
-						<u-row>
-							<u-col span="8">
-								<text class="">T2919292</text>
-							</u-col>
-							<u-col span="4">
-								<text class="clr-sub">12-18 13:18</text>
-							</u-col>
-						</u-row>
-					</view>
+						<view class="blcok-white-noradius">
+							<view class="">
+								<view class="pb-20">
+									<u-row>
+										<u-col span="8">
+											<text class="font-weight">运单号</text>
+										</u-col>
+										<u-col span="4">
+											<text class="font-weight">到件时间</text>
+										</u-col>
+									</u-row>
+								</view>
+								
+								<view v-for="(item, index) in resData.list" class="yditem">
+									<u-row>
+										<u-col span="8">
+											<text class="">{{item.billCode}}</text>
+										</u-col>
+										<u-col span="4">
+											<text class="clr-sub">{{item.sendDate}}</text>
+										</u-col>
+									</u-row>
+								</view>
+							</view>
+						</view>
+					</tpx-scroll-view>
 				</view>
-			</view>
+			</template>
 			
-		</template>
-		<template v-slot:footer>
-		</template>
-	</tpx-layout>
+			<template v-slot:footer>
+			</template>
+			
+		</tpx-layout>
+	</tpx-page>
 </template>
 
 <script>
-	import getCdnUrl from "@/common/getCdnUrl"
-	import {
-		ordStaEnum,
-		ordStatusList,
-		payTypeEnum,
-		payTypeList,
-		dlvTypeEnum,
-		dlvTypeList,
-		dateTypeEnum,
-		dateTypeList
-	} from "@/common/enum"
-	import {
-		goto
-	} from "@/common/untool"
+	import { debounce } from "@/common/util"
+	import * as apiService from "@/common/api"
 	export default {
 		props: {
 			// hasLeftWin: {
@@ -87,20 +77,15 @@
 		},
 		data() {
 			return {
-				submitParam: {
-					date: [],
-					type: 1,
+				searchParam: {
+					billCode: '',
+					_date: [],
 				},
-				
-				yundanList: [
-					{ val: 'T7080304037' },{ val: 'T708012124037' },{ val: 'T7080304092' }
-				]
+				resData: { list: [] }
 			}
 		},
 		onShareAppMessage() {
 			return {
-				// title: '',
-				// path: 'TODO'
 			}
 		},
 		onLoad() {
@@ -110,12 +95,16 @@
 
 		},
 		methods: {
-			getCdnUrl,
-
+			async getListFun(param){
+				let cpParam = JSON.parse(JSON.stringify(param))
+				cpParam['params.scanStatType'] = 2 // 到件
+				cpParam['params.beginSendDate'] = cpParam._date[0]
+				cpParam['params.endSendDate'] = cpParam._date[1]
+				let res = await apiService.queryScanWaybillList(cpParam)
+				return res
+			},
 			initData() {
-				// uni.showLoading({
-				// 	title: '加载中'
-				// });
+				
 			},
 			handleSubmit() {
 
diff --git a/pages/deliveryDeal/paiList.vue b/pages/deliveryDeal/paiList.vue
index 7cda540..506d0c0 100644
--- a/pages/deliveryDeal/paiList.vue
+++ b/pages/deliveryDeal/paiList.vue
@@ -1,81 +1,71 @@
 <template>
-	<tpx-layout>
-		<template v-slot:body>
-			<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="submitParam.yundanhao" placeholder="请输入或扫码"
-							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="submitParam.date" placeholder="请选择时间"></tpx-date-input>
-					</view>
-				</u-row>
-				
-				<view class="mt-30">
-					<u-button @click="handleSubmit()" type="primary" size="large" shape="square"
-						custom-style="height:80rpx;font-size: 30rpx;border-radius: 14rpx;">查询</u-button>
-				</view>
-				
-			</view>
-			
-			<view class="blcok-white-noradius">
-				<!-- <u-row justify="between">
-					<text class="font-weight">运单列表</text>
-					<view >
+	<tpx-page>
+		<tpx-layout>
+			<template v-slot:body>
+				<view class="pos-abt-all">
+					<tpx-scroll-view v-model:resObject="resData" :searchParam="searchParam" :getListFun="getListFun"
+						ref="listRef"
+					>
+						<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>
+								</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>
+								</view>
+							</u-row>
+							<!-- <view class="mt-30">
+								<u-button @click="handleSubmit()" type="primary" size="large" shape="square"
+									custom-style="height:80rpx;font-size: 30rpx;border-radius: 14rpx;">查询</u-button>
+							</view> -->
+							
+						</view>
 						
-					</view>
-				</u-row> -->
-				
-				<view class="">
-					<view class="pb-20">
-						<u-row>
-							<u-col span="8">
-								<text class="font-weight">运单号</text>
-							</u-col>
-							<u-col span="4">
-								<text class="font-weight">派件时间</text>
-							</u-col>
-						</u-row>
-					</view>
-					<view v-for="(item, index) in yundanList" class="yditem">
-						<u-row>
-							<u-col span="8">
-								<text class="">T2919292</text>
-							</u-col>
-							<u-col span="4">
-								<text class="clr-sub">12-18 13:18</text>
-							</u-col>
-						</u-row>
-					</view>
+						<view class="blcok-white-noradius">
+							<view class="">
+								<view class="pb-20">
+									<u-row>
+										<u-col span="8">
+											<text class="font-weight">运单号</text>
+										</u-col>
+										<u-col span="4">
+											<text class="font-weight">派件时间</text>
+										</u-col>
+									</u-row>
+								</view>
+								
+								<view v-for="(item, index) in resData.list" class="yditem">
+									<u-row>
+										<u-col span="8">
+											<text class="">{{item.billCode}}</text>
+										</u-col>
+										<u-col span="4">
+											<text class="clr-sub">{{item.sendDate}}</text>
+										</u-col>
+									</u-row>
+								</view>
+							</view>
+						</view>
+					</tpx-scroll-view>
 				</view>
-			</view>
+			</template>
 			
-		</template>
-		<template v-slot:footer>
-		</template>
-	</tpx-layout>
+			<template v-slot:footer>
+			</template>
+			
+		</tpx-layout>
+	</tpx-page>
 </template>
 
 <script>
-	import getCdnUrl from "@/common/getCdnUrl"
-	import {
-		ordStaEnum,
-		ordStatusList,
-		payTypeEnum,
-		payTypeList,
-		dlvTypeEnum,
-		dlvTypeList,
-		dateTypeEnum,
-		dateTypeList
-	} from "@/common/enum"
-	import {
-		goto
-	} from "@/common/untool"
+	import { debounce } from "@/common/util"
+	import * as apiService from "@/common/api"
 	export default {
 		props: {
 			// hasLeftWin: {
@@ -87,20 +77,15 @@
 		},
 		data() {
 			return {
-				submitParam: {
-					date: [],
-					type: 1,
+				searchParam: {
+					billCode: '',
+					_date: [],
 				},
-				
-				yundanList: [
-					{ val: 'T7080304037' },{ val: 'T708012124037' },{ val: 'T7080304092' }
-				]
+				resData: { list: [] }
 			}
 		},
 		onShareAppMessage() {
 			return {
-				// title: '',
-				// path: 'TODO'
 			}
 		},
 		onLoad() {
@@ -110,12 +95,16 @@
 
 		},
 		methods: {
-			getCdnUrl,
-
+			async getListFun(param){
+				let cpParam = JSON.parse(JSON.stringify(param))
+				cpParam['params.scanStatType'] = 3 // 派件
+				cpParam['params.beginSendDate'] = cpParam._date[0]
+				cpParam['params.endSendDate'] = cpParam._date[1]
+				let res = await apiService.queryScanWaybillList(cpParam)
+				return res
+			},
 			initData() {
-				// uni.showLoading({
-				// 	title: '加载中'
-				// });
+				
 			},
 			handleSubmit() {
 
diff --git a/pages/deliveryDeal/sendList.vue b/pages/deliveryDeal/sendList.vue
index 5a3a925..4195c27 100644
--- a/pages/deliveryDeal/sendList.vue
+++ b/pages/deliveryDeal/sendList.vue
@@ -1,81 +1,71 @@
 <template>
-	<tpx-layout>
-		<template v-slot:body>
-			<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="submitParam.yundanhao" placeholder="请输入或扫码"
-							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="submitParam.date" placeholder="请选择时间"></tpx-date-input>
-					</view>
-				</u-row>
-				
-				<view class="mt-30">
-					<u-button @click="handleSubmit()" type="primary" size="large" shape="square"
-						custom-style="height:80rpx;font-size: 30rpx;border-radius: 14rpx;">查询</u-button>
-				</view>
-				
-			</view>
-			
-			<view class="blcok-white-noradius">
-				<!-- <u-row justify="between">
-					<text class="font-weight">运单列表</text>
-					<view >
+	<tpx-page>
+		<tpx-layout>
+			<template v-slot:body>
+				<view class="pos-abt-all">
+					<tpx-scroll-view v-model:resObject="resData" :searchParam="searchParam" :getListFun="getListFun"
+						ref="listRef"
+					>
+						<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>
+								</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>
+								</view>
+							</u-row>
+							<!-- <view class="mt-30">
+								<u-button @click="handleSubmit()" type="primary" size="large" shape="square"
+									custom-style="height:80rpx;font-size: 30rpx;border-radius: 14rpx;">查询</u-button>
+							</view> -->
+							
+						</view>
 						
-					</view>
-				</u-row> -->
-				
-				<view class="">
-					<view class="pb-20">
-						<u-row>
-							<u-col span="8">
-								<text class="font-weight">运单号</text>
-							</u-col>
-							<u-col span="4">
-								<text class="font-weight">发件时间</text>
-							</u-col>
-						</u-row>
-					</view>
-					<view v-for="(item, index) in yundanList" class="yditem">
-						<u-row>
-							<u-col span="8">
-								<text class="">T2919292</text>
-							</u-col>
-							<u-col span="4">
-								<text class="clr-sub">12-18 13:18</text>
-							</u-col>
-						</u-row>
-					</view>
+						<view class="blcok-white-noradius">
+							<view class="">
+								<view class="pb-20">
+									<u-row>
+										<u-col span="8">
+											<text class="font-weight">运单号</text>
+										</u-col>
+										<u-col span="4">
+											<text class="font-weight">发件时间</text>
+										</u-col>
+									</u-row>
+								</view>
+								
+								<view v-for="(item, index) in resData.list" class="yditem">
+									<u-row>
+										<u-col span="8">
+											<text class="">{{item.billCode}}</text>
+										</u-col>
+										<u-col span="4">
+											<text class="clr-sub">{{item.sendDate}}</text>
+										</u-col>
+									</u-row>
+								</view>
+							</view>
+						</view>
+					</tpx-scroll-view>
 				</view>
-			</view>
+			</template>
 			
-		</template>
-		<template v-slot:footer>
-		</template>
-	</tpx-layout>
+			<template v-slot:footer>
+			</template>
+			
+		</tpx-layout>
+	</tpx-page>
 </template>
 
 <script>
-	import getCdnUrl from "@/common/getCdnUrl"
-	import {
-		ordStaEnum,
-		ordStatusList,
-		payTypeEnum,
-		payTypeList,
-		dlvTypeEnum,
-		dlvTypeList,
-		dateTypeEnum,
-		dateTypeList
-	} from "@/common/enum"
-	import {
-		goto
-	} from "@/common/untool"
+	import { debounce } from "@/common/util"
+	import * as apiService from "@/common/api"
 	export default {
 		props: {
 			// hasLeftWin: {
@@ -87,20 +77,15 @@
 		},
 		data() {
 			return {
-				submitParam: {
-					date: [],
-					type: 1,
+				searchParam: {
+					billCode: '',
+					_date: [],
 				},
-				
-				yundanList: [
-					{ val: 'T7080304037' },{ val: 'T708012124037' },{ val: 'T7080304092' }
-				]
+				resData: { list: [] }
 			}
 		},
 		onShareAppMessage() {
 			return {
-				// title: '',
-				// path: 'TODO'
 			}
 		},
 		onLoad() {
@@ -110,12 +95,16 @@
 
 		},
 		methods: {
-			getCdnUrl,
-
+			async getListFun(param){
+				let cpParam = JSON.parse(JSON.stringify(param))
+				cpParam['params.scanStatType'] = 1 // 发件
+				cpParam['params.beginSendDate'] = cpParam._date[0]
+				cpParam['params.endSendDate'] = cpParam._date[1]
+				let res = await apiService.queryScanWaybillList(cpParam)
+				return res
+			},
 			initData() {
-				// uni.showLoading({
-				// 	title: '加载中'
-				// });
+				
 			},
 			handleSubmit() {