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

---
 .../buns-goodinfo-sheet.vue                   |  2 +-
 .../buns-post-edit-templates/bpe-cost-tmp.vue |  2 +-
 .../bpe-good-kuaidi-tmp.vue                   |  4 ++--
 components/tpx-date-input/tpx-date-input.vue  |  2 +-
 components/tpx-select/tpx-select.vue          |  9 ++-----
 pages/goods/edit.vue                          |  8 +++----
 pages/post/freightCalculate.vue               |  4 ++--
 pages/post/openorder.vue                      | 24 +++++++++----------
 pages/tabBar/order/order.vue                  |  2 +-
 pages/user/bunsStatic.vue                     |  2 +-
 10 files changed, 27 insertions(+), 32 deletions(-)

diff --git a/components/buns-goodinfo-sheet/buns-goodinfo-sheet.vue b/components/buns-goodinfo-sheet/buns-goodinfo-sheet.vue
index faf26d7..55abe2e 100644
--- a/components/buns-goodinfo-sheet/buns-goodinfo-sheet.vue
+++ b/components/buns-goodinfo-sheet/buns-goodinfo-sheet.vue
@@ -25,7 +25,7 @@
 						<view class="dt-cont">
 							<view class="edm-input-item">
 								<tpx-select v-model:value="checkedGoodId" v-model:resObject="goodsRes" :getListFun="getGoodsList" :transKeyVal="{valKey: 'goodsCode',titleKey: 'goodsName'}" 
-									:customInput="true" mode="drop" 
+									mode="drop" 
 									:searchParam="goodsSearchParam" @onChange="handleWayChange" 
 								>
 									<u-input placeholder="物品名称" v-model="modelInfo.goodsName" font-size="26"
diff --git a/components/buns-post-edit-templates/bpe-cost-tmp.vue b/components/buns-post-edit-templates/bpe-cost-tmp.vue
index e5b5f16..31d9f22 100644
--- a/components/buns-post-edit-templates/bpe-cost-tmp.vue
+++ b/components/buns-post-edit-templates/bpe-cost-tmp.vue
@@ -32,7 +32,7 @@
 			<view v-if="item.calcExp" class="mt-10 clr-sub">计算公式: {{item.calcExp}}</view>
 		</view>
 		
-		<tpx-select v-if="feeTypeOptions.length > 0" :list="feeTypeOptions" @onChange="handleAddFee" mode="drop" customInput="true"
+		<tpx-select v-if="feeTypeOptions.length > 0" :list="feeTypeOptions" @onChange="handleAddFee" mode="drop" 
 		>
 			<u-row justify="center">
 				<u-button custom-style="border-radius: 16rpx;height:60rpx;font-size: 30rpx;margin-top: 20rpx;" :plain="true" type="primary">
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 1d80d0c..5c41432 100644
--- a/components/buns-post-edit-templates/bpe-good-kuaidi-tmp.vue
+++ b/components/buns-post-edit-templates/bpe-good-kuaidi-tmp.vue
@@ -1,7 +1,7 @@
 <template>
 	<view class="edm-input-item">
 		<tpx-select v-model:value="modelInfo.packType" :list="dicData.emis_tab_packing_type"
-			mode="drop" customInput="true"
+			mode="drop" 
 		>
 			<tpx-text-item label="包装类型" :value="modelInfo.packType" :list="dicData.emis_tab_packing_type"></tpx-text-item>
 		</tpx-select>
@@ -9,7 +9,7 @@
 	
 	<view class="edm-input-item">
 		<tpx-select v-model:value="modelInfo.prepareInExpress" :list="dicData.emis_express_code"
-			mode="drop" customInput="true"
+			mode="drop" 
 		>
 			<tpx-text-item label="同行快递">
 				<template v-slot:right>
diff --git a/components/tpx-date-input/tpx-date-input.vue b/components/tpx-date-input/tpx-date-input.vue
index da17689..4cfac6a 100644
--- a/components/tpx-date-input/tpx-date-input.vue
+++ b/components/tpx-date-input/tpx-date-input.vue
@@ -10,7 +10,7 @@
 		</u-input>
 		<view class="pos-abt-all">
 			<view v-if="showTools" @click.stop="">
-				<tpx-select :list="toolsRangesList" :value="value[0]" :customInput="true" mode="drop" @onChange="handleToolsRangChange">
+				<tpx-select :list="toolsRangesList" :value="value[0]" mode="drop" @onChange="handleToolsRangChange">
 					<view :style="`height: 64rpx;`" ></view>
 				</tpx-select>
 			</view>
