From ebf5902bc376653e5cb88c7f0d4ccc79038f824e Mon Sep 17 00:00:00 2001
From: aihe <961836564@qq.com>
Date: Tue, 11 Jun 2024 15:22:26 +0800
Subject: [PATCH] uu

---
 .../bpe-good-kuaidi-tmp.vue                   | 97 ++++++++++---------
 components/tpx-input/tpx-input.vue            |  7 ++
 pages/deliveryDeal/qutgoingScanning.vue       |  2 +-
 pages/post/openorder.vue                      |  2 +-
 4 files changed, 58 insertions(+), 50 deletions(-)

diff --git a/components/buns-post-edit-templates/bpe-good-kuaidi-tmp.vue b/components/buns-post-edit-templates/bpe-good-kuaidi-tmp.vue
index f559fdd..be75f39 100644
--- a/components/buns-post-edit-templates/bpe-good-kuaidi-tmp.vue
+++ b/components/buns-post-edit-templates/bpe-good-kuaidi-tmp.vue
@@ -6,57 +6,58 @@
 			<tpx-text-item label="包装类型" :value="modelInfo.packType" :list="dicData.emis_tab_packing_type" ></tpx-text-item>
 		</tpx-select>
 	</view>
-	
-	<view class="edm-input-item">
-		<tpx-select v-model:value="modelInfo.prepareInExpress" :list="dicData.emis_express_code"
-			mode="drop" 
-		>
-			<tpx-text-item label="同行快递">
+	<view v-if="modelInfo.pickupMethod == 1">
+		<view class="edm-input-item">
+			<tpx-select v-model:value="modelInfo.prepareInExpress" :list="dicData.emis_express_code"
+				mode="drop" 
+			>
+				<tpx-text-item label="同行快递">
+					<template v-slot:right>
+						<tpx-input v-model:value="modelInfo.prepareInExpress" inputAlign="right"></tpx-input>
+					</template>
+				</tpx-text-item>
+			</tpx-select>
+		</view>
+		
+		<view class="edm-input-item">
+			<tpx-text-item label="快递单号">
 				<template v-slot:right>
-					<tpx-input v-model:value="modelInfo.prepareInExpress" inputAlign="right"></tpx-input>
+					<tpx-input v-model:value="modelInfo.prepareInBillCode" inputAlign="right"></tpx-input>
 				</template>
 			</tpx-text-item>
-		</tpx-select>
-	</view>
-	
-	<view class="edm-input-item">
-		<tpx-text-item label="快递单号">
-			<template v-slot:right>
-				<tpx-input v-model:value="modelInfo.prepareInBillCode" inputAlign="right"></tpx-input>
-			</template>
-		</tpx-text-item>
-	</view>
-	
-	<view class="edm-input-item">
-		<tpx-text-item label="是否需要代垫运费">
-			<template v-slot:right>
-				<u-switch v-model="modelInfo.blPrepareInFreight" activeValue="1" inactiveValue="0" active-color="#B12D29" size="34"></u-switch>
-			</template>
-		</tpx-text-item>
-	</view>
-	
-	<view v-if="modelInfo.blPrepareInFreight" class="edm-input-item">
-		<tpx-text-item label="代垫预估">
-			<template v-slot:right>
-				<tpx-input v-model:value="modelInfo.prepareInEstFee" _digit="5" inputAlign="right" suffix="CNY"></tpx-input>
-			</template>
-		</tpx-text-item>
-	</view>
-	
-	<view class="edm-input-item">
-		<tpx-text-item label="供应商">
-			<template v-slot:right>
-				<tpx-input v-model:value="modelInfo.prepareInSupplier" inputAlign="right"></tpx-input>
-			</template>
-		</tpx-text-item>
-	</view>
-	
-	<view class="edm-input-item">
-		<tpx-text-item label="自定义标记">
-			<template v-slot:right>
-				<tpx-input v-model:value="modelInfo.prepareInRemark" inputAlign="right"></tpx-input>
-			</template>
-		</tpx-text-item>
+		</view>
+		
+		<view class="edm-input-item">
+			<tpx-text-item label="是否需要代垫运费">
+				<template v-slot:right>
+					<u-switch v-model="modelInfo.blPrepareInFreight" activeValue="1" inactiveValue="0" active-color="#B12D29" size="34"></u-switch>
+				</template>
+			</tpx-text-item>
+		</view>
+		
+		<view v-if="modelInfo.blPrepareInFreight" class="edm-input-item">
+			<tpx-text-item label="代垫预估">
+				<template v-slot:right>
+					<tpx-input v-model:value="modelInfo.prepareInEstFee" _digit="5" inputAlign="right" suffix="CNY"></tpx-input>
+				</template>
+			</tpx-text-item>
+		</view>
+		
+		<view class="edm-input-item">
+			<tpx-text-item label="供应商">
+				<template v-slot:right>
+					<tpx-input v-model:value="modelInfo.prepareInSupplier" inputAlign="right"></tpx-input>
+				</template>
+			</tpx-text-item>
+		</view>
+		
+		<view class="edm-input-item">
+			<tpx-text-item label="自定义标记">
+				<template v-slot:right>
+					<tpx-input v-model:value="modelInfo.prepareInRemark" inputAlign="right"></tpx-input>
+				</template>
+			</tpx-text-item>
+		</view>
 	</view>
 	
 </template>
