From 4a82957ea02ff3f62ac4d41191a63766fe0c62f9 Mon Sep 17 00:00:00 2001
From: aihe <961836564@qq.com>
Date: Mon, 29 Apr 2024 16:46:07 +0800
Subject: [PATCH] uu

---
 .../buns-post-edit-templates/bpe-cost-tmp.vue | 48 +++++--------------
 pages/post/openorder.vue                      | 47 ++++++++++++++----
 2 files changed, 51 insertions(+), 44 deletions(-)

diff --git a/components/buns-post-edit-templates/bpe-cost-tmp.vue b/components/buns-post-edit-templates/bpe-cost-tmp.vue
index f335f0c..6012774 100644
--- a/components/buns-post-edit-templates/bpe-cost-tmp.vue
+++ b/components/buns-post-edit-templates/bpe-cost-tmp.vue
@@ -4,7 +4,7 @@
 			<u-row>
 				<view class="lft1 font-28">计费方式</view>
 				<view style="flex: 1;">
-					<u-radio-group v-model="modelInfo.calcFeeType" @change="groupChange">
+					<u-radio-group v-model="modelInfo.calcFeeType" @change="handleFeeTypeChange">
 						<u-radio v-for="(item, index) in dicData.emis_calc_fee_type" :label="item.title"
 							:name="item.val" activeColor="#B12D29" size="30" labelSize="26"
 							:custom-style="`margin-right: ${index+1<dicData.emis_calc_fee_type.length?30:0}rpx;`">
@@ -49,38 +49,6 @@
 <script>
 	import * as apiService from "@/common/api"
 	export default {
-		watch: {
-			modelInfo: {
-				handler(newVal, oldVal) {
-					let params = {
-						"productType": newVal.productType,
-						"customerCode": newVal.customerCode,
-						"custNo": newVal.custNo,
-						"calcFeeType": newVal.calcFeeType,
-						"settlementWeight": newVal.settlementWeight,
-						"totalVolume": newVal.totalVolume,
-						"sendSiteCode": this.$store.getters.userInfo.ownerSiteCode,
-						"dispatchUnderlingSiteCode": newVal.dispatchUnderlingSiteCode,
-					}
-					// params = {
-					// 	"productType": "24202",
-					// 	"customerCode": "1",
-					// 	"custNo": "1",
-					// 	"calcFeeType": "1",
-					// 	"settlementWeight": "2.3",
-					// 	"totalVolume": "0.03",
-					// 	"sendSiteCode": "25001",
-					// 	"dispatchUnderlingSiteCode": "95001"
-					// }
-					// 所有的入参必须有值才可以计算
-					let vals = Object.values(params)
-					if (vals.length == vals.filter(v => !!v).length) {
-						this.calcWaybillFee(params)
-					}
-				},
-				deep: true
-			}
-		},
 		computed: {
 			modelInfo: {
 				get() {
@@ -102,13 +70,18 @@
 				default () {
 					return {}
 				}
+			},
+			searchParam: {
+				default () {
+					return {}
+				}
 			}
 		},
 		data() {
 			return {}
 		},
 		created() {
-
+			;(!this.modelInfo.feeItems || this.modelInfo.feeItems.length == 0) && this.calcWaybillFee();
 		},
 		onHide() {
 
@@ -128,8 +101,11 @@
 					feeName: this.dicData.emis_fee_type.filter(t => t.val == val)[0].title
 				})
 			},
-			async calcWaybillFee(params) {
-				let res = await apiService.calcWaybillFee(params)
+			handleFeeTypeChange(val) {
+				this.calcWaybillFee({ calcFeeType: val })
+			},
+			async calcWaybillFee(params = {}) {
+				let res = await apiService.calcWaybillFee({ ...this.searchParam, ...params })
 				this.modelInfo.feeItems = res.data.feeItems
 			}
 		}
diff --git a/pages/post/openorder.vue b/pages/post/openorder.vue
index 2f28cc0..55a3189 100644
--- a/pages/post/openorder.vue
+++ b/pages/post/openorder.vue
@@ -187,14 +187,16 @@
 						<bpe-goodstatic-tmp v-model:value="submitParam"></bpe-goodstatic-tmp>
 					</view>
 					
-					<view class="com-section mt-30">
-						<u-row justify="space-between">
-							<text>计费信息</text>
-						</u-row>
-					</view>
-					<view class="blcok-white">
-						<bpe-cost-tmp v-model:value="submitParam"></bpe-cost-tmp>
-					</view>
+					<template v-if="isShowJifei">
+						<view class="com-section mt-30">
+							<u-row justify="space-between">
+								<text>计费信息</text>
+							</u-row>
+						</view>
+						<view class="blcok-white">
+							<bpe-cost-tmp v-model:value="submitParam" :searchParam="jifeiParam"></bpe-cost-tmp>
+						</view>
+					</template>
 					
 					<view class="com-section mt-30">
 						<u-row justify="space-between">
@@ -270,6 +272,35 @@
 			},
 			dicData() {
 			  return this.$store.getters.dicData
+			},
+			jifeiParam(){
+				let info = this.submitParam
+				let param = {
+					productType: info.productType,
+					customerCode: info.customerCode,
+					custNo: info.custNo,
+					calcFeeType: info.calcFeeType,
+					settlementWeight: info.settlementWeight,
+					totalVolume: info.totalVolume,
+					sendSiteCode: this.$store.getters.userInfo.ownerSiteCode,
+					dispatchUnderlingSiteCode: info.dispatchUnderlingSiteCode,
+				}
+				// TODO
+				param = {
+					"productType": "24202",
+					"customerCode": "1",
+					"custNo":  "1",
+					"calcFeeType": "1",
+					"settlementWeight": "2.3",
+					"totalVolume": "0.03",
+					"sendSiteCode": "25001",
+					"dispatchUnderlingSiteCode": "95001"
+				}
+				return param
+			},
+			isShowJifei(){
+				let vals = Object.values(this.jifeiParam)
+				return vals.length == vals.filter(v => !!v).length
 			}
 		},
 		data() {