From 684a505caa6aadc49822b6d53f1bbce1ef549b22 Mon Sep 17 00:00:00 2001
From: aihe <961836564@qq.com>
Date: Thu, 1 Feb 2024 20:34:03 +0800
Subject: [PATCH] uu

---
 .../buns-order-templates/bo-operator-tmp.vue  |  18 +--
 pages.json                                    |  24 +++
 pages/deliveryDeal/arriveDeliveryScanning.vue | 152 ++++++++++++++++++
 pages/deliveryDeal/arriveScanning.vue         | 142 ++++++++++++++++
 pages/deliveryDeal/deliveryScanning.vue       | 152 ++++++++++++++++++
 pages/deliveryDeal/distributeOutgoing.vue     |  40 ++++-
 pages/deliveryDeal/signedScanning.vue         | 117 ++++++++++++++
 pages/tabBar/deal/deal.vue                    |   8 +-
 8 files changed, 635 insertions(+), 18 deletions(-)
 create mode 100644 pages/deliveryDeal/arriveDeliveryScanning.vue
 create mode 100644 pages/deliveryDeal/arriveScanning.vue
 create mode 100644 pages/deliveryDeal/deliveryScanning.vue
 create mode 100644 pages/deliveryDeal/signedScanning.vue

diff --git a/components/buns-order-templates/bo-operator-tmp.vue b/components/buns-order-templates/bo-operator-tmp.vue
index 332a8ea..a94763a 100644
--- a/components/buns-order-templates/bo-operator-tmp.vue
+++ b/components/buns-order-templates/bo-operator-tmp.vue
@@ -9,15 +9,15 @@
 				<slot name="titleRight"></slot>
 			</view>
 		</u-row>
-		<u-row justify="between" custom-style="margin-top: 40rpx;">
-			<u-row justify="center">
-				<view class="clr-prm font-30">2129</view>
-				<view class="mt-30 clr-sub font-28">总件数</view>
-			</u-row>
-			<u-row justify="center">
-				<view class="clr-prm font-30">2129</view>
-				<view class="mt-30 clr-sub font-28">总重量(KG)</view>
-			</u-row>
+		<u-row justify="between" custom-style="margin-top: 20rpx;">
+			<u-col span="6" align="center">
+				<view class="clr-prm font-34 font-weight">2129</view>
+				<view class="mt-20 clr-sub font-28">总件数</view>
+			</u-col>
+			<u-col span="6" align="center">
+				<view class="clr-prm font-34 font-weight">2129</view>
+				<view class="mt-20 clr-sub font-28">总重量(KG)</view>
+			</u-col>
 		</u-row>
 	</view>
 </template>
diff --git a/pages.json b/pages.json
index b81dd6c..ecbf4fa 100644
--- a/pages.json
+++ b/pages.json
@@ -171,6 +171,30 @@
 				"navigationBarTitleText": "分拨发件"
 			}
 		},
