From d092b62e141510a418b7ca5ba8d0f67b5ac201a3 Mon Sep 17 00:00:00 2001
From: aihe <961836564@qq.com>
Date: Fri, 21 Jun 2024 11:07:37 +0800
Subject: [PATCH] uu

---
 common/api/order.js                            |  7 ++++++-
 common/api/url.js                              |  1 +
 .../bo-page-cart-scan-tmp.vue                  | 18 +++++++++++-------
 .../bpe-goodstatic-tmp.vue                     |  2 +-
 4 files changed, 19 insertions(+), 9 deletions(-)

diff --git a/common/api/order.js b/common/api/order.js
index 18e914d..c7f8fc5 100644
--- a/common/api/order.js
+++ b/common/api/order.js
@@ -171,4 +171,9 @@ export const uploadWaybillAttach = (data = {})=> {
 // 生成合包号
 export const getPackNo = (data = {})=> {
 	return coreRequest(url.getPackNo, data, {})
-}
\ No newline at end of file
+}
+
+// 获取车牌号列表
+export const getCarNoList = (data = {})=> {
+	return coreRequest(url.getCarNoList, data, {})
+}
diff --git a/common/api/url.js b/common/api/url.js
index 69c3ad9..3ca90f0 100644
--- a/common/api/url.js
+++ b/common/api/url.js
@@ -55,6 +55,7 @@ export default {
   queryScanWaybillList: `/emis/emisWaybill/queryScanWaybillList`, // 1-发件清单 2-到件清单 3-派件清单
   uploadWaybillAttach: `/emis/emisWaybillAttachment/uploadWaybillAttach`, // 运单附件上传
   getPackNo: `/emis/common/getPackNo`, // 生成合包号
+  getCarNoList: `/emis/emisTmsCar/listSimple`, // 获取车牌号列表
   
 }
 
diff --git a/components/buns-order-templates/bo-page-cart-scan-tmp.vue b/components/buns-order-templates/bo-page-cart-scan-tmp.vue
index e1543bf..5def521 100644
--- a/components/buns-order-templates/bo-page-cart-scan-tmp.vue
+++ b/components/buns-order-templates/bo-page-cart-scan-tmp.vue
@@ -15,7 +15,13 @@
 				</u-row>
 				<u-row custom-style="margin-top:20rpx;">
 					<view style="flex: 1;">
-						<tpx-input v-model:value="submitParam.carNo" placeholder="车牌号" :isWhite="true"></tpx-input>
+						<tpx-select v-model:value="submitParam.carNo"  v-model:resObject="carRes" 
+							:getListFun="getCarNoList" :transKeyVal="{valKey: 'carNo',titleKey: 'carNo'}" 
+							mode="drop" 
+						>
+							<tpx-input v-model:value="submitParam.carNo" placeholder="车牌号" :isWhite="true"></tpx-input>
+						</tpx-select>
+						
 					</view>
 				</u-row>
 				<view class="mt-20">
@@ -96,12 +102,9 @@
 					billCode: { required: true, requiredMsg: '运单号不能为空' },
 				},
 				pageLoading: true,
-				resData: {
-					list: []
-				},
-				siteRes: {
-					list: []
-				},
+				resData: { list: [] },
+				siteRes: { list: [] },
+				carRes: { list: [] },
 				curScanItem: {},
 			}
 		},
@@ -110,6 +113,7 @@
 		},
 		methods: {
 			getNextStationList: apiService.getNextStationList,
+			getCarNoList: apiService.getCarNoList,
 			initData() {
 				this.submitParam.billCode = this.queryOption.billCode
 			},
diff --git a/components/buns-post-edit-templates/bpe-goodstatic-tmp.vue b/components/buns-post-edit-templates/bpe-goodstatic-tmp.vue
index 856748e..792ef77 100644
--- a/components/buns-post-edit-templates/bpe-goodstatic-tmp.vue
+++ b/components/buns-post-edit-templates/bpe-goodstatic-tmp.vue
@@ -20,7 +20,7 @@
 					<text class="clr-sub pr-10">尺寸</text>
 					{{item.length || '0'}}cm<text class="clr-sub pl-10 pr-10">*</text>
 					{{item.width || '0'}}cm<text class="clr-sub pl-10 pr-10 ">*</text>
-					{{item.length || '0'}}cm
+					{{item.height || '0'}}cm
 				</view>
 			</u-col>
 			<u-col v-if="item.nationArea" span="6">