From 7bf0d2ffa4e53fc55e8ddc53741c1274bd06f603 Mon Sep 17 00:00:00 2001
From: aihe <961836564@qq.com>
Date: Wed, 8 May 2024 00:36:56 +0800
Subject: [PATCH] u

---
 .../buns-order-templates/bo-operator-tmp.vue  |   7 +-
 pages/deliveryDeal/qutgoingScanning.vue       | 171 ++++++++----------
 2 files changed, 83 insertions(+), 95 deletions(-)

diff --git a/components/buns-order-templates/bo-operator-tmp.vue b/components/buns-order-templates/bo-operator-tmp.vue
index a94763a..eadc59d 100644
--- a/components/buns-order-templates/bo-operator-tmp.vue
+++ b/components/buns-order-templates/bo-operator-tmp.vue
@@ -3,7 +3,7 @@
 		<u-row justify="between">
 			<view>
 				<text class="clr-sub pr-10">操作员</text>
-				<text>李晓(南京市场部)</text>
+				<text>{{userInfo.empName}}({{userInfo.ownerSiteName}})</text>
 			</view>
 			<view>
 				<slot name="titleRight"></slot>
@@ -30,10 +30,13 @@
 	export default {
 		components: {  },
 		computed: {
-			submitInfo: {
+			modelInfo: {
 				get(){
 					return this.value
 				}
+			},
+			userInfo() {
+			  return this.$store.getters.userInfo
 			}
 		},
 		props: {
diff --git a/pages/deliveryDeal/qutgoingScanning.vue b/pages/deliveryDeal/qutgoingScanning.vue
index 4994dd8..c7a3892 100644
--- a/pages/deliveryDeal/qutgoingScanning.vue
+++ b/pages/deliveryDeal/qutgoingScanning.vue
@@ -1,133 +1,118 @@
 <template>
-	<tpx-layout>
-		<template v-slot:body>
-			<view class="blcok-white-noradius" style="margin-top: 0;">
-				<u-row justify="between">
-					<view style="flex:1;">
-						<tpx-scan-input v-model:value="submitParam.yundanhao" placeholder="请输入或扫码"
-							iconPos="left"></tpx-scan-input>
+	<tpx-page>
+		<tpx-layout>
+			<template v-slot:body>
+				<view class="blcok-white-noradius" style="margin-top: 0;">
+					<u-row justify="between">
+						<view style="flex:1;">
+							<tpx-scan-input v-model:value="orderNo" placeholder="请输入或扫码"
+								@change="handleScanValChange" iconPos="left"></tpx-scan-input>
+						</view>
+					</u-row>
+					<u-row custom-style="margin-top:20rpx;">
+						<view style="flex: 1;">
+							<tpx-select placeholder="下一网点" :isWhite="true"></tpx-select>
+						</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>
-				</u-row>
-				<u-row custom-style="margin-top:20rpx;">
-					<view style="flex: 1;">
-						<tpx-select placeholder="下一网点" :isWhite="true"></tpx-select>
-					</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">
-				<bo-operator-tmp>
-					<template v-slot:titleRight>
-						<button size="mini">查看历史发件</button>
-					</template>
-				</bo-operator-tmp>
-			</view>
-			
-			<view class="blcok-white-noradius">
-				<!-- <u-row justify="between">
-					<text class="font-weight">运单列表</text>
-					<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">
+					<bo-operator-tmp>
+						<template v-slot:titleRight>
+							<button size="mini">查看历史发件</button>
+						</template>
+					</bo-operator-tmp>
 				</view>
-			</view>
+				
+				<view class="blcok-white-noradius">
+					<tpx-scroll-view v-model:resObject="resData"
+					>
+						<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="">T2919292</text>
+									</u-col>
+									<u-col span="4">
+										<text class="clr-sub">12-18 13:18</text>
+									</u-col>
+								</u-row>
+							</view>
+						</view>
+					</tpx-scroll-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 { debounce } from "@/common/util"
+	import dayjs from "dayjs"
 	import BoOperatorTmp from "@/components/buns-order-templates/bo-operator-tmp"
-	import {
-		goto
-	} from "@/common/untool"
+	import * as apiService from "@/common/api"
 	export default {
 		components:{ BoOperatorTmp },
 		props: {
-			// hasLeftWin: {
-			// 	type: Boolean
-			// }
 		},
 		computed: {
 			
 		},
 		data() {
 			return {
-				submitParam: {
-					date: [],
-					type: 1,
+				orderNo: '',
+				pageLoading: true,
+				queryOption: {
+					billCode: '', // 运单id
+					orderSn: '', // 订单id
 				},
-				
-				yundanList: [
-					{ val: 'T7080304037' },{ val: 'T708012124037' },{ val: 'T7080304092' }
-				]
+				resData: {
+					list: []
+				}
 			}
 		},
 		onShareAppMessage() {
 			return {
-				// title: '',
-				// path: 'TODO'
 			}
 		},
-		onLoad() {
+		onLoad(option) {
+			this.queryOption = option
 			this.initData();
 		},
 		onUnload() {
 
 		},
 		methods: {
-			getCdnUrl,
 
 			initData() {
-				// uni.showLoading({
-				// 	title: '加载中'
-				// });
+				this.orderNo = this.queryOption.billCode || this.queryOption.orderSn
 			},
 			handleSubmit() {
 
-			}
+			},
+			handleScanValChange: debounce(function(val){
+				val
+			}),
 		}
 	}
 </script>