+		{
+			"path": "pages/deliveryDeal/arriveScanning",
+			"style": {
+				"navigationBarTitleText": "到件扫描"
+			}
+		},
+		{
+			"path": "pages/deliveryDeal/deliveryScanning",
+			"style": {
+				"navigationBarTitleText": "派件扫描"
+			}
+		},
+		{
+			"path": "pages/deliveryDeal/arriveDeliveryScanning",
+			"style": {
+				"navigationBarTitleText": "到派扫描"
+			}
+		},
+		{
+			"path": "pages/deliveryDeal/signedScanning",
+			"style": {
+				"navigationBarTitleText": "签收扫描"
+			}
+		},
 		{
 			"path": "pages/warehousing/detail",
 			"style": {
diff --git a/pages/deliveryDeal/arriveDeliveryScanning.vue b/pages/deliveryDeal/arriveDeliveryScanning.vue
new file mode 100644
index 0000000..a5daa81
--- /dev/null
+++ b/pages/deliveryDeal/arriveDeliveryScanning.vue
@@ -0,0 +1,152 @@
+<template>
+	<tpx-layout>
+		<template v-slot:body>
+			<u-line></u-line>
+			<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>
+					</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-20 clr-sub">
+					当前件: 重量 <text class="clr-prm pr-40">1.2KG</text> 体积: <text class="clr-prm">0.1m³</text>
+				</view>
+				
+				<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>
+			</view>
+			
+		</template>
+		<template v-slot:footer>
+		</template>
+	</tpx-layout>
+</template>
+
+<script>
+	import getCdnUrl from "@/common/getCdnUrl"
+	import {
+		ordStaEnum,
+		ordStatusList,
+		payTypeEnum,
+		payTypeList,
+		dlvTypeEnum,
+		dlvTypeList,
+		dateTypeEnum,
+		dateTypeList
+	} from "@/common/enum"
+	import BoOperatorTmp from "@/components/buns-order-templates/bo-operator-tmp"
+	import {
+		goto
+	} from "@/common/untool"
+	export default {
+		components:{ BoOperatorTmp },
+		props: {
+			// hasLeftWin: {
+			// 	type: Boolean
+			// }
+		},
+		computed: {
+			
+		},
+		data() {
+			return {
+				submitParam: {
+					date: [],
+					type: 1,
+				},
+				
+				yundanList: [
+					{ val: 'T7080304037' },{ val: 'T708012124037' },{ val: 'T7080304092' }
+				]
+			}
+		},
+		onShareAppMessage() {
+			return {
+				// title: '',
+				// path: 'TODO'
+			}
+		},
+		onLoad() {
+			this.initData();
+		},
+		onUnload() {
+
+		},
+		methods: {
+			getCdnUrl,
+
+			initData() {
+				// uni.showLoading({
+				// 	title: '加载中'
+				// });
+			},
+			handleSubmit() {
+
+			}
+		}
+	}
+</script>
+
+<style lang="scss">
+	@import '@/common/uni-nvue.scss';
+
+	page {
+		background-color: #F6F6F6;
+		height: 100% !important;
+	}
+</style>
+<style scoped lang="scss">
+	.yditem{
+		padding: 20rpx 0;
+		border-top: 2px solid #F6F6F6;
+	}
+</style>
\ No newline at end of file
diff --git a/pages/deliveryDeal/arriveScanning.vue b/pages/deliveryDeal/arriveScanning.vue
new file mode 100644
index 0000000..37ab273
--- /dev/null
+++ b/pages/deliveryDeal/arriveScanning.vue
@@ -0,0 +1,142 @@
+<template>
+	<tpx-layout>
+		<template v-slot:body>
+			<u-line></u-line>
+			<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>
+					</view>
+					<view style="">
+						<u-button type="primary" custom-style="width: 140rpx;margin-left: 20rpx;height: 68rpx;">确定</u-button>
+					</view>
+				</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 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>
+			</view>
+			
+		</template>
+		<template v-slot:footer>
+		</template>
+	</tpx-layout>
+</template>
+
+<script>
+	import getCdnUrl from "@/common/getCdnUrl"
+	import {
+		ordStaEnum,
+		ordStatusList,
+		payTypeEnum,
+		payTypeList,
+		dlvTypeEnum,
+		dlvTypeList,
+		dateTypeEnum,
+		dateTypeList
+	} from "@/common/enum"
+	import BoOperatorTmp from "@/components/buns-order-templates/bo-operator-tmp"
+	import {
+		goto
+	} from "@/common/untool"
+	export default {
+		components:{ BoOperatorTmp },
+		props: {
+			// hasLeftWin: {
+			// 	type: Boolean
+			// }
+		},
+		computed: {
+			
+		},
+		data() {
+			return {
+				submitParam: {
+					date: [],
+					type: 1,
+				},
+				
+				yundanList: [
+					{ val: 'T7080304037' },{ val: 'T708012124037' },{ val: 'T7080304092' }
+				]
+			}
+		},
+		onShareAppMessage() {
+			return {
+				// title: '',
+				// path: 'TODO'
+			}
+		},
+		onLoad() {
+			this.initData();
+		},
+		onUnload() {
+
+		},
+		methods: {
+			getCdnUrl,
+
+			initData() {
+				// uni.showLoading({
+				// 	title: '加载中'
+				// });
+			},
+			handleSubmit() {
+
+			}
+		}
+	}
+</script>
+
+<style lang="scss">
+	@import '@/common/uni-nvue.scss';
+
+	page {
+		background-color: #F6F6F6;
+		height: 100% !important;
+	}
+</style>
+<style scoped lang="scss">
+	.yditem{
+		padding: 20rpx 0;
+		border-top: 2px solid #F6F6F6;
+	}
+</style>
\ No newline at end of file
diff --git a/pages/deliveryDeal/deliveryScanning.vue b/pages/deliveryDeal/deliveryScanning.vue
new file mode 100644
index 0000000..a5daa81
--- /dev/null
+++ b/pages/deliveryDeal/deliveryScanning.vue
@@ -0,0 +1,152 @@
+<template>
+	<tpx-layout>
+		<template v-slot:body>
+			<u-line></u-line>
+			<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>
+					</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-20 clr-sub">
+					当前件: 重量 <text class="clr-prm pr-40">1.2KG</text> 体积: <text class="clr-prm">0.1m³</text>
+				</view>
+				
+				<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>
+			</view>
+			
+		</template>
+		<template v-slot:footer>
+		</template>
+	</tpx-layout>
+</template>
+
+<script>
+	import getCdnUrl from "@/common/getCdnUrl"
+	import {
+		ordStaEnum,
+		ordStatusList,
+		payTypeEnum,
+		payTypeList,
+		dlvTypeEnum,
+		dlvTypeList,
+		dateTypeEnum,
+		dateTypeList
+	} from "@/common/enum"
+	import BoOperatorTmp from "@/components/buns-order-templates/bo-operator-tmp"
+	import {
+		goto
+	} from "@/common/untool"
+	export default {
+		components:{ BoOperatorTmp },
+		props: {
+			// hasLeftWin: {
+			// 	type: Boolean
+			// }
+		},
+		computed: {
+			
+		},
+		data() {
+			return {
+				submitParam: {
+					date: [],
+					type: 1,
+				},
+				
+				yundanList: [
+					{ val: 'T7080304037' },{ val: 'T708012124037' },{ val: 'T7080304092' }
+				]
+			}
+		},
+		onShareAppMessage() {
+			return {
+				// title: '',
+				// path: 'TODO'
+			}
+		},
+		onLoad() {
+			this.initData();
+		},
+		onUnload() {
+
+		},
+		methods: {
+			getCdnUrl,
+
+			initData() {
+				// uni.showLoading({
+				// 	title: '加载中'
+				// });
+			},
+			handleSubmit() {
+
+			}
+		}
+	}
+</script>
+
+<style lang="scss">
+	@import '@/common/uni-nvue.scss';
+
+	page {
+		background-color: #F6F6F6;
+		height: 100% !important;
+	}
+</style>
+<style scoped lang="scss">
+	.yditem{
+		padding: 20rpx 0;
+		border-top: 2px solid #F6F6F6;
+	}
+</style>
\ No newline at end of file
diff --git a/pages/deliveryDeal/distributeOutgoing.vue b/pages/deliveryDeal/distributeOutgoing.vue
index 937777e..c7a3ab0 100644
--- a/pages/deliveryDeal/distributeOutgoing.vue
+++ b/pages/deliveryDeal/distributeOutgoing.vue
@@ -9,17 +9,41 @@
 							iconPos="left"></tpx-scan-input>
 					</view>
 				</u-row>
-				<u-row justify="between" custom-style="margin-top:20rpx;">
-					<tpx-select placeholder="下一网点"></tpx-select>
+				<u-row custom-style="margin-top:20rpx;">
+					<view style="flex: 1;">
+						<tpx-select placeholder="下一网点" :isWhite="true"></tpx-select>
+					</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>
+						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="mt-40 pl-20 pr-20">
+				<tpx-tabs :list="tabList" v-model:value="tabType"
+					@tabchange="(val)=> {  }" v-slot="curTab"
+				>
+					<text slot>
+						(<text>{{curTab.item.val}}</text>)
+					</text>
+				</tpx-tabs>
+			</view>
 			<view class="blcok-white-noradius">
 				<!-- <u-row justify="between">
 					<text class="font-weight">运单列表</text>
@@ -35,7 +59,7 @@
 								<text class="font-weight">运单号</text>
 							</u-col>
 							<u-col span="4">
-								<text class="font-weight">到件时间</text>
+								<text class="font-weight">扫描时间</text>
 							</u-col>
 						</u-row>
 					</view>
@@ -70,10 +94,12 @@
 		dateTypeEnum,
 		dateTypeList
 	} from "@/common/enum"
+	import BoOperatorTmp from "@/components/buns-order-templates/bo-operator-tmp"
 	import {
 		goto
 	} from "@/common/untool"
 	export default {
+		components:{ BoOperatorTmp },
 		props: {
 			// hasLeftWin: {
 			// 	type: Boolean
@@ -88,9 +114,13 @@
 					date: [],
 					type: 1,
 				},
-				
 				yundanList: [
 					{ val: 'T7080304037' },{ val: 'T708012124037' },{ val: 'T7080304092' }
+				],
+				tabType: 1,
+				tabList: [
+					{ title: '已扫描', val: 1 },
+					{ title: '待扫描', val: 2 }
 				]
 			}
 		},
