From 4f60fd22f4a3099b2181bc334efa1f5912ab7eff Mon Sep 17 00:00:00 2001
From: aihe <961836564@qq.com>
Date: Thu, 30 May 2024 18:19:13 +0800
Subject: [PATCH] uu

---
 .../deliveryDeal/problemsRegisteScanning.vue  |   7 +-
 pages/deliveryDeal/scanUtil.js                |   3 +
 pages/deliveryDeal/signedScanning.vue         |   9 +-
 pages/deliveryDeal/stayScanning.vue           | 105 +++++++-------
 pages/deliveryDeal/translateScanning.vue      | 133 +++++++++---------
 pages/tms/allCartScanning.vue                 |   4 +-
 pages/tms/customsClearanceScanning.vue        |   4 +-
 pages/tms/customsDeclarationScanning.vue      |   4 +-
 pages/tms/unpackingScanning.vue               |   4 +-
 pages/tms/untruckingScanning.vue              |   4 +-
 10 files changed, 137 insertions(+), 140 deletions(-)

diff --git a/pages/deliveryDeal/problemsRegisteScanning.vue b/pages/deliveryDeal/problemsRegisteScanning.vue
index 496b4a6..7ac2f2b 100644
--- a/pages/deliveryDeal/problemsRegisteScanning.vue
+++ b/pages/deliveryDeal/problemsRegisteScanning.vue
@@ -104,11 +104,14 @@
 				params.filePath = params.filePath?.join?.(",") || ''
 				await apiService.registerProblemInfo({ ...params, _loading: true })
 				this.showToast('操作成功')
+				this.resetForm()
+				// this.goBack()
+			},
+			resetForm() {
 				this.submitParam.billCode = ''
 				this.submitParam.sendSiteCode = ''
 				this.submitParam.filePath = ''
-				// this.goBack()
-			}
+			},
 		}
 	}
 </script>
diff --git a/pages/deliveryDeal/scanUtil.js b/pages/deliveryDeal/scanUtil.js
index 2035b3b..f138e0f 100644
--- a/pages/deliveryDeal/scanUtil.js
+++ b/pages/deliveryDeal/scanUtil.js
@@ -7,6 +7,9 @@ export const scanTypeEnum = {
 	daoJian: 30, // 到件
 	paiJian: 40, // 派件
 	qianShou: 50, // 签收
+	
+	liuCang: 70, // 签收
+	zhuanJian: 80, // 转件
 }
 
 export const getScanParams = (type, model = {})=> {
diff --git a/pages/deliveryDeal/signedScanning.vue b/pages/deliveryDeal/signedScanning.vue
index acec1e6..a06e015 100644
--- a/pages/deliveryDeal/signedScanning.vue
+++ b/pages/deliveryDeal/signedScanning.vue
@@ -46,7 +46,6 @@
 </template>
 
 <script>
-	import BoOperatorTmp from "@/components/buns-order-templates/bo-operator-tmp"
 	import BpeGoodphotoTmp from "@/components/buns-post-edit-templates/bpe-goodphoto-tmp"
 	import { debounce } from "@/common/util"
 	import dayjs from "dayjs"
@@ -54,7 +53,7 @@
 	import { scanTypeEnum, getScanParams, ansScanResponse } from "./scanUtil"
 	
 	export default {
-		components:{ BoOperatorTmp, BpeGoodphotoTmp },
+		components:{ BpeGoodphotoTmp },
 		props: {
 		},
 		computed: {
@@ -71,7 +70,7 @@
 				submitParam: {
 					billCode: "",
 					signMan: "",
-					picUrl: [],
+					picUrl: '',
 					remark: "",
 					scanDate: ""
 				},
@@ -97,7 +96,7 @@
 				
 			}),
 			async handleSubmit() {
-				this.submitParam.picUrl = this.submitParam.picUrl.join(",")
+				this.submitParam.picUrl = this.submitParam.picUrl?.join?.(",") || ''
 				let scnParam = getScanParams(scanTypeEnum.qianShou, { ...this.submitParam })
 				let res = await apiService.scanRecord({...scnParam, _loading: true})
 				let { bl, resItem } = ansScanResponse({ res, title: "签收" })
@@ -107,7 +106,7 @@
 			},
 			resetForm() {
 				this.submitParam = {
-					picUrl: []
+					picUrl: ''
 				}
 			}
 		}
diff --git a/pages/deliveryDeal/stayScanning.vue b/pages/deliveryDeal/stayScanning.vue
index 05ae357..6fdb908 100644
--- a/pages/deliveryDeal/stayScanning.vue
+++ b/pages/deliveryDeal/stayScanning.vue
@@ -1,57 +1,48 @@
 <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="submitParam.billCode" placeholder="请输入运单号或扫码"
