From 225986b270cd8f041aac25596d5c7b8cf9a4ccb1 Mon Sep 17 00:00:00 2001
From: aihe <961836564@qq.com>
Date: Tue, 16 Jul 2024 23:38:15 +0800
Subject: [PATCH] uu

---
 common/api/url.js                             |  4 +-
 .../bpe-addressinfo-tmp.vue                   |  4 +-
 pages/tabBar/search/search.vue                | 46 +++++++++----------
 3 files changed, 25 insertions(+), 29 deletions(-)

diff --git a/common/api/url.js b/common/api/url.js
index a70ba27..cc6d2a9 100644
--- a/common/api/url.js
+++ b/common/api/url.js
@@ -37,14 +37,14 @@ export default {
   calcWaybillFee: `/oms2c/emisWaybill/calcWaybillFee`, // 计算运费
   warehouseInList: `/oms2c/emisWarehouseIn/listSimple`, // 下单-进仓单列表
   getOrderList: `/oms2c/emisWaybill/listSimple`, // 订单列表 -- DONE
-  getOrderDetail: `/oms2c/emisWaybill/getWaybillDetail`, // 订单详情
+  getOrderDetail: `/oms2c/emisWaybill/getWaybillDetail`, // 订单详情 -- DONE
   scanRecord: `/oms2c/emisTmsScanRecord/scan`, // 扫描-  揽收
   getRealGetWaybillPrintData: `/oms2c/emisWaybill/realGetPrintList`, // 运单 打印数据
   queryPrintListSimple: `/oms2c/emisWaybill/queryPrintListSimple`, // 运单 打印数据-列表
   getNextStationList: `/oms2c/emisTmsScanRecord/getNextStationList`, // 获取-扫描下一网点
   getPreStationList: `/oms2c/emisTmsScanRecord/getPreStationList`, // 获取-扫描上一网点
   preCalcWaybillFee: `/oms2c/emisWaybill/preCalcWaybillFee`, // 报价试算 -- DONE
-  queryWaybillTraceInfo: `/oms2c/emisTmsScanRecord/queryWaybillTraceInfo`, // 物流轨迹
+  queryWaybillTraceInfo: `/oms2c/emisTmsScanRecord/queryWaybillTraceInfo`, // 物流轨迹 -- DONE
   queryProblemTypeList: `/oms2c/emisProblemType/listSimple`, // 问题件类型列表
   registerProblemInfo: `/oms2c/emisWaybillProblemInfo/registerProblemInfo`, // 问题件登记
   queryScanWaybillList: `/oms2c/emisWaybill/queryScanWaybillList`, // 1-发件清单 2-到件清单 3-派件清单
diff --git a/components/buns-post-edit-templates/bpe-addressinfo-tmp.vue b/components/buns-post-edit-templates/bpe-addressinfo-tmp.vue
index 3ce5d5b..999de93 100644
--- a/components/buns-post-edit-templates/bpe-addressinfo-tmp.vue
+++ b/components/buns-post-edit-templates/bpe-addressinfo-tmp.vue
@@ -17,7 +17,7 @@
 				</view>
 				<view style="margin: 8rpx 0 0 0;">
 					<u-text :text="sendDetail" size="26" color="#999"></u-text>
-					<view class="font-weight mt-10 font-24">{{modelInfo.sender.company}}</view>
+					<view v-if="modelInfo.sender" class="font-weight mt-10 font-24">{{modelInfo.sender.company}}</view>
 				</view>
 			</view>
 			<view v-if="!disabled" class="flex-column-center" style="flex-shrink:0;">
@@ -56,7 +56,7 @@
 				</view>
 				<view style="margin: 8rpx 0 0 0;">
 					<u-text :text="recieverDetail" size="26" color="#999"></u-text>
-					<view class="font-weight mt-10 font-24">{{modelInfo.reciever.company}}</view>
+					<view v-if="modelInfo.reciever" class="font-weight mt-10 font-24">{{modelInfo.reciever.company}}</view>
 				</view>
 			</view>
 			<view v-if="!disabled" class="flex-column-center" style="flex-shrink:0;">
diff --git a/pages/tabBar/search/search.vue b/pages/tabBar/search/search.vue
index 0035688..981699a 100644
--- a/pages/tabBar/search/search.vue
+++ b/pages/tabBar/search/search.vue
@@ -22,12 +22,12 @@
 							</u-col>
 							<u-col span="2">
 								<!-- 更多查询条件 -->
-								<u-button :hairline="false" shape="circle" size="mini" custom-style="border-radius: 23rpx;font-size: 26rpx;height: 50rpx;">
+								<u-button @click="handleDialogClick(moreSearchModel)" :hairline="false" shape="circle" size="mini" custom-style="border-radius: 23rpx;font-size: 26rpx;height: 50rpx;">
 									<u-row justify="center">
 										<view :style="'padding-right: 4rpx;white-space: nowrap;' + (hasExtSchParam?'color: #B12D29;':'color: #666;')">
 											{{hasExtSchParam?'已':''}}筛选
 										</view>
-										<u-icon :name="showSearchMore?'arrow-up-fill':'arrow-down-fill'" 
+										<u-icon :name="moreSearchModel.show?'arrow-up-fill':'arrow-down-fill'" 
 											:color="(hasExtSchParam?'#B12D29':'#666')" size="18" custom-style="margin-top: 2rpx;"
 										></u-icon>
 									</u-row>
@@ -37,25 +37,24 @@
 					</view>
 					
 					<!-- 状态搜索 -->
-					<view v-if="showSearchMore" class="search-more-panel">
+					<view v-if="moreSearchModel.show" class="search-more-panel">
 						<view class="smp-body slideInDown animated fast">
 							<view class="smp-content">
 								<view class="pos-abt-all" style="overflow-y: auto;">
 									<view style="padding: 0 0 30rpx 0">
 										<view>
 											<u-text text="快递状态" size="28" :bold="true" margin="0 0 20rpx 0"></u-text>
-											<tpx-tags :list="dlvTypeList" v-model:value="tmpSearchParam.postStatus" ></tpx-tags>
+											<tpx-tags :list="dicData.emis_order_status" v-model:value="moreSearchModel.data.postStatus" ></tpx-tags>
 										</view>
 										
 										<view>
 											<u-text text="付款方式" size="28" :bold="true" margin="20rpx 0 20rpx 0"></u-text>	
-											<tpx-tags :list="payTypeList" v-model:value="tmpSearchParam.payType" ></tpx-tags>
+											<tpx-tags :list="dicData.emis_payment_type" v-model:value="moreSearchModel.data.payType" ></tpx-tags>
 										</view>
 										
 										<view>
 											<u-text text="时间范围" size="28" :bold="true" margin="20rpx 0 20rpx 0"></u-text>
-											<tpx-tags type="single" :list="dateTypeList" v-model:value="tmpSearchParam.dateType" @onItemClick="handleCheckDate"></tpx-tags>
-											<tpx-tags v-if="tmpSearchParam.date" type='' :list="[{title: tmpSearchParam.date}]" @onItemClick="handleSwitchCladar()" mode="primary"></tpx-tags>
+											<tpx-date-input v-model:value="moreSearchModel.data._date" placeholder="请选择时间"></tpx-date-input>
 										</view>
 									</view>
 								</view>
@@ -104,11 +103,7 @@
 				</view>
 			</template>
 		</tpx-layout>
-		
-		<!-- 日历 -->
-		<!-- @close="handleSwitchCladar()" -->
-		<!-- <u-calendar title="请选择日期范围" color="#B12D29" mode="range" rowHeight="90" closeOnClickOverlay :show="showCladar" :defaultDate="tmpSearchParam.date.split('~')" @confirm="handleClaOk" @close="handleSwitchCladar"
-		></u-calendar> -->
+	
 	</tpx-page>
 </template>
 <script>
@@ -125,14 +120,6 @@
 			},
 			hasExtSchParam() {
 				let hasExt = false
-				const searchParam = this.searchParam
-				if(
-					(searchParam.postStatus && searchParam.postStatus.length > 0)
-					|| (searchParam.payType && searchParam.payType.length > 0)
-					|| (searchParam.date || (searchParam.dateType && searchParam.dateType != dateTypeEnum.custom) )
-				) {
-					hasExt = true
-				}
 				return hasExt
 			},
 		},
@@ -140,10 +127,10 @@
 		data() {
 			let { dicData } = this.$store.getters
 			return {
-				showSearchMore: false,
 				showCladar: false,
-				tmpSearchParam: {
-					
+				moreSearchModel: {
+					data: {},
+					show: false
 				},
 				searchParam: {
 					billCode: '',
@@ -159,8 +146,6 @@
 			}
 		},
 		onShareAppMessage() {
-			return {
-			}
 		},
 		onShow(){
 			this.triggerListReload()
@@ -213,6 +198,17 @@
 			triggerListReload(){
 				this?.$refs?.listRef?.getDataList?.(true) // 重置到第一页数据
 			},
+			handleDialogClick(curModal){
+				this.moreSearchModel.data = JSON.parse(JSON.stringify(this.searchParam))
+				this.moreSearchModel.show = !this.moreSearchModel.show
+			},
+			handleResetTempSearch(){
+				this.moreSearchModel.data = JSON.parse(JSON.stringify(this.searchParam))
+			},
+			handleConfirmTempSearch(){
+				Object.assign(this.searchParam, this.moreSearchModel.data)
+				this.moreSearchModel.show = false
+			}
 		}
 	}
 </script>