From 1fd8e286a6912cc6b67a669b2414f05c2f2c30dd Mon Sep 17 00:00:00 2001
From: aihe <961836564@qq.com>
Date: Thu, 25 Apr 2024 15:54:13 +0800
Subject: [PATCH] uu

---
 common/api/index.js                           |   1 +
 common/enum.js                                |   5 +
 common/util.js                                |  16 ++-
 .../buns-address-sheet/buns-address-sheet.vue |  10 +-
 .../bpe-addressinfo-tmp.vue                   |  62 ++++++++++--
 pages.json                                    |  13 +--
 pages/address/list.vue                        |  95 ++++++++++--------
 pages/post/model.js                           |  90 +++++++++++++++++
 pages/post/openorder.vue                      |  40 +++++---
 static/images/kong.png                        | Bin 0 -> 1781 bytes
 store/modules/common.js                       |   4 +-
 store/modules/user.js                         |   6 +-
 12 files changed, 257 insertions(+), 85 deletions(-)
 create mode 100644 pages/post/model.js
 create mode 100644 static/images/kong.png

diff --git a/common/api/index.js b/common/api/index.js
index a19bd40..4e70749 100644
--- a/common/api/index.js
+++ b/common/api/index.js
@@ -1,6 +1,7 @@
 import apiUrls, { host } from "./url"
 export * from "./user"
 export * from "./common"
