From 224449d74d1f928d2e994ee6a829abe665202e7a Mon Sep 17 00:00:00 2001
From: aihe <961836564@qq.com>
Date: Wed, 8 May 2024 12:16:29 +0800
Subject: [PATCH] uu

---
 common/api/order.js                     |  4 +++
 common/api/url.js                       |  2 ++
 pages/deliveryDeal/qutgoingScanning.vue | 47 +++++++++++++++++++------
 pages/post/openorder.vue                | 18 +++++-----
 4 files changed, 51 insertions(+), 20 deletions(-)

diff --git a/common/api/order.js b/common/api/order.js
index b51b03b..bbcc760 100644
--- a/common/api/order.js
+++ b/common/api/order.js
@@ -86,3 +86,7 @@ export const scanRecord = (data = {})=> {
 	return coreRequest(url.scanRecord, data, {})
 }
 
+// 扫描-获取下一网点
+export const getNextStationList = (data = {})=> {
+	return coreRequest(url.getNextStationList, data, {}, "GET")
+}
diff --git a/common/api/url.js b/common/api/url.js
index 53a1bc8..b56fe2c 100644
--- a/common/api/url.js
+++ b/common/api/url.js
@@ -38,5 +38,7 @@ export default {
   
   scanRecord: `/emis/emisTmsScanRecord/scan`, // 扫描-  揽收
   
+  getNextStationList: `/emis/emisTmsScanRecord/getNextStationList`, // 获取-扫描下一网点
+  
 }
 
diff --git a/pages/deliveryDeal/qutgoingScanning.vue b/pages/deliveryDeal/qutgoingScanning.vue
index c7a3892..e9e8adf 100644
--- a/pages/deliveryDeal/qutgoingScanning.vue
+++ b/pages/deliveryDeal/qutgoingScanning.vue
@@ -3,15 +3,15 @@
 		<tpx-layout>
 			<template v-slot:body>
 				<view class="blcok-white-noradius" style="margin-top: 0;">
-					<u-row justify="between">
+					<u-row v-if="submitParam.preOrNextStationCode" justify="between">
 						<view style="flex:1;">
-							<tpx-scan-input v-model:value="orderNo" placeholder="请输入或扫码"
+							<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;">
-							<tpx-select placeholder="下一网点" :isWhite="true"></tpx-select>
+							<tpx-select v-model:resObject="siteRes" :getListFun="getNextStationList" :transKeyVal="{valKey: 'destSite',titleKey: 'destSiteName'}" v-model:value="submitParam.preOrNextStationCode" :isWhite="true" placeholder="请选择下一网点"></tpx-select>
 						</view>
 					</u-row>
 					
@@ -47,10 +47,10 @@
 							<view v-for="(item, index) in resData.list" class="yditem">
 								<u-row>
 									<u-col span="8">
-										<text class="">T2919292</text>
+										<text class="">{{item.billCode}}</text>
 									</u-col>
 									<u-col span="4">
-										<text class="clr-sub">12-18 13:18</text>
+										<text class="clr-sub">{{item.scanDate}}</text>
 									</u-col>
 								</u-row>
 							</view>
@@ -80,7 +80,11 @@
 		},
 		data() {
 			return {
-				orderNo: '',
+				submitParam: {
+					billCode: '',
+					preOrNextStationCode: '',
+				},
+				
 				pageLoading: true,
 				queryOption: {
 					billCode: '', // 运单id
@@ -88,6 +92,9 @@
 				},
 				resData: {
 					list: []
+				},
+				siteRes: {
+					list: []
 				}
 			}
 		},
@@ -103,15 +110,33 @@
 
 		},
 		methods: {
-
+			getNextStationList: apiService.getNextStationList,
 			initData() {
-				this.orderNo = this.queryOption.billCode || this.queryOption.orderSn
+				this.submitParam.billCode = this.queryOption.billCode || this.queryOption.orderSn
 			},
-			handleSubmit() {
-
+			async handleSubmit(val) {
+				this.submitParam.scanDate = dayjs().format("YYYY-MM-DD HH:mm:ss")
+				let scnParam = {
+					scanType: 20, // 发件
+					opType: 2, 
+					scanData: [{
+						...this.submitParam
+					}]
+				}
+				val && (scnParam.billCode = val);
+				let res = await apiService.scanRecord({...scnParam, _loading: true})
+				let result = res?.data?.scanResult?.[0]?.result
+				if(result == "success") {
+					this.resData.list.push({
+						...this.submitParam
+					})
+					this.showToast('发件成功')
+				} else {
+					this.showToast(res?.data?.scanResult?.[0]?.message || '发件失败')
+				}
 			},
 			handleScanValChange: debounce(function(val){
-				val
+				this.handleSubmit(val)
 			}),
 		}
 	}
diff --git a/pages/post/openorder.vue b/pages/post/openorder.vue
index fc35d95..afe0225 100644
--- a/pages/post/openorder.vue
+++ b/pages/post/openorder.vue
@@ -18,7 +18,7 @@
 						<u-row justify="between" custom-style="margin-top:20rpx;">
 							<view style="width: 130rpx;">客户</view>
 							<view style="flex:1;">
