From 6c9ed9e20d8c33c9ab61b6c0f3a8a34133580b59 Mon Sep 17 00:00:00 2001
From: aihe <961836564@qq.com>
Date: Tue, 11 Jun 2024 11:25:41 +0800
Subject: [PATCH] uu

---
 .../buns-edit-sheet/buns-edit-sheet.vue       | 10 ++++-
 .../buns-post-edit-templates/bpe-cost-tmp.vue | 45 +++++++++++++++++--
 components/tpx-dialog/tpx-dialog.vue          | 14 +++++-
 pages/post/openorder.vue                      |  2 +-
 4 files changed, 64 insertions(+), 7 deletions(-)

diff --git a/components/buns-edit-sheet/buns-edit-sheet.vue b/components/buns-edit-sheet/buns-edit-sheet.vue
index a0a1579..067a6d1 100644
--- a/components/buns-edit-sheet/buns-edit-sheet.vue
+++ b/components/buns-edit-sheet/buns-edit-sheet.vue
@@ -1,6 +1,6 @@
 <template>
-	<tpx-dialog :show="show" :title="title" @onClose="handleCloseModal()">
-		<view :style="`position: relative;height: calc(${percentHeight}vh);`">
+	<tpx-dialog :show="show" :title="title" @onClose="handleCloseModal()" rootStyle="min-height:auto;">
+		<view :style="cptStyle">
 			<tpx-layout>
 				<template v-slot:body>
 					<slot v-if="show" :value="submitVals"></slot>
@@ -21,6 +21,12 @@
 <script>
 	
 	export default {
+		computed:{
+			cptStyle(){
+				let sty = `position: relative;height: calc(${this.percentHeight}vh);`
+				return sty
+			}
+		},
 		components: { },
 		watch: {
 			show(v){
diff --git a/components/buns-post-edit-templates/bpe-cost-tmp.vue b/components/buns-post-edit-templates/bpe-cost-tmp.vue
index 1c4d0b1..0e67cc0 100644
--- a/components/buns-post-edit-templates/bpe-cost-tmp.vue
+++ b/components/buns-post-edit-templates/bpe-cost-tmp.vue
@@ -93,6 +93,36 @@
 				 maxlength="50" count></u-textarea>
 		</view>
 	</view>
+	
+	<buns-edit-sheet percentHeight="40" :title="costModal.item.feeName" v-model:show="costModal.show" v-model:value="costModal.item" v-slot="tempObject" @onSure="handleCostItemSure">
+		<u-row custom-style="gap: 20rpx;margin-top:10rpx;">
+			<u-row custom-style="flex: 1">
+				<text class="font-26 pr-10">首重费</text>
+				<tpx-input v-model:value="tempObject.value.initialWeightFee" _digit="5"  :isWhite="true"
+					custom-style="width: 120rpx;height: 46rpx;" suffix="CNY"></tpx-input>
+			</u-row>
+			<u-row custom-style="flex: 1">
+				<text class="font-26 pr-10">续重单价</text>
+				<tpx-input v-model:value="tempObject.value.addWeightPrice"  _digit="5" :isWhite="true"
+					custom-style="width: 120rpx;height: 46rpx;" suffix="CNY"></tpx-input>
+			</u-row>
+		</u-row>
+		<u-row style="margin-top:30rpx;" justify="between">
+			<u-row custom-style="width:300rpx;">
+				<text class="pr-20">应收</text>
+				<tpx-input v-model:value="tempObject.value.fee" _digit="5" :isWhite="true" custom-style="width: 120rpx;height: 46rpx;"
+					suffix="CNY"></tpx-input>
+			</u-row>
+			<u-row custom-style="width:300rpx;">
+				<text class="font-26 pr-20">实收</text>
+				<tpx-input v-model:value="tempObject.value.realFee" _digit="5" :isWhite="true" custom-style="width: 120rpx;height: 46rpx;"
+					suffix="CNY"></tpx-input>
+			</u-row>
+		</u-row>
+		<view class="mt-30">
+			<tpx-input v-model:value="tempObject.value.remark" placeholder="费用描述" isWhite="true"></tpx-input>
+		</view>
+	</buns-edit-sheet>
 </template>
 
 <script>
@@ -149,7 +179,9 @@
 			},
 		},
 		data() {
-			return {}
+			return {
+				costModal: { item: {}, show: false }
+			}
 		},
 		created() {
 		},
@@ -165,11 +197,12 @@
 				this.modelInfo.feeItems.splice(index, 1)
 			},
 			handleAddFee(val) {
-				this.modelInfo.feeItems.push({
+				this.costModal.show = {}
+				this.costModal.item = {
 					blAutoGen: 0, // 手动添加的费用标识
 					feeCode: val,
 					feeName: this.dicData.emis_fee_type.filter(t => t.val == val)[0].title
-				})
+				}
 			},
 			async calcWaybillFee(params = {}) {
 				let res = await apiService.calcWaybillFee({ custNo: this.modelInfo.custNo, ...params })
@@ -215,6 +248,12 @@
 					total += (+t.realFee)
 				})
 				this.modelInfo.freight = total
+			},
+			handleCostItemSure(data){
+				this.modelInfo.feeItems.push({ ...data })
+				setTimeout(()=>{
+					this.calteFreight()
+				}, 500)
 			}
 		}
 	}
diff --git a/components/tpx-dialog/tpx-dialog.vue b/components/tpx-dialog/tpx-dialog.vue
index 579023a..cb7829f 100644
--- a/components/tpx-dialog/tpx-dialog.vue
+++ b/components/tpx-dialog/tpx-dialog.vue
@@ -3,7 +3,7 @@
 		mut-bind:touchmove="true">
 		<view @touchmove.stop="" class="dialog-mask" @click="handleClose()"></view>
 		<view :class="`dialog-content ${type} pos-${closePosType}`"
-			:style="`padding: 20rpx 0rpx;background-color:${bgColor};`">
+			:style="compRootStyle">
 			<view v-if="title" style="margin-bottom: 30rpx;" >
 				<u-row @touchmove.stop="" justify="between" custom-style="padding: 0 30rpx 20rpx; 30rpx;">
 					<view class="lgd-title">{{title}}</view>
@@ -22,6 +22,13 @@
 
 <script>
 	export default {
+		computed:{
+			compRootStyle(){
+				let sty = `padding: 20rpx 0rpx;background-color:${this.bgColor};`
+				sty += `${this.rootStyle || ''};`
+				return sty
+			}
+		},
 		props: {
 			show: {
 				default () {
@@ -58,6 +65,11 @@
 					return ''
 				}
 			},
+			rootStyle: {
+				default () {
+					return ''
+				}
+			},
 			zIndex: {
 				default () {
 					return 990
diff --git a/pages/post/openorder.vue b/pages/post/openorder.vue
index 3e82298..93f3cb8 100644
--- a/pages/post/openorder.vue
+++ b/pages/post/openorder.vue
@@ -271,7 +271,7 @@
 					</template>
 				</bpe-goodphoto-tmp>
 			</view>
-			<view class="mt-30">
+			<view v-if="tempObject.value.pickupMethod == 1" class="mt-30">
 				<bpe-good-kuaidi-tmp :value="tempObject.value"></bpe-good-kuaidi-tmp>
 			</view>
 		</buns-edit-sheet>