+								iconPos="left"></tpx-scan-input>
+						</view>
+					</u-row>
+					<view class="mt-20">
+						<bpe-goodphoto-tmp title="留仓拍照" :value="submitParam" filedName="picUrl"></bpe-goodphoto-tmp>
+					</view>
+					<view class="mt-10">
+						<u-textarea v-model="submitParam.remark" border="surround" height="120" placeholder="留仓原因"
+							maxlength="50" count></u-textarea>
 					</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>
+			</template>
+			<template v-slot:footer>
+				<view class="pos-rlt blcok-white" style="border-radius: 0;margin-top: 0;">
+					<u-row>
+						<u-button @click="handleSubmit" size="large" shape="circle" 
+							custom-style="width: 500rpx;height:80rpx;font-size: 30rpx;" type="primary">确认留仓</u-button>
+					</u-row>
 				</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>
+		</tpx-layout>
+	</tpx-page>
+	
 </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 * as apiService from "@/common/api"
 	import BpeGoodphotoTmp from "@/components/buns-post-edit-templates/bpe-goodphoto-tmp"
+	import { scanTypeEnum, getScanParams, ansScanResponse } from "./scanUtil"
+	
 	import {
 		goto
 	} from "@/common/untool"
 	export default {
-		components:{ BoOperatorTmp, BpeGoodphotoTmp },
+		components:{ BpeGoodphotoTmp },
 		props: {
-			// hasLeftWin: {
-			// 	type: Boolean
-			// }
 		},
 		computed: {
 			
@@ -59,19 +50,16 @@
 		data() {
 			return {
 				submitParam: {
-					date: [],
-					type: 1,
+					billCode: '',
+					picUrl: '',
+					remark: ''
 				},
 				
-				yundanList: [
-					{ val: 'T7080304037' },{ val: 'T708012124037' },{ val: 'T7080304092' }
-				]
 			}
 		},
 		onShareAppMessage() {
 			return {
-				// title: '',
-				// path: 'TODO'
+				
 			}
 		},
 		onLoad() {
@@ -81,15 +69,22 @@
 
 		},
 		methods: {
-			getCdnUrl,
-
 			initData() {
-				// uni.showLoading({
-				// 	title: '加载中'
-				// });
+				
 			},
-			handleSubmit() {
-
+			async handleSubmit() {
+				this.submitParam.picUrl = this.submitParam.picUrl?.join?.(",") || ''
+				let scnParam = getScanParams(scanTypeEnum.liuCang, { ...this.submitParam })
+				let res = await apiService.scanRecord({...scnParam, _loading: true})
+				let { bl, resItem } = ansScanResponse({ res, title: "留仓" })
+				if(bl) {
+					this.resetForm()
+				}
+			},
+			resetForm() {
+				this.submitParam = {
+					picUrl: []
+				}
 			}
 		}
 	}
diff --git a/pages/deliveryDeal/translateScanning.vue b/pages/deliveryDeal/translateScanning.vue
index c3e7e21..0cf39c5 100644
--- a/pages/deliveryDeal/translateScanning.vue
+++ b/pages/deliveryDeal/translateScanning.vue
@@ -1,84 +1,76 @@
 <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="submitParam.billCode" placeholder="请输入运单号或扫码"
+								iconPos="left"></tpx-scan-input>
+						</view>
+					</u-row>
+					<u-row custom-style="margin-top:40rpx;">
+						<view style="flex: 1;">
+							<tpx-select v-model:value="submitParam.transferCode" :list="dicData.emis_express_code"
+								mode="drop" isWhite="true" placeholder="请选择同行快递"
+							>
+							</tpx-select>
+						</view>
+					</u-row>
+					<u-row custom-style="margin-top:20rpx;">
+						<view style="flex:1;">
+							<tpx-scan-input v-model:value="submitParam.transferBillcode" placeholder="请输入同行单号或扫码"
+								iconPos="left"></tpx-scan-input>
+						</view>
+					</u-row>
+					<view class="mt-20">
+						<tpx-input v-model:value="submitParam.destCity" placeholder="目的城市" :isWhite="true"></tpx-input>
 					</view>
-				</u-row>
-				<u-row custom-style="margin-top:40rpx;">
-					<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-scan-input v-model:value="submitParam.yundanhao" placeholder="请输入同行单号或扫码"
-							iconPos="left"></tpx-scan-input>
-					</view>
-				</u-row>
-				<view class="mt-20">
-					<tpx-input placeholder="目的城市" :isWhite="true"></tpx-input>
 				</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>
+			<template v-slot:footer>
+				<view class="pos-rlt blcok-white" style="border-radius: 0;margin-top: 0;">
+					<u-row>
+						<u-button @click="handleSubmit" size="large" shape="circle"
+							custom-style="width: 500rpx;height:80rpx;font-size: 30rpx;" type="primary">确认转单</u-button>
+					</u-row>
+				</view>
+			</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 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"
+	
+	import * as apiService from "@/common/api"
+	import { scanTypeEnum, getScanParams, ansScanResponse } from "./scanUtil"
+
 	export default {
-		components:{ BoOperatorTmp, BpeGoodphotoTmp },
+		components:{  },
 		props: {
-			// hasLeftWin: {
-			// 	type: Boolean
-			// }
+		
 		},
 		computed: {
-			
+			dicData() {
+			  return this.$store.getters.dicData
+			},
 		},
 		data() {
 			return {
 				submitParam: {
-					date: [],
-					type: 1,
+					billCode: '',
+					transferCode: '', // 转单同行快递代码
+					transferBillcode: '', // 转单同行单号
+					destCity: '', // 目的城市
 				},
 				
-				yundanList: [
-					{ val: 'T7080304037' },{ val: 'T708012124037' },{ val: 'T7080304092' }
-				]
 			}
 		},
 		onShareAppMessage() {
 			return {
-				// title: '',
-				// path: 'TODO'
+				
 			}
 		},
 		onLoad() {
@@ -88,15 +80,20 @@
 
 		},
 		methods: {
-			getCdnUrl,
-
 			initData() {
-				// uni.showLoading({
-				// 	title: '加载中'
-				// });
+				
 			},
-			handleSubmit() {
-
+			async handleSubmit() {
+				let scnParam = getScanParams(scanTypeEnum.zhuanJian, { ...this.submitParam })
+				let res = await apiService.scanRecord({...scnParam, _loading: true})
+				let { bl, resItem } = ansScanResponse({ res, title: "转件" })
+				if(bl) {
+					this.resetForm()
+				}
+			},
+			resetForm() {
+				this.submitParam.billCode = ''
+				this.submitParam.transferBillcode = ''
 			}
 		}
 	}
diff --git a/pages/tms/allCartScanning.vue b/pages/tms/allCartScanning.vue
index 00024f5..30a5fbd 100644
--- a/pages/tms/allCartScanning.vue
+++ b/pages/tms/allCartScanning.vue
@@ -70,13 +70,13 @@
 		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 },
+		components:{ BpeGoodphotoTmp },
 		props: {
 			// hasLeftWin: {
 			// 	type: Boolean
diff --git a/pages/tms/customsClearanceScanning.vue b/pages/tms/customsClearanceScanning.vue
index aded550..50ac608 100644
--- a/pages/tms/customsClearanceScanning.vue
+++ b/pages/tms/customsClearanceScanning.vue
@@ -103,13 +103,13 @@
 		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 },
+		components:{ BpeGoodphotoTmp },
 		props: {
 			// hasLeftWin: {
 			// 	type: Boolean
diff --git a/pages/tms/customsDeclarationScanning.vue b/pages/tms/customsDeclarationScanning.vue
index 4790258..abadcf5 100644
--- a/pages/tms/customsDeclarationScanning.vue
+++ b/pages/tms/customsDeclarationScanning.vue
@@ -103,13 +103,13 @@
 		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 },
+		components:{ BpeGoodphotoTmp },
 		props: {
 			// hasLeftWin: {
 			// 	type: Boolean
diff --git a/pages/tms/unpackingScanning.vue b/pages/tms/unpackingScanning.vue
index ae5ecb3..035dad7 100644
--- a/pages/tms/unpackingScanning.vue
+++ b/pages/tms/unpackingScanning.vue
@@ -63,13 +63,13 @@
 		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 },
+		components:{ BpeGoodphotoTmp },
 		props: {
 			// hasLeftWin: {
 			// 	type: Boolean
diff --git a/pages/tms/untruckingScanning.vue b/pages/tms/untruckingScanning.vue
index a01cc47..86dada3 100644
--- a/pages/tms/untruckingScanning.vue
+++ b/pages/tms/untruckingScanning.vue
@@ -75,13 +75,13 @@
 		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 },
+		components:{ BpeGoodphotoTmp },
 		props: {
 			// hasLeftWin: {
 			// 	type: Boolean