-								<tpx-select v-model:resObject="kehuRes" :getListFun="getCustomerUserList" :transKeyVal="{valKey: 'customerCode',titleKey: 'customerName'}" v-model:value="submitParam.customerCode" :isWhite="true"></tpx-select>
+								<tpx-select v-model:resObject="kehuRes" :getListFun="getCustomerUserList" :transKeyVal="{valKey: 'customerCode',titleKey: 'customerName'}" v-model:value="submitParam.customerCode" :isWhite="true" placeholder="请选择客户"></tpx-select>
 							</view>
 						</u-row>
 					</view>
@@ -41,7 +41,7 @@
 							<template v-if="submitParam.reciever.country && submitParam.sender.country">
 								<view class="yunf-input-item">
 									<tpx-select v-model:value="submitParam.transLine" v-model:resObject="wayRes" :getListFun="getTransLineList" :transKeyVal="{valKey: 'lineCode',titleKey: 'lineName'}" 
-										:searchParam="waySearchParam" @onChange="handleWayChange" 
+										:searchParam="waySearchParam" @onChange="handleWayChange" placeholder="请选择路线" 
 									>
 										<tpx-text-item label="线路" :value="submitParam.transLine" :list="wayRes.list"></tpx-text-item>
 									</tpx-select>
@@ -51,7 +51,7 @@
 							<template v-if="submitParam.transLine">
 								<view class="yunf-input-item">
 									<tpx-select v-model:value="submitParam.productType"  v-model:resObject="productRes" :getListFun="getTransProductList" :transKeyVal="{valKey: 'prodCode',titleKey: 'prodName'}" :isWhite="true" 
-										:searchParam="productSearchParam"
+										:searchParam="productSearchParam" placeholder="请选择产品类型"
 									>
 										<tpx-text-item label="产品类型" :value="submitParam.productType" :list="productRes.list"></tpx-text-item>
 									</tpx-select>
@@ -83,13 +83,13 @@
 							</view>
 							
 							<view class="yunf-input-item">
-								<tpx-select v-model:value="submitParam.operateEmployeeCode" v-model:resObject="caozuoRes" :getListFun="getOpStaffList" :transKeyVal="{valKey: 'empCode',titleKey: 'empName'}" >
-									<tpx-text-item label="操作员" :value="submitParam.operateEmployeeCode" :list="caozuoRes.list"></tpx-text-item>
+								<tpx-select v-model:value="submitParam.operateEmployeeCode" v-model:resObject="caozuoRes" :getListFun="getOpStaffList" :transKeyVal="{valKey: 'empCode',titleKey: 'empName'}" placeholder="请选择操作员">
+									<tpx-text-item label="操作员" :value="submitParam.operateEmployeeCode" :list="caozuoRes.list" ></tpx-text-item>
 								</tpx-select>
 							</view>
 							
 							<view class="yunf-input-item">
-								<tpx-select v-model:value="submitParam.takePieceEmployeeCode" v-model:resObject="shoupaiRes" :getListFun="getRSDStaffList" :transKeyVal="{valKey: 'empCode',titleKey: 'empName'}" >
+								<tpx-select v-model:value="submitParam.takePieceEmployeeCode" v-model:resObject="shoupaiRes" :getListFun="getRSDStaffList" :transKeyVal="{valKey: 'empCode',titleKey: 'empName'}" placeholder="请选择收派员">
 									<tpx-text-item label="收派员" :value="submitParam.takePieceEmployeeCode" :list="shoupaiRes.list"></tpx-text-item>
 								</tpx-select>
 							</view>
@@ -104,7 +104,7 @@
 							
 							<view v-if="submitParam.paymentType == 2 || submitParam.paymentType == 4 || submitParam.paymentType == 5" class="yunf-input-item">
 								<tpx-select v-model:value="submitParam.custNo" v-model:resObject="yuejieRes" :getListFun="getMonthpayAccountList" :transKeyVal="{valKey: 'custNo',titleKey: 'custName'}" 
-									@onChange="handleYueJieSelect"
+									@onChange="handleYueJieSelect" placeholder="请选择月结账户"
 								>
 									<tpx-text-item label="月结账户" :value="submitParam.custNo" :list="yuejieRes.list"></tpx-text-item>
 								</tpx-select>
@@ -126,7 +126,7 @@
 							
 							<view v-if="submitParam.transLine" class="yunf-input-item">
 								<tpx-select v-model:value="submitParam.destinationCode"  v-model:resObject="destPostRes" :getListFun="getDestPositionList" :transKeyVal="{valKey: 'destCode',titleKey: 'destName'}" :isWhite="true" 
-									:searchParam="destPostParam" @onChange="handleDestPostChange"
+									:searchParam="destPostParam" @onChange="handleDestPostChange" placeholder="请选择目的地"
 								>
 									<tpx-text-item label="目的地" :value="submitParam.destinationCode" :list="destPostRes.list"></tpx-text-item>
 								</tpx-select>
@@ -138,7 +138,7 @@
 							
 							<view class="yunf-input-item">
 								<tpx-select v-model:value="submitParam.warehouseInNo"  v-model:resObject="wareRes" :getListFun="getWarehouseInList" :transKeyVal="{valKey: 'inNo',titleKey: 'inNo'}" :isWhite="true" 
-									searchParam="" type="multiple"
+									searchParam="" type="multiple" placeholder="请选择进仓单"
 								>
 									<tpx-text-item label="进仓单" :value="submitParam.warehouseInNo" :list="wareRes.list"></tpx-text-item>
 								</tpx-select>