diff --git a/components/tpx-input/tpx-input.vue b/components/tpx-input/tpx-input.vue
index 5d1893f..f6fe819 100644
--- a/components/tpx-input/tpx-input.vue
+++ b/components/tpx-input/tpx-input.vue
@@ -2,6 +2,7 @@
 	<u-input shape="circle" :placeholder="placeholder" :modelValue="value" :clearable="clearable" 
 		:custom-style="inputStyle" :readonly="readonly" :type="type" :inputAlign="inputAlign"
 		:placeholder-style="`color: #999;${placeholderStyle};` " @change="handleChange"
+		@blur="handleFocus" @focus="handleBlur"
 		:formatter="formatter" :disabled="disabled"
 	>
 		<template v-if="suffix" #suffix>
@@ -106,6 +107,12 @@
 		unmounted() {},
 		
 		methods: {
+			handleFocus(){
+				this.$emit('focus')
+			},
+			handleBlur(){
+				this.$emit('blur')
+			},
 			handleChange(val){
 				this.$emit('change', val)
 				this.$emit('update:value', val) 
diff --git a/pages/deliveryDeal/qutgoingScanning.vue b/pages/deliveryDeal/qutgoingScanning.vue
index 9dcaee5..30ae164 100644
--- a/pages/deliveryDeal/qutgoingScanning.vue
+++ b/pages/deliveryDeal/qutgoingScanning.vue
@@ -11,7 +11,7 @@
 					</u-row>
 					<u-row custom-style="margin-top:20rpx;">
 						<view style="flex: 1;">
-							<tpx-select v-model:resObject="siteRes" :getListFun="getNextStationList" :transKeyVal="{valKey: 'destSite',titleKey: 'destSiteName'}" v-model:value="submitParam.preOrNextStationCode" :isWhite="true" placeholder="请选择下一网点"></tpx-select>
+							<tpx-select v-model:resObject="siteRes" :getListFun="getNextStationList" :transKeyVal="{valKey: 'destSite',titleKey: 'destSiteName'}" v-model:value="submitParam.preOrNextStationCode" mode="drop" placeholder="请选择下一网点"></tpx-select>
 						</view>
 					</u-row>
 					
diff --git a/pages/post/openorder.vue b/pages/post/openorder.vue
index d12447b..7cdcc0a 100644
--- a/pages/post/openorder.vue
+++ b/pages/post/openorder.vue
@@ -270,7 +270,7 @@
 					</template>
 				</bpe-goodphoto-tmp>
 			</view>
-			<view v-if="tempObject.value.pickupMethod == 1" class="mt-30">
+			<view class="mt-30">
 				<bpe-good-kuaidi-tmp :value="tempObject.value"></bpe-good-kuaidi-tmp>
 			</view>
 		</buns-edit-sheet>