From 250773872ae0f2dbc8c1880ace67f2ecaf6f833a Mon Sep 17 00:00:00 2001
From: aihe <961836564@qq.com>
Date: Fri, 28 Jun 2024 16:44:23 +0800
Subject: [PATCH] uu

---
 common/enum.js                 |   1 +
 common/scanUtil.js             |   1 +
 pages.json                     |   6 ++
 pages/tabBar/deal/deal.vue     |   1 +
 pages/tms/takeGoodScanning.vue | 133 +++++++++++++++++++++++++++++++++
 5 files changed, 142 insertions(+)
 create mode 100644 pages/tms/takeGoodScanning.vue

diff --git a/common/enum.js b/common/enum.js
index 1ea8758..bbdf662 100644
--- a/common/enum.js
+++ b/common/enum.js
@@ -65,6 +65,7 @@ const dealBtnMap = {
 	zhuangCheScan: {  title: '装车扫描', subTitle: "", icon: getCdnUrl(`home/zhuangchesm.png`), url: 'tms/entruckingScanning', code: authCodeEnum.zhuangCheScan },
 	zhengCheScan: {  title: '整车扫描', subTitle: "", icon: getCdnUrl(`home/zhuangchesm.png`), url: 'tms/allCartScanning', code: authCodeEnum.zhengCheScan },
 	xieCheScan: {  title: '卸车扫描', subTitle: "", icon: getCdnUrl(`home/xiechesm.png`), url: 'tms/untruckingScanning', code: authCodeEnum.xieCheScan },
+	tihuoScan: {  title: '提货扫描', subTitle: "", icon: getCdnUrl(`home/xiechesm.png`), url: 'tms/takeGoodScanning' },
 	daoJianQingDan: {  title: '到件清单', subTitle: "", icon: getCdnUrl(`home/daojqd.png`), url: 'deliveryDeal/arriveList', code: authCodeEnum.daoJianQingDan },
 	paiJianQingDan: {  title: '派件清单', subTitle: "", icon: getCdnUrl(`home/paijqd.png`), url: 'deliveryDeal/paiList', code: authCodeEnum.paiJianQingDan },
 	liuCangScan: {  title: '留仓扫描', subTitle: "", icon: getCdnUrl(`home/licsm.png`), url: 'deliveryDeal/stayScanning', code: authCodeEnum.liuCangScan },
diff --git a/common/scanUtil.js b/common/scanUtil.js
index 8580b85..2658df5 100644
--- a/common/scanUtil.js
+++ b/common/scanUtil.js
@@ -9,6 +9,7 @@ export const scanTypeEnum = {
 	daoJian: 30, // 到件
 	paiJian: 40, // 派件
 	qianShou: 50, // 签收
+	tiHuo: 90, // 提货
 	zhuangChe: 301, // 装车、装柜、整车
 	xieChe: 302, // 卸车
 	liuCang: 70, // 留仓
diff --git a/pages.json b/pages.json
index ce14d75..00d6a9c 100644
--- a/pages.json
+++ b/pages.json
@@ -250,6 +250,12 @@
 				"navigationBarTitleText": "卸车扫描"
 			}
 		},
+		{
+			"path": "pages/tms/takeGoodScanning",
+			"style": {
+				"navigationBarTitleText": "提货扫描"
+			}
+		},
 		{
 			"path": "pages/tms/allCartScanning",
 			"style": {
diff --git a/pages/tabBar/deal/deal.vue b/pages/tabBar/deal/deal.vue
index 19488ab..dbd80eb 100644
--- a/pages/tabBar/deal/deal.vue
+++ b/pages/tabBar/deal/deal.vue
@@ -91,6 +91,7 @@
 					{ ...dealBtnMap.qianShouScan },
 					{ ...dealBtnMap.daoPaiScan },
 					{ ...dealBtnMap.xieCheScan },
+					{ ...dealBtnMap.tihuoScan },
 					{ ...dealBtnMap.daoJianQingDan },
 					{ ...dealBtnMap.paiJianQingDan },
 					{ ...dealBtnMap.liuCangScan },
diff --git a/pages/tms/takeGoodScanning.vue b/pages/tms/takeGoodScanning.vue
new file mode 100644
index 0000000..0f74c20
--- /dev/null
+++ b/pages/tms/takeGoodScanning.vue
@@ -0,0 +1,133 @@
+<template>
+	<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="请输入或扫码"
+								@change="handleScanValChange" iconPos="left"></tpx-scan-input>
+						</view>
+					</u-row>
+					<u-row custom-style="margin-top:20rpx;">
+						<view style="flex: 1;">
+							<u-input placeholder="提货人" v-model="submitParam.pickMan" font-size="26"
+								custom-style="border-radius: 10rpx;padding: 10rpx 20rpx;" 
+								placeholder-style="color: #999; " 
+							></u-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>
+				</view>
+			</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 BpeGoodphotoTmp from "@/components/buns-post-edit-templates/bpe-goodphoto-tmp"
+	import { debounce } from "@/common/util"
+	import dayjs from "dayjs"
+	import * as apiService from "@/common/api"
+	import { scanTypeEnum, getScanParams, ansScanResponse, preCheckScan } from "@/common/scanUtil"
+	import { checkParams } from "@/common/validate"
+	
+	export default {
+		components:{ BpeGoodphotoTmp },
+		props: {
+		},
+		computed: {
+			dicData() {
+			  return this.$store.getters.dicData
+			},
+		},
+		data() {
+			return {
+				queryOption: {
+					billCode: '', // 运单id
+					orderSn: '', // 订单id
+				},
+				submitParam: {
+					billCode: "",
+					pickMan: "",
+					picUrl: '',
+					remark: "",
+				},
+				submitValidConfig: {
+					pickMan: { required: true, requiredMsg: '提货人不能为空' },
+					billCode: { required: true, requiredMsg: '运单号不能为空' },
+				},
+				paiRes: { list: [] },
+			}
+		},
+		onShareAppMessage() {
+			return {
+			}
+		},
+		onLoad(option) {
+			this.queryOption = option
+			this.initData();
+		},
+		onUnload() {
+
+		},
+		methods: {
+			getRSDStaffList: apiService.getRSDStaffList,
+			initData() {
+				this.submitParam.billCode = this.queryOption.billCode
+			},
+			handleScanValChange: debounce(async function(val){
+				if(val) {
+					let preBl = await preCheckScan({ scanType: scanTypeEnum.tiHuo, param: { ...this.submitParam, billCode: val } })
+				}
+			}),
+			async handleSubmit() {
+				await checkParams(this.submitParam, this.submitValidConfig)
+				this.submitParam.picUrl = this.submitParam.picUrl?.join?.(",") || ''
+				let scnParam = getScanParams(scanTypeEnum.tiHuo, { ...this.submitParam })
+				let res = await apiService.scanRecord({...scnParam, _loading: true})
+				let { bl, resItem } = ansScanResponse({ res, title: "提货" })
+				if(bl) {
+					this.resetForm()
+				}
+			},
+			resetForm() {
+				this.submitParam = {
+					picUrl: ''
+				}
+			}
+		}
+	}
+</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