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

---
 common/api/order.js             |  6 ++++++
 common/api/url.js               |  1 +
 pages/post/freightCalculate.vue | 17 +++++++++++++----
 3 files changed, 20 insertions(+), 4 deletions(-)

diff --git a/common/api/order.js b/common/api/order.js
index aa70986..4a40f03 100644
--- a/common/api/order.js
+++ b/common/api/order.js
@@ -69,6 +69,12 @@ export const getMonthpayAccountList = (data = {})=> {
 export const getDestPositionList = (data = {})=> {
 	return coreRequest(url.getDestPositionList, data, {}, "GET")
 }
+
+// 发件网点列表
+export const getSendSiteList = (data = {})=> {
+	return coreRequest(url.getSendSiteList, data, {}, "GET")
+}
+
 // 自动计算-目的地
 export const getCaculteDestSite = (data = {})=> {
 	return coreRequest(url.getCaculteDestSite, data, {}, "GET")
diff --git a/common/api/url.js b/common/api/url.js
index b5cb3cb..06478e8 100644
--- a/common/api/url.js
+++ b/common/api/url.js
@@ -29,6 +29,7 @@ export default {
   getMonthpayAccountList: `/emis/emisMonthpayAccount/listSimple`, // 月结账号列表
   getDestPositionList: `/emis/emisDestination/listSimple`, // 目的地 列表
   getCaculteDestSite: `/emis/emisDestination/getDestSite`, // 自动计算目的地
+  getSendSiteList: `/emis/emisSite/listSimple`, // 出发地-网点列表
   calcWaybillFee: `/emis/emisWaybill/calcWaybillFee`, // 计算运费
   calcSetteldWeight: `/emis/emisWaybill/calcSetteldWeight`, // 计算结算重量
   calcVolumeWeight: `/emis/emisWaybill/calcVolumeWeight`, // 体积重量计算 
diff --git a/pages/post/freightCalculate.vue b/pages/post/freightCalculate.vue
index af929f4..388de32 100644
--- a/pages/post/freightCalculate.vue
+++ b/pages/post/freightCalculate.vue
@@ -7,9 +7,11 @@
 				
 						<view>
 							<view class="yunf-input-item">
-								<tpx-text-item label="始发网点">
-									<template v-slot:right>{{submitParam.sendSiteName}}</template>
-								</tpx-text-item>
+								<tpx-select v-model:value="submitParam.sendSiteCode"  v-model:resObject="sndStRes" :getListFun="getSendSiteList" :transKeyVal="{valKey: 'siteCode',titleKey: 'siteName'}" :isWhite="true"
+									v-model:text="submitParam.sendSiteName" placeholder="请选择始发网点" 
+								>
+									<tpx-text-item label="始发网点" :value="submitParam.sendSiteName"></tpx-text-item>
+								</tpx-select>
 							</view>
 							
 							<view class="yunf-input-item">
@@ -195,6 +197,7 @@
 					queryOption: {
 					},
 					proTypeList: [],
+					sndStRes: { list: [] },
 					countryRes: { list: [] }, 
 					provRes: { list: [] },
 					wayRes: { list: [] },
@@ -219,6 +222,7 @@
 			getEmisCountry: apiService.getEmisCountry,
 			getTransLineList: apiService.getTransLineList,
 			getEmisRegion: apiService.getEmisRegion,
+			getSendSiteList: apiService.getSendSiteList,
 			async initData() { // 初始化
 				this.pageLoading = false
 			},
@@ -271,7 +275,12 @@
 				}
 			},
 			handleGoXiaDan() {
-				this.goto(`post/openorder?defaultSubParams=${encodeURIComponent(JSON.stringify(this.submitParam))}&type=create`)
+				let cpData = JSON.parse(JSON.stringify(this.submitParam))
+				// 下单，需要重置 发件的网点信息，使用登录者的信息
+				let { sendSiteCode, sendSiteName } = this.getDefaultData()
+				cpData.sendSiteCode = sendSiteCode
+				cpData.sendSiteName = sendSiteName
+				this.goto(`post/openorder?defaultSubParams=${encodeURIComponent(JSON.stringify(cpData))}&type=create`)
 			}
 		}
 	}