diff --git a/pages/deliveryDeal/signedScanning.vue b/pages/deliveryDeal/signedScanning.vue
new file mode 100644
index 0000000..4d539cd
--- /dev/null
+++ b/pages/deliveryDeal/signedScanning.vue
@@ -0,0 +1,117 @@
+<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>
+					</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-20">
+					<bpe-goodphoto-tmp title="签收拍照" :value="submitParam" filedName="phName"></bpe-goodphoto-tmp>
+				</view>
+				<view class="mt-10">
+					<u-textarea v-model="submitParam.otherDes" border="surround" height="120" placeholder="备注"
+						maxlength="50" count></u-textarea>
+				</view>
+			</view>
+		</template>
+		<template v-slot:footer>
+			<view class="pos-rlt blcok-white" style="border-radius: 0;margin-top: 0;">
+				<u-row>
+					<u-button size="large" shape="circle"
+						custom-style="width: 500rpx;height:80rpx;font-size: 30rpx;" type="primary">确认签收</u-button>
+				</u-row>
+			</view>
+		</template>
+	</tpx-layout>
+</template>
+
+<script>
+	import getCdnUrl from "@/common/getCdnUrl"
+	import {
+		ordStaEnum,
+		ordStatusList,
+		payTypeEnum,
+		payTypeList,
+		dlvTypeEnum,
+		dlvTypeList,
+		dateTypeEnum,
+		dateTypeList
+	} from "@/common/enum"
+	import BoOperatorTmp from "@/components/buns-order-templates/bo-operator-tmp"
+	import BpeGoodphotoTmp from "@/components/buns-post-edit-templates/bpe-goodphoto-tmp"
+	import {
+		goto
+	} from "@/common/untool"
+	export default {
+		components:{ BoOperatorTmp, BpeGoodphotoTmp },
+		props: {
+			// hasLeftWin: {
+			// 	type: Boolean
+			// }
+		},
+		computed: {
+			
+		},
+		data() {
+			return {
+				submitParam: {
+					date: [],
+					type: 1,
+				},
+				
+				yundanList: [
+					{ val: 'T7080304037' },{ val: 'T708012124037' },{ val: 'T7080304092' }
+				]
+			}
+		},
+		onShareAppMessage() {
+			return {
+				// title: '',
+				// path: 'TODO'
+			}
+		},
+		onLoad() {
+			this.initData();
+		},
+		onUnload() {
+
+		},
+		methods: {
+			getCdnUrl,
+
+			initData() {
+				// uni.showLoading({
+				// 	title: '加载中'
+				// });
+			},
+			handleSubmit() {
+
+			}
+		}
+	}
+</script>
+
+<style lang="scss">
+	@import '@/common/uni-nvue.scss';
+
+	page {
+		background-color: #F6F6F6;
+		height: 100% !important;
+	}
+</style>
+<style scoped lang="scss">
+	.yditem{
+		padding: 20rpx 0;
+		border-top: 2px solid #F6F6F6;
+	}
+</style>
\ No newline at end of file
diff --git a/pages/tabBar/deal/deal.vue b/pages/tabBar/deal/deal.vue
index ef0fde4..987be7a 100644
--- a/pages/tabBar/deal/deal.vue
+++ b/pages/tabBar/deal/deal.vue
@@ -74,10 +74,10 @@
 					{  title: '面单补打', subTitle: "", icon: getCdnUrl(`home/mdbuda.png`), url: '' }
 				], 
 				daoBtnlist: [
-					{  title: '到件扫描', subTitle: "", icon: getCdnUrl(`home/daohsm.png`), url: '' },
-					{  title: '派件扫描', subTitle: "", icon: getCdnUrl(`home/paijsm.png`), url: '' },
-					{  title: '签收扫描', subTitle: "", icon: getCdnUrl(`home/qianshsm.png`), url: '' },
-					{  title: '到派扫描', subTitle: "", icon: getCdnUrl(`home/daojsm.png`), url: '' },
+					{  title: '到件扫描', subTitle: "", icon: getCdnUrl(`home/daohsm.png`), url: 'deliveryDeal/arriveScanning' },
+					{  title: '派件扫描', subTitle: "", icon: getCdnUrl(`home/paijsm.png`), url: 'deliveryDeal/deliveryScanning' },
+					{  title: '签收扫描', subTitle: "", icon: getCdnUrl(`home/qianshsm.png`), url: 'deliveryDeal/signedScanning' },
+					{  title: '到派扫描', subTitle: "", icon: getCdnUrl(`home/daojsm.png`), url: 'deliveryDeal/arriveDeliveryScanning' },
 					{  title: '卸车扫描', subTitle: "", icon: getCdnUrl(`home/xiechesm.png`), url: '' },
 					{  title: '到件清单', subTitle: "", icon: getCdnUrl(`home/daojqd.png`), url: 'deliveryDeal/arriveList' },
 					{  title: '派件清单', subTitle: "", icon: getCdnUrl(`home/paijqd.png`), url: 'deliveryDeal/paiList' },