From 6791877c765ceb16a3596f2184f0b7ba9e5b7134 Mon Sep 17 00:00:00 2001
From: aihe <961836564@qq.com>
Date: Thu, 13 Jun 2024 16:08:39 +0800
Subject: [PATCH] uu

---
 .../buns-edit-sheet/buns-edit-sheet.vue       |  9 ++++++--
 .../buns-order-templates/bo-operator-tmp.vue  |  2 +-
 .../buns-post-edit-templates/bpe-cost-tmp.vue | 21 +++++++++++++------
 3 files changed, 23 insertions(+), 9 deletions(-)

diff --git a/components/buns-edit-sheet/buns-edit-sheet.vue b/components/buns-edit-sheet/buns-edit-sheet.vue
index 067a6d1..03c1165 100644
--- a/components/buns-edit-sheet/buns-edit-sheet.vue
+++ b/components/buns-edit-sheet/buns-edit-sheet.vue
@@ -56,7 +56,12 @@
 					return {
 					}
 				}
-			}
+			},
+			okCloseModal: {
+				default () {
+					return true
+				}
+			},
 		},
 		data() {
 			return {
@@ -80,7 +85,7 @@
 				const val = this.submitVals
 				this.$emit('onSure', val)
 				this.$emit('update:value', val)
-				this.handleCloseModal()
+				this.okCloseModal && this.handleCloseModal()
 			}
 		}
 	}
diff --git a/components/buns-order-templates/bo-operator-tmp.vue b/components/buns-order-templates/bo-operator-tmp.vue
index e55b88d..9a7228c 100644
--- a/components/buns-order-templates/bo-operator-tmp.vue
+++ b/components/buns-order-templates/bo-operator-tmp.vue
@@ -11,7 +11,7 @@
 				<slot name="titleRight"></slot>
 			</view>
 		</u-row>
-		<u-row justify="between" custom-style="flex-wrap:wrap;">
+		<u-row v-if="false" justify="between" custom-style="flex-wrap:wrap;">
 			<u-col span="6" align="center">
 				<view class="mt-20 clr-prm font-34 font-weight">{{staticInfo.piaoNum}}</view>
 				<view class="mt-10 clr-sub font-28">总票数</view>
diff --git a/components/buns-post-edit-templates/bpe-cost-tmp.vue b/components/buns-post-edit-templates/bpe-cost-tmp.vue
index 4451375..bd51deb 100644
--- a/components/buns-post-edit-templates/bpe-cost-tmp.vue
+++ b/components/buns-post-edit-templates/bpe-cost-tmp.vue
@@ -94,27 +94,27 @@
 		</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">
+	<buns-edit-sheet percentHeight="40" :title="costModal.item.feeName" v-model:show="costModal.show" v-model:value="costModal.item" v-slot="tempObject" @onSure="handleCostItemSure" :okCloseModal="false">
 		<u-row custom-style="gap: 20rpx;margin-top:10rpx;">
 			<u-row custom-style="flex: 1">
-				<text class="font-26 pr-10">首重费</text>
+				<text class="font-26 label-text">首重费</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>
+				<text class="font-26 label-text">续重单价</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>
+				<text class="label-text">应收</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>
+				<text :class="`font-26 label-text ${tempObject.value.feeCode == '9999'?'label-text-required':''} `">实收</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>
@@ -206,6 +206,8 @@
 				}
 			},
 			async calcWaybillFee(params = {}) {
+				// calcFeeType计算入参特殊处理
+				params.calcFeeType == 3 && (params.calcFeeType = 1);
 				let res = await apiService.calcWaybillFee({ custNo: this.modelInfo.custNo, ...params })
 				this.modelInfo.feeItems = res.data.feeList
 				this.modelInfo.freight = res.data.totalFee
@@ -246,8 +248,15 @@
 				})
 				this.modelInfo.freight = total
 			},
-			handleCostItemSure(data){
+			async handleCostItemSure(data){
+				if(data.feeCode == '9999')  {
+					if(!data.realFee) {
+						this.showToast("实收不能为空")
+						return false
+					}
+				}
 				this.modelInfo.feeItems.push({ ...data })
+				this.costModal.show = false
 				setTimeout(()=>{
 					this.calteFreight()
 				}, 500)