diff --git a/components/tpx-select/tpx-select.vue b/components/tpx-select/tpx-select.vue
index 83712e7..543e9c8 100644
--- a/components/tpx-select/tpx-select.vue
+++ b/components/tpx-select/tpx-select.vue
@@ -1,8 +1,8 @@
 <template>
 	<view class="" style="position: relative;">
 		<view @click.stop="handleSelectSwitch">
-			<slot v-if="customInput"></slot>
-			<default-select-input v-if="!customInput" :placeholder="placeholder" :show="show" :list="filDataList" :value="value" :isWhite="isWhite" :customStyle="customStyle"></default-select-input>
+			<slot v-if="$slots.default"></slot>
+			<default-select-input v-else :placeholder="placeholder" :show="show" :list="filDataList" :value="value" :isWhite="isWhite" :customStyle="customStyle"></default-select-input>
 		</view>
 		
 		<view v-if="mode == modeEnum.sheet">
@@ -68,11 +68,6 @@
 					return ''
 				}
 			},
-			customInput: {
-				default () {
-					return false
-				}
-			},
 			minChecked: {
 				default () {
 					return 1
diff --git a/pages/goods/edit.vue b/pages/goods/edit.vue
index ce06e45..8ae9673 100644
--- a/pages/goods/edit.vue
+++ b/pages/goods/edit.vue
@@ -10,7 +10,7 @@
 				<u-line margin="20rpx 0 20rpx"></u-line>
 				<view class="edm-input-item">
 					<tpx-select v-model:value="baseFormData.type1" :list="baoguanList"
-						mode="drop" customInput="true"
+						mode="drop" 
 					>
 						<u-row justify="between">
 							<text class="font-26 font-weight">报关方式</text>
@@ -23,7 +23,7 @@
 				</view>
 				<view class="edm-input-item">
 					<tpx-select v-model:value="baseFormData.type2" :list="qingguanList"
-						mode="drop" customInput="true"
+						mode="drop" 
 					>
 						<u-row justify="between">
 							<text class="font-26 font-weight">清关方式</text>
@@ -77,7 +77,7 @@
 				<u-line margin="20rpx 0 20rpx"></u-line>
 				<view class="edm-input-item">
 					<tpx-select v-model:value="baseFormData.type1" :list="packTypeList"
-						mode="drop" customInput="true"
+						mode="drop" 
 					>
 						<u-row justify="between">
 							<text class="font-26 font-weight">包装类型</text>
@@ -90,7 +90,7 @@
 				</view>
 				<view class="edm-input-item">
 					<tpx-select v-model:value="baseFormData.type1" :list="kuaidiTypeList"
-						mode="drop" customInput="true"
+						mode="drop" 
 					>
 						<u-row justify="between">
 							<text class="font-26 font-weight">同行快递</text>
diff --git a/pages/post/freightCalculate.vue b/pages/post/freightCalculate.vue
index bf27d24..aad7bb7 100644
--- a/pages/post/freightCalculate.vue
+++ b/pages/post/freightCalculate.vue
@@ -67,7 +67,7 @@
 						
 						<view class="pt-30 pb-30" style="border-bottom: 2rpx solid #F6F6F6;;">
 							<tpx-select v-model:value="submitParam.type1" :list="baoguanList"
-								mode="drop" customInput="true"
+								mode="drop" 
 							>
 								<u-row>
 									<view>
@@ -84,7 +84,7 @@
 						
 						<view class="pt-30 pb-30" style="border-bottom: 2rpx solid #F6F6F6;;">
 							<tpx-select v-model:value="submitParam.type2" :list="qingguanList" 
-								mode="drop" customInput="true"
+								mode="drop" 
 							>
 								<u-row>
 									<view>
diff --git a/pages/post/openorder.vue b/pages/post/openorder.vue
index 53985a9..37bdbbd 100644
--- a/pages/post/openorder.vue
+++ b/pages/post/openorder.vue
@@ -39,7 +39,7 @@
 						<view>
 							<template v-if="submitParam.reciever.country && submitParam.sender.country">
 								<view class="yunf-input-item">
-									<tpx-select v-model:value="submitParam.transLine" v-model:resObject="wayRes" :getListFun="getTransLineList" :transKeyVal="{valKey: 'lineCode',titleKey: 'lineName'}" :customInput="true" 
+									<tpx-select v-model:value="submitParam.transLine" v-model:resObject="wayRes" :getListFun="getTransLineList" :transKeyVal="{valKey: 'lineCode',titleKey: 'lineName'}" 
 										:searchParam="waySearchParam" @onChange="handleWayChange" 
 									>
 										<tpx-text-item label="线路" :value="submitParam.transLine" :list="wayRes.list"></tpx-text-item>
@@ -49,7 +49,7 @@
 							
 							<template v-if="submitParam.transLine">
 								<view class="yunf-input-item">
-									<tpx-select v-model:value="submitParam.productType"  v-model:resObject="productRes" :getListFun="getTransProductList" :transKeyVal="{valKey: 'prodCode',titleKey: 'prodName'}" :isWhite="true" :customInput="true"
+									<tpx-select v-model:value="submitParam.productType"  v-model:resObject="productRes" :getListFun="getTransProductList" :transKeyVal="{valKey: 'prodCode',titleKey: 'prodName'}" :isWhite="true" 
 										:searchParam="productSearchParam"
 									>
 										<tpx-text-item label="产品类型" :value="submitParam.productType" :list="productRes.list"></tpx-text-item>
@@ -59,7 +59,7 @@
 							
 							<view class="yunf-input-item">
 								<tpx-select v-model:value="submitParam.customsEclaration" :list="dicData.emis_declare_mode"
-									mode="drop" customInput="true"
+									mode="drop" 
 								>
 									<tpx-text-item label="报关方式" :value="submitParam.customsEclaration" :list="dicData.emis_declare_mode"></tpx-text-item>
 								</tpx-select>
@@ -67,7 +67,7 @@
 							
 							<view class="yunf-input-item">
 								<tpx-select v-model:value="submitParam.customsClear" :list="dicData.emis_customs_clear"
-									mode="drop" customInput="true"
+									mode="drop" 
 								>
 									<tpx-text-item label="清关方式" :value="submitParam.customsClear" :list="dicData.emis_customs_clear"></tpx-text-item>
 								</tpx-select>
@@ -75,27 +75,27 @@
 							
 							<view class="yunf-input-item">
 								<tpx-select v-model:value="submitParam.pickupMethod" :list="dicData.emis_qujian_fangshi"
-									mode="drop" customInput="true"
+									mode="drop" 
 								>
 									<tpx-text-item label="取件方式" :value="submitParam.pickupMethod" :list="dicData.emis_qujian_fangshi"></tpx-text-item>
 								</tpx-select>
 							</view>
 							
 							<view class="yunf-input-item">
-								<tpx-select v-model:value="submitParam.operateEmployeeCode" v-model:resObject="caozuoRes" :getListFun="getOpStaffList" :transKeyVal="{valKey: 'empCode',titleKey: 'empName'}" :customInput="true">
+								<tpx-select v-model:value="submitParam.operateEmployeeCode" v-model:resObject="caozuoRes" :getListFun="getOpStaffList" :transKeyVal="{valKey: 'empCode',titleKey: 'empName'}" >
 									<tpx-text-item label="操作员" :value="submitParam.operateEmployeeCode" :list="caozuoRes.list"></tpx-text-item>
 								</tpx-select>
 							</view>
 							
 							<view class="yunf-input-item">
-								<tpx-select v-model:value="submitParam.takePieceEmployeeCode" v-model:resObject="shoupaiRes" :getListFun="getRSDStaffList" :transKeyVal="{valKey: 'empCode',titleKey: 'empName'}" :customInput="true">
+								<tpx-select v-model:value="submitParam.takePieceEmployeeCode" v-model:resObject="shoupaiRes" :getListFun="getRSDStaffList" :transKeyVal="{valKey: 'empCode',titleKey: 'empName'}" >
 									<tpx-text-item label="收派员" :value="submitParam.takePieceEmployeeCode" :list="shoupaiRes.list"></tpx-text-item>
 								</tpx-select>
 							</view>
 							
 							<view class="yunf-input-item">
 								<tpx-select v-model:value="submitParam.paymentType" :list="dicData.emis_payment_type"
-									mode="drop" customInput="true"
+									mode="drop" 
 								>
 									<tpx-text-item label="付款方式" :value="submitParam.paymentType" :list="dicData.emis_payment_type"></tpx-text-item>
 								</tpx-select>
@@ -107,7 +107,7 @@
 							</view>
 							
 							<view v-if="submitParam.paymentType == 2 || submitParam.paymentType == 4 || submitParam.paymentType == 5" class="yunf-input-item">
-								<tpx-select v-model:value="submitParam.custNo" v-model:resObject="yuejieRes" :getListFun="getMonthpayAccountList" :transKeyVal="{valKey: 'custNo',titleKey: 'custName'}" :customInput="true"
+								<tpx-select v-model:value="submitParam.custNo" v-model:resObject="yuejieRes" :getListFun="getMonthpayAccountList" :transKeyVal="{valKey: 'custNo',titleKey: 'custName'}" 
 									@onChange="handleYueJieSelect"
 								>
 									<tpx-text-item label="月结账户" :value="submitParam.custNo" :list="yuejieRes.list"></tpx-text-item>
@@ -129,7 +129,7 @@
 							</template>
 							
 							<view v-if="submitParam.transLine" class="yunf-input-item">
-								<tpx-select v-model:value="submitParam.destinationCode"  v-model:resObject="destPostRes" :getListFun="getDestPositionList" :transKeyVal="{valKey: 'destCode',titleKey: 'destName'}" :isWhite="true" :customInput="true"
+								<tpx-select v-model:value="submitParam.destinationCode"  v-model:resObject="destPostRes" :getListFun="getDestPositionList" :transKeyVal="{valKey: 'destCode',titleKey: 'destName'}" :isWhite="true" 
 									:searchParam="destPostParam" @onChange="handleDestPostChange"
 								>
 									<tpx-text-item label="目的地" :value="submitParam.destinationCode" :list="destPostRes.list"></tpx-text-item>
@@ -141,7 +141,7 @@
 							</view>
 							
 							<view class="yunf-input-item">
-								<tpx-select v-model:value="submitParam.warehouseInNo"  v-model:resObject="wareRes" :getListFun="getWarehouseInList" :transKeyVal="{valKey: 'inNo',titleKey: 'inNo'}" :isWhite="true" :customInput="true"
+								<tpx-select v-model:value="submitParam.warehouseInNo"  v-model:resObject="wareRes" :getListFun="getWarehouseInList" :transKeyVal="{valKey: 'inNo',titleKey: 'inNo'}" :isWhite="true" 
 									searchParam="" type="multiple"
 								>
 									<tpx-text-item label="进仓单" :value="submitParam.warehouseInNo" :list="wareRes.list"></tpx-text-item>
@@ -150,7 +150,7 @@
 							
 							<view class="yunf-input-item">
 								<tpx-select v-model:value="submitParam.dispatchMethod" :list="dicData.emis_tab_dispatch_mode"
-									mode="drop" customInput="true"
+									mode="drop" 
 								>
 									<tpx-text-item label="派送方式" :value="submitParam.dispatchMethod" :list="dicData.emis_tab_dispatch_mode"></tpx-text-item>
 								</tpx-select>
diff --git a/pages/tabBar/order/order.vue b/pages/tabBar/order/order.vue
index a1b0cea..cd6e9b5 100644
--- a/pages/tabBar/order/order.vue
+++ b/pages/tabBar/order/order.vue
@@ -7,7 +7,7 @@
 					<u-row justify="between">
 						<view class="clr-wht font-32 font-weight">订单概况</view>
 						
-						<tpx-select mode="drop" v-model:value="searchParam.keyword" :list="dateRangeList" customInput="true">
+						<tpx-select mode="drop" v-model:value="searchParam.keyword" :list="dateRangeList" >
 							<view style="width: 200rpx;;">
 								<u-button @click="handleSearchMoreBtn()" :hairline="false" shape="circle" size="mini" custom-style="border-radius: 23rpx;font-size: 26rpx;height: 50rpx;width: 130rpx;">
 									<u-row justify="between" custom-style="width: 100%;">
diff --git a/pages/user/bunsStatic.vue b/pages/user/bunsStatic.vue
index cdfb8e3..e83ef7d 100644
--- a/pages/user/bunsStatic.vue
+++ b/pages/user/bunsStatic.vue
@@ -4,7 +4,7 @@
 			<u-row justify="between">
 				<text class="font-30 font-weight">业务统计</text>
 				<view style="width: 146rpx;;">
-					<tpx-select mode="drop" v-model:value="searchParam.keyword" :list="dateRangeList" customInput="true">
+					<tpx-select mode="drop" v-model:value="searchParam.keyword" :list="dateRangeList" >
 						<u-button @click="handleSearchMoreBtn()" :hairline="false" shape="circle" size="mini" custom-style="border-radius: 23rpx;font-size: 26rpx;height: 50rpx;">
 							<u-row justify="between" custom-style="width: 100%;">
 								<view :style="'padding-right: 4rpx;white-space: nowrap;' + (hasExtSchParam?'color: #B12D29;':'color: #666;')">