+export * from "./order"
 
 export {
 	apiUrls,
diff --git a/common/enum.js b/common/enum.js
index b59bfa8..d024250 100644
--- a/common/enum.js
+++ b/common/enum.js
@@ -166,6 +166,10 @@ const dateRangeList = [
 	{ title: '年', val: 5 },
 ]
 
+const pageEventNames = {
+	chooseAddress: "chooseAddress", // 地址选择
+}
+
 
 export {
 	ordStaEnum,
@@ -191,4 +195,5 @@ export {
 	kuaidiTypeEnum,
 	kuaidiTypeList,
 	dateRangeList,
+	pageEventNames,
 }
\ No newline at end of file
diff --git a/common/util.js b/common/util.js
index 44be60b..3a784ce 100644
--- a/common/util.js
+++ b/common/util.js
@@ -95,9 +95,23 @@ const numberToChinese = (num)=> {
   return result;
 }
 
+const getAddressDetail = (item= {})=> {
+	return `${item.countryName||''}${item.provinceName||''}${item.cityName||''}${item.countyName||''}${item.address||''}`
+}
+
+const transListKeyTitle = ({ valKey = '', titleKey = '', list = [] })=> {
+	list.map(t=> {
+		t.title = t[titleKey]
+		t.val = t[valKey]
+	})
+	return list
+}
+
 export {
+	getAddressDetail,
 	numberToChinese,
 	formatTime,
 	formatLocation,
-	dateUtils
+	dateUtils,
+	transListKeyTitle
 }
diff --git a/components/buns-address-sheet/buns-address-sheet.vue b/components/buns-address-sheet/buns-address-sheet.vue
index c803cda..3db84ca 100644
--- a/components/buns-address-sheet/buns-address-sheet.vue
+++ b/components/buns-address-sheet/buns-address-sheet.vue
@@ -47,10 +47,8 @@
 </template>
 
 <script>
-	import {
-		getEmisCountry,
-		getEmisRegion
-	} from "@/common/api"
+	import * as apiService from "@/common/api"
+	
 
 	export default {
 		watch: {
@@ -108,7 +106,7 @@
 			}
 		},
 		async created() {
-			const res = await getEmisCountry()
+			const res = await apiService.getEmisCountry()
 			this.curCountryList = this.curList = res.rows || []
 		},
 		onHide() {
@@ -132,7 +130,7 @@
 				if (parentId == countryId) {
 					parentId = undefined
 				}
-				const res = await getEmisRegion({
+				const res = await apiService.getEmisRegion({
 					parentId,
 					countryId
 				})
diff --git a/components/buns-post-edit-templates/bpe-addressinfo-tmp.vue b/components/buns-post-edit-templates/bpe-addressinfo-tmp.vue
index 6213553..3a05289 100644
--- a/components/buns-post-edit-templates/bpe-addressinfo-tmp.vue
+++ b/components/buns-post-edit-templates/bpe-addressinfo-tmp.vue
@@ -6,9 +6,17 @@
 				<image style="height: 50rpx;width: 42rpx;" :src="getCdnUrl(`post/ji.png`)"></image>
 			</view>
 			<view style="flex: 1;padding: 0 30rpx;">
-				<u-text text="寄件人信息" size="28" :bold="true"></u-text>
+				<view style="flex: 1;">
+					<template v-if="modelInfo.sender.name">
+						<text class="font-weight pr-10">{{modelInfo.sender.name}}</text>
+						<text class="">{{modelInfo.sender.phone}}</text>
+					</template>
+					<template v-else>
+						<text class="font-weight">寄件人信息</text>
+					</template>
+				</view>
 				<view style="margin: 8rpx 0 0 0;">
-					<u-text text="请新建您的寄件地址信息" size="26" color="#999"></u-text>
+					<u-text :text="sendDetail" size="26" color="#999"></u-text>
 				</view>
 			</view>
 			<view class="flex-column-center">
@@ -34,9 +42,17 @@
 				</image>
 			</view>
 			<view class="pr-30 pl-30" style="flex: 1;">
-				<u-text text="收件人信息" size="28" :bold="true"></u-text>
+				<view style="flex: 1;">
+					<template v-if="modelInfo.reciever.name">
+						<text class="font-weight pr-10">{{modelInfo.reciever.name}}</text>
+						<text class="">{{modelInfo.reciever.phone}}</text>
+					</template>
+					<template v-else>
+						<text class="font-weight">收件人信息</text>
+					</template>
+				</view>
 				<view style="margin: 8rpx 0 0 0;">
-					<u-text text="请填写收件人国家、姓名，电话" size="26" color="#999"></u-text>
+					<u-text :text="recieverDetail" size="26" color="#999"></u-text>
 				</view>
 			</view>
 			<view class="flex-column-center">
@@ -50,16 +66,28 @@
 </template>
 
 <script>
-	import getCdnUrl from "@/common/getCdnUrl"
-	import { goto } from "@/common/untool"
+	import { pageEventNames } from "@/common/enum"
+	import { getAddressDetail } from "@/common/util"
 	
 	export default {
 		computed: {
-			submitInfo: {
+			modelInfo: {
 				get(){
 					return this.value
 				}
-			}
+			},
+			sendDetail: {
+				get(){
+					const { sender: item } = this.modelInfo
+					return getAddressDetail(item) || '请填写寄件人国家、姓名，电话'
+				}
+			},
+			recieverDetail: {
+				get(){
+					const { reciever: item } = this.modelInfo
+					return getAddressDetail(item) || '请填写收件人国家、姓名，电话'
+				}
+			},
 		},
 		props: {
 			value: {
@@ -73,18 +101,30 @@
 			}
 		},
 		created() {
+			this.initEvent()
 		},
 		onHide() {
 	
 		},
 		unmounted() {
-			
+			uni.$off(pageEventNames.chooseAddress, this.chooseAddressEventBack)
 		},
 	
 		methods: {
-			getCdnUrl,
 			handleAddressChoose(type) { // 1 寄件地址 2收件地址
-				goto(`address/list?tab=${type}&type=choose`)
+				this.goto(`address/list?tab=${type}&type=choose`)
+			},
+			initEvent() {
+				uni.$on(pageEventNames.chooseAddress, this.chooseAddressEventBack)
+			},
+			chooseAddressEventBack({ data, queryOption }){
+				const { tab } = queryOption
+				if(tab == 1) {
+					this.modelInfo.sender = data
+				}
+				if(tab == 2) {
+					this.modelInfo.reciever = data
+				}
 			},
 		}
 	}
diff --git a/pages.json b/pages.json
index e98b56b..ed06910 100644
--- a/pages.json
+++ b/pages.json
@@ -17,6 +17,12 @@
 		"^u-([^-].*)": "@/uni_modules/uview-plus/components/u-$1/u-$1.vue"
 	},
 	"pages": [
+		{
+			"path": "pages/post/openorder",
+			"style": {
+				"navigationBarTitleText": "开单"
+			}
+		},
 		{
 			"path": "pages/tabBar/home/home",
 			"style": {
@@ -75,12 +81,7 @@
 				"navigationBarTitleText": "寄件信息"
 			}
 		},
-		{
-			"path": "pages/post/openorder",
-			"style": {
-				"navigationBarTitleText": "开单"
-			}
-		},
+		
 		{
 			"path": "pages/post/detail",
 			"style": {
diff --git a/pages/address/list.vue b/pages/address/list.vue
index 60a5e4e..c638a37 100644
--- a/pages/address/list.vue
+++ b/pages/address/list.vue
@@ -13,7 +13,7 @@
 					<view class="com-jianju" style="padding-top: 40rpx;">
 						<u-row justify="between" align="top">
 							<u-col span="12">
-								<tpx-tabs :list="tabList" v-model:value="searchParam.tabType" 
+								<tpx-tabs :list="tabList" v-model:value="searchParam.addressType" 
 									@tabchange="(val)=> { handleSearchParamChange() }" v-slot="curTab"
 								>
 									<text slot>
@@ -31,13 +31,13 @@
 						<view @click="handleItemClick(item)">
 							<u-row>
 								<view class="pr-20">
-									<u-text :text="'李先生'" size="30" :bold="true"></u-text>
+									<u-text :text="item.name" size="30" :bold="true"></u-text>
 								</view>
 								<view>
-									<u-text :text="'18627068352'" size="28" mode="phone" color="#999"></u-text>
+									<u-text :text="item.phone" size="28" mode="phone" color="#999"></u-text>
 								</view>
 							</u-row>
-							<u-text :text="'上海市大世界大世界大世界大世界大世界大世界大世界大世界大世界大世界大世界大世界大世界大世界大世界大世界大世界大世界大世界大世界大世界'" 
+							<u-text :text="getAddressDetail(item)" 
 								size="24" margin="20rpx 0 0 0" color="#999" 
 							></u-text>
 						</view>
@@ -46,7 +46,7 @@
 						<u-row custom-style="margin-top:20rpx;" justify="between">
 							<u-row>
 								<text class="pr-20 clr-sub">默认地址</text>
-								<u-switch v-model="item.morenTODO" @change="handleDefaultSwitch(item)" active-color="#B12D29" size="34"></u-switch>
+								<u-switch v-model="item.blDefaultFlag" @change="handleDefaultSwitch(item)" active-color="#B12D29" size="34"></u-switch>
 							</u-row>
 							<u-row>
 								<u-text @click="handleEditItem(item)" text="编辑" prefixIcon="edit-pen" size="26"></u-text>
@@ -87,9 +87,10 @@
 </template>
 
 <script>
-	import getCdnUrl from "@/common/getCdnUrl"
-	import { ordStaEnum, ordStatusList, payTypeEnum, payTypeList, dlvTypeEnum, dlvTypeList, dateTypeEnum, dateTypeList } from "@/common/enum"
-	import { goto, goBack, setClipboardData, confirmModal, showLoading } from "@/common/untool"
+	import * as apiService from "@/common/api"
+	import { pageEventNames } from "@/common/enum"
+	import { getAddressDetail } from "@/common/util"
+	
 	const tabList = [
 		{ title: '收件地址', val: 1 },
 		{ title: '寄件地址',  val: 2 },
@@ -108,15 +109,18 @@
 		},
 		data() {
 			return {
-				...JSON.parse(JSON.stringify({ ordStaEnum, ordStatusList, payTypeEnum, payTypeList, dlvTypeEnum, dlvTypeList, dateTypeEnum, dateTypeList })),
 				tabList ,
 				searchParam: {
+					pageNo: 1,
+					pageSize: 10,
 					keyword: '',
-					tabType: tabList[0].val
+					addressType: tabList[0].val
+				},
+				queryOption: {
+					tab: tabList[0].val, // 当前tab
+					type: '', // 'choose' 选择操作
 				},
-				queryOption: {},
 				dataList: [
-					{},{},{},{},{},{},{},{}
 				],
 				showLoadMore: false,
 				loadedAll: false
@@ -130,58 +134,69 @@
 		},
 		onLoad(queryOption) {
 			this.queryOption = queryOption
-			this.searchParam.tabType = queryOption.tab || tabList[0].val
+			this.searchParam.addressType = queryOption.tab || tabList[0].val
 			this.initData();
 		},
-		onUnload() {
+		unmounted() {
+			
 		},
 		methods: {
-			getCdnUrl,
+			getAddressDetail,
 			initData(){
-				// showLoading()
-				setTimeout(() => {
-					uni.stopPullDownRefresh();
-				}, 300);
+				uni.stopPullDownRefresh();
+				this.setListData(true)
 			},
-			setListData() {
-				
+			async setListData(reload) {
+				if(reload) {
+					this.searchParam.pageNo = 1
+					this.showLoading()
+				}
+				const res = await apiService.getCustomerUserAddressList(this.searchParam)
+				const list = res.rows || []
+				if(reload) {
+					this.dataList = list
+					this.hideLoading()
+				} else {
+					this.dataList = this.dataList.concat(list)
+				}
 			},
 			
-			onScrollBottom() {
-				console.log("onScrollBottom");
+			async onScrollBottom() {
 				if (this.loadedAll) {
 					return;
 				}
 				this.showLoadMore = true;
-				setTimeout(() => {
-					this.setListData();
-				}, 300);
-			},
-			handleSearchMoreBtn(){
-				if(!this.showLoadMore) {
-					// 回显更多条件
-					Object.keys(this.tmpSearchParam).map(t=> {
-						this.tmpSearchParam[t] = this.searchParam[t] || ''
-					})
-				}
-				this.showSearchMore = !this.showSearchMore
+				this.searchParam.pageNo ++
+				await this.setListData();
+				this.showLoadMore = false;
 			},
 			handleSearchParamChange(key, val) {
 				if(key) {
 					this.searchParam[key] = val
 				}
-				
+				setTimeout(()=> {
+					this.setListData(true)
+				}, 300)
 			},
 			handleItemClick(item){
-				if(this.queryOption.type == "choose") {
-					goBack()
+				switch(this.queryOption.type) {
+					case 'choose':
+						uni.$emit(pageEventNames.chooseAddress, {
+							queryOption: this.queryOption,
+							data: item
+						})
+						this.goBack()
+						break
+					;
+					
 				}
 			},
 			handleEditItem(item={}) {
-				goto(`address/edit?id=${item.id}`)
+				this.goto(`address/edit?id=${item.id}`)
+				
 			},
 			async handleDelItem(item) {
-				await confirmModal('确认要删除吗？')
+				await this.confirmModal('确认要删除吗？')
 			},
 			handleDefaultSwitch(item) {
 				
diff --git a/pages/post/model.js b/pages/post/model.js
new file mode 100644
index 0000000..9ef414b
--- /dev/null
+++ b/pages/post/model.js
@@ -0,0 +1,90 @@
+
+export const getOrderModels = ()=> {
+	return {
+    "reciever": { // 收件人信息
+      "country": null,
+      "name": "",
+      "phone": null,
+      "province": null,
+      "city": null,
+      "district": null,
+      "town": null,
+      "address": null,
+      "postCode": null,
+      "email": null,
+      "company": null
+    },
+    "sender": { // 发件人信息
+      "country": null,
+      "name": "",
+      "phone": null,
+      "province": null,
+      "city": null,
+      "district": null,
+      "town": null,
+      "address": null,
+      "postCode": null,
+      "email": null,
+      "company": null
+    },
+    "custOrderId": null, // 客户单号
+    "billCode": "", // 运单号
+    "billCodeSub": null, // 子单号
+    "orderDate": null,
+    "userId": '', // 客户id
+    "openId": null,
+    "paymentType": null,
+    "calcFeeType": null,
+    "custNo": null,
+    "transLine": null,
+    "productType": null,
+    "customsClear": null,
+    "customsEclaration": null,
+    "packType": null,
+    "dispatchMethod": null,
+    "pickupMethod": null,
+    "pickStartDate": null,
+    "pickFinishDate": null,
+    "intoWarehouseCode": null,
+    "intoWarehouseName": null,
+    "intoWarehouseAddress": null,
+    "intoWarehouseContact": null,
+    "intoWarehousePhone": null,
+    "intoWarehouseBillCode": null,
+    "customerDeliveryBeginTime": null,
+    "goodsType": null,
+    "goodsInfo": null,
+    "totalWeight": null,
+    "totalVolume": null,
+    "parcelQty": null,
+    "billWeight": null,
+    "volumeWeight": null,
+    "currency": null,
+    "settlementWeight": null,
+    "feeWeight": null,
+    "freight": null,
+    "blOverLong": null,
+    "blOverWeight": null,
+    "overWeightNumber": null,
+    "feeRemaker": null,
+    "realValue": null,
+    "blDispFd": null,
+    "transferCode": null,
+    "transferBillcode": null,
+    "dispFdDate": null,
+    "takePieceEmployeeCode": null,
+    "sendSiteCode": null,
+    "destinationCode": null,
+    "destinationProvince": null,
+    "destinationCity": null,
+    "destinationCounty": null,
+    "dispatchUnderlingSiteCode": null,
+    "destinationCenterCode": null,
+    "marketManCode": null,
+    "payee": null,
+    "salesmen": null,
+    "operateEmployeeCode": null,
+    "blMessage": null,
+    "blAcceptMessage": null
+  }
+}
\ No newline at end of file
diff --git a/pages/post/openorder.vue b/pages/post/openorder.vue
index d72acde..563eba4 100644
--- a/pages/post/openorder.vue
+++ b/pages/post/openorder.vue
@@ -6,21 +6,18 @@
 					<u-row justify="between">
 						<view style="width: 130rpx;">运单号</view>
 						<view style="flex:1;">
-							<tpx-scan-input v-model:value="submitParam.yundanhao"></tpx-scan-input>
+							<tpx-scan-input v-model:value="submitParam.billCode"></tpx-scan-input>
 						</view>
 						<view class="pl-10">
-							<u-checkbox-group placement="column" @change="handleAgree()">
-								<u-checkbox size="26" labelSize="26" :checked="agreePrivateRule" label="电子主单"
-									label-color=":#999" activeColor="#B12D29" 
-									custom-style="margin-bottom: 10rpx;"></u-checkbox>
-							</u-checkbox-group>
+							<u-button  @click="handleCreateOrderNo()"
+								custom-style="font-size: 28rpx;padding:0 10rpx;height: 74rpx;" :plain="true" >系统生成</u-button>
 						</view>
 						
 					</u-row>
 					<u-row justify="between" custom-style="margin-top:20rpx;">
 						<view style="width: 130rpx;">客户</view>
 						<view style="flex:1;">
-							<tpx-select :list="kehuList" v-model:value="submitParam.kehuid" customStyle="" :isWhite="true"></tpx-select>
+							<tpx-select :list="kehuList" v-model:value="submitParam.userId" customStyle="" :isWhite="true"></tpx-select>
 						</view>
 					</u-row>
 				</view>
@@ -301,9 +298,9 @@
 </template>
 
 <script>
-	import getCdnUrl from "@/common/getCdnUrl"
+	
+	import { transListKeyTitle } from "@/common/util"
 	import { sendTypeEnum, sendTypeList, qingguanList, baoguanList, } from "@/common/enum"
-	import { goto } from "@/common/untool"
 	import BpeAddressinfoTmp from "@/components/buns-post-edit-templates/bpe-addressinfo-tmp"
 	import BpeGoodstaticTmp from "@/components/buns-post-edit-templates/bpe-goodstatic-tmp"
 	import BpeCostTmp from "@/components/buns-post-edit-templates/bpe-cost-tmp"
@@ -311,6 +308,9 @@
 	import BpeGoodphotoTmp from "@/components/buns-post-edit-templates/bpe-goodphoto-tmp"
 	import BpeGoodKuaidiTmp from "@/components/buns-post-edit-templates/bpe-good-kuaidi-tmp"
 	
+	import * as apiService from "@/common/api"
+	import { getOrderModels } from "./model"
+	
 	export default {
 		components: { BpeAddressinfoTmp, BpeGoodstaticTmp, BpeCostTmp, BpeGooditemEditTmp, BpeGoodphotoTmp, BpeGoodKuaidiTmp },
 		props: {
@@ -328,7 +328,6 @@
 				tipsList: [
 					
 				],
-				agreePrivateRule: false,
 				wayModal: {
 					show: false,
 				},
@@ -336,6 +335,7 @@
 					show: false,
 				},
 				submitParam: {
+					...getOrderModels(),
 					yundanhao: '',
 					stockRoomId: '',
 					countryId: '',
@@ -358,21 +358,29 @@
 		},
 		onLoad() {
 			this.initData();
+			this.initEvent()
 		},
-		onUnload() {
+		unmounted() {
 
 		},
 		methods: {
-			getCdnUrl,
-			goto,
-			initData() {
+			async initData() {
 				// uni.showLoading({
 				// 	title: '加载中'
 				// });
+				this.showLoading()
+				const res = await apiService.getCustomerUserList()
+				this.kehuList = transListKeyTitle({ valKey: 'id', titleKey: 'customerFullName', list: res.rows })
+				
+				this.hideLoading()
 			},
 			
-			handleAgree() {
-				this.agreePrivateRule = !this.agreePrivateRule
+			initEvent() {
+				
+			},
+			async handleCreateOrderNo() {
+				const res = await apiService.createOrderNo()
+				this.submitParam.billCode = res.data
 			},
 			handleDialogClick(curModal){
 				curModal.show = true
diff --git a/static/images/kong.png b/static/images/kong.png
new file mode 100644
index 0000000000000000000000000000000000000000..55fc1030f5e57e2113fa8c8298738cb8144ffac5
GIT binary patch
literal 1781
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
E0=F<SaR2}S

literal 0
HcmV?d00001

diff --git a/store/modules/common.js b/store/modules/common.js
index 36b9b25..52db54a 100644
--- a/store/modules/common.js
+++ b/store/modules/common.js
@@ -5,7 +5,7 @@ import {
 	setSessionUserInfo,
 	getSessionUserInfo
 } from "@/session"
-import { getDicDataJson } from "@/common/api"
+import * as apiService from "@/common/api"
 import { goto } from "@/common/untool"
 
 export default {
@@ -30,7 +30,7 @@ export default {
 			state,
 			rootState
 		}, options) {
-			const resInfo = await getDicDataJson()
+			const resInfo = await apiService.getDicDataJson()
 			let data = {}
 			// 转换接口返回的数据字典
 			resInfo?.data?.map?.((item)=> {
diff --git a/store/modules/user.js b/store/modules/user.js
index 99309a8..20c64b9 100644
--- a/store/modules/user.js
+++ b/store/modules/user.js
@@ -5,7 +5,7 @@ import {
 	setSessionUserInfo,
 	getSessionUserInfo
 } from "@/session"
-import { loginByApp, getInfoByApp } from "@/common/api"
+import * as apiService from "@/common/api"
 import { goto } from "@/common/untool"
 
 export default {
@@ -42,7 +42,7 @@ export default {
 			rootState
 		}, options) {
 			let token = state.token
-			const resLgn = await loginByApp(options)
+			const resLgn = await apiService.loginByApp(options)
 			token = resLgn.token
 			setSessionXToken(token)
 			
@@ -70,7 +70,7 @@ export default {
 				throw new Error('缺少token')
 			}
 			
-			const resInfo = await getInfoByApp()
+			const resInfo = await apiService.getInfoByApp()
 			const info = {
 				...resInfo.user,
 				roles: resInfo.user,