From 0f9451ada316848bd34986222e1e1bd2265ddb2e Mon Sep 17 00:00:00 2001
From: aihe <961836564@qq.com>
Date: Mon, 27 May 2024 11:01:17 +0800
Subject: [PATCH] uu

---
 .../buns-goodinfo-sheet/buns-goodinfo-sheet.vue       |  2 +-
 components/buns-post-edit-templates/bpe-cost-tmp.vue  |  2 +-
 .../buns-post-edit-templates/bpe-good-kuaidi-tmp.vue  |  2 +-
 .../buns-post-edit-templates/bpe-gooditemsize-tmp.vue |  6 +++---
 .../buns-post-edit-templates/bpe-goodsize-tmp.vue     |  4 ++--
 components/tpx-input/tpx-input.vue                    | 11 +++++++++++
 pages/deliveryDeal/arriveList.vue                     |  6 +++---
 pages/deliveryDeal/paiList.vue                        |  6 +++---
 pages/deliveryDeal/sendList.vue                       |  6 +++---
 pages/post/freightCalculate.vue                       |  4 ++--
 10 files changed, 30 insertions(+), 19 deletions(-)

diff --git a/components/buns-goodinfo-sheet/buns-goodinfo-sheet.vue b/components/buns-goodinfo-sheet/buns-goodinfo-sheet.vue
index d0c6c0d..3454e18 100644
--- a/components/buns-goodinfo-sheet/buns-goodinfo-sheet.vue
+++ b/components/buns-goodinfo-sheet/buns-goodinfo-sheet.vue
@@ -51,7 +51,7 @@
 								<view class="edm-input-item">
 									<tpx-text-item label="物品单价">
 										<template v-slot:right>
-											<tpx-input placeholder="请填写" v-model:value="modelInfo.price" inputAlign="right" type="digit" suffix="CNY"></tpx-input>
+											<tpx-input placeholder="请填写" v-model:value="modelInfo.price" inputAlign="right" _digit="5" suffix="CNY"></tpx-input>
 										</template>
 									</tpx-text-item>
 								</view>
diff --git a/components/buns-post-edit-templates/bpe-cost-tmp.vue b/components/buns-post-edit-templates/bpe-cost-tmp.vue
index f27beb4..b6c951e 100644
--- a/components/buns-post-edit-templates/bpe-cost-tmp.vue
+++ b/components/buns-post-edit-templates/bpe-cost-tmp.vue
@@ -47,7 +47,7 @@
 		<view class="pt-20">
 			<u-row custom-style="flex: 1">
 				<text class="font-26 pr-10">总费用</text>
-				<tpx-input v-model:value="modelInfo.freight" :isWhite="true" type="digit" 
+				<tpx-input v-model:value="modelInfo.freight" :isWhite="true" _digit="5"
 					custom-style="width: 120rpx;height: 46rpx;" suffix="CNY"></tpx-input>
 			</u-row>
 		</view>
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 8c3a787..7f08afd 100644
--- a/components/buns-post-edit-templates/bpe-good-kuaidi-tmp.vue
+++ b/components/buns-post-edit-templates/bpe-good-kuaidi-tmp.vue
@@ -46,7 +46,7 @@
 			<template v-slot:right>
 				<u-input placeholder="" v-model="modelInfo.prepareInEstFee" inputAlign="right"
 					custom-style="width: 366rpx;flex: none;border:0;border-radius: 10rpx;background-color: #F6F6F6;padding: 11rpx 20rpx;" 
-					placeholder-style="color: #999; " type="digit"
+					placeholder-style="color: #999; " _digit="5"
 				>
 					<template #suffix>
 						<text class="font-26 clr-sub pl-10">CNY</text>
diff --git a/components/buns-post-edit-templates/bpe-gooditemsize-tmp.vue b/components/buns-post-edit-templates/bpe-gooditemsize-tmp.vue
index 617373f..026dc22 100644
--- a/components/buns-post-edit-templates/bpe-gooditemsize-tmp.vue
+++ b/components/buns-post-edit-templates/bpe-gooditemsize-tmp.vue
@@ -7,13 +7,13 @@
 				<view style="width: 70%;">
 					<u-row justify="between">
 						<u-col span="3.7">
-							<tpx-input v-model:value="modelInfo.length" @change="calculateVplume" placeholder="长" inputAlign="right" suffix="cm"  type="digit"></tpx-input>
+							<tpx-input v-model:value="modelInfo.length" @change="calculateVplume" placeholder="长" inputAlign="right" suffix="cm"  _digit="5"></tpx-input>
 						</u-col>
 						<u-col span="3.7">
-							<tpx-input v-model:value="modelInfo.width" @change="calculateVplume" placeholder="宽" inputAlign="right" suffix="cm" type="digit"></tpx-input>
+							<tpx-input v-model:value="modelInfo.width" @change="calculateVplume" placeholder="宽" inputAlign="right" suffix="cm" _digit="5"></tpx-input>
 						</u-col>
 						<u-col span="3.7">
-							<tpx-input v-model:value="modelInfo.height" @change="calculateVplume" placeholder="高" inputAlign="right" suffix="cm" type="digit"></tpx-input>
+							<tpx-input v-model:value="modelInfo.height" @change="calculateVplume" placeholder="高" inputAlign="right" suffix="cm" _digit="5"></tpx-input>
 						</u-col>
 					</u-row>
 				</view>				
diff --git a/components/buns-post-edit-templates/bpe-goodsize-tmp.vue b/components/buns-post-edit-templates/bpe-goodsize-tmp.vue
index 10dcb45..6af4723 100644
--- a/components/buns-post-edit-templates/bpe-goodsize-tmp.vue
+++ b/components/buns-post-edit-templates/bpe-goodsize-tmp.vue
@@ -12,7 +12,7 @@
 			<u-row justify="between">
 				<text class="font-28 font-weight">包裹重量</text>
 				<view>
-					<tpx-input v-model:value="modelInfo.billWeight" placeholder="" inputAlign="right" suffix="kg" type="digit"></tpx-input>
+					<tpx-input v-model:value="modelInfo.billWeight" placeholder="" inputAlign="right" suffix="kg" _digit="5"></tpx-input>
 				</view>
 			</u-row>
 		</view>
@@ -21,7 +21,7 @@
 			<u-row justify="between" align="top">
 				<text class="font-28 pt-20 font-weight">总体积</text>
 				<view v-if="totalVolume || true">
-					<tpx-input v-model:value="modelInfo.totalVolume" placeholder="" inputAlign="right" suffix="m³" type="digit"></tpx-input>
+					<tpx-input v-model:value="modelInfo.totalVolume" placeholder="" inputAlign="right" suffix="m³" _digit="5"></tpx-input>
 				</view>				
 			</u-row>
 		</view>
diff --git a/components/tpx-input/tpx-input.vue b/components/tpx-input/tpx-input.vue
index 296c514..8f3811a 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"
+		:formatter="formatter"
 	>
 		<template v-if="suffix" #suffix>
 			<text class="font-26 clr-sub pl-10">{{suffix}}</text>
@@ -55,6 +56,8 @@
 					return ''
 				}
 			},
+			_digit:{ // 保留小数位
+			},
 			customStyle:{
 				default () {
 					return ''
@@ -88,6 +91,14 @@
 			handleChange(val){
 				this.$emit('change', val)
 				this.$emit('update:value', val) 
+			},
+			formatter(val) {
+				if(this._digit) {
+					let reg = new RegExp(`^\\d*(\\.?\\d{0,${this._digit}})`, 'g')
+					let newVal = val.match(reg)[0]
+					return newVal
+				}
+				return val
 			}
 		}
 	}
diff --git a/pages/deliveryDeal/arriveList.vue b/pages/deliveryDeal/arriveList.vue
index 09476fa..04c9291 100644
--- a/pages/deliveryDeal/arriveList.vue
+++ b/pages/deliveryDeal/arriveList.vue
@@ -80,6 +80,7 @@
 				searchParam: {
 					billCode: '',
 					_date: [],
+					scanStatTyp: 2 // 到件
 				},
 				resData: { list: [] }
 			}
@@ -97,9 +98,8 @@
 		methods: {
 			async getListFun(param){
 				let cpParam = JSON.parse(JSON.stringify(param))
-				cpParam['params.scanStatType'] = 2 // 到件
-				cpParam['params.beginScanDate'] = cpParam._date[0]
-				cpParam['params.endScanDate'] = cpParam._date[1]
+				cpParam.beginScanDate = cpParam._date[0]
+				cpParam.endScanDate = cpParam._date[1]
 				let res = await apiService.queryScanWaybillList(cpParam)
 				return res
 			},
diff --git a/pages/deliveryDeal/paiList.vue b/pages/deliveryDeal/paiList.vue
index a4ea1f1..0934d1d 100644
--- a/pages/deliveryDeal/paiList.vue
+++ b/pages/deliveryDeal/paiList.vue
@@ -80,6 +80,7 @@
 				searchParam: {
 					billCode: '',
 					_date: [],
+					scanStatType: 3, // 派件
 				},
 				resData: { list: [] }
 			}
@@ -97,9 +98,8 @@
 		methods: {
 			async getListFun(param){
 				let cpParam = JSON.parse(JSON.stringify(param))
-				cpParam['params.scanStatType'] = 3 // 派件
-				cpParam['params.beginScanDate'] = cpParam._date[0]
-				cpParam['params.endScanDate'] = cpParam._date[1]
+				cpParam.beginScanDate = cpParam._date[0]
+				cpParam.endScanDate = cpParam._date[1]
 				let res = await apiService.queryScanWaybillList(cpParam)
 				return res
 			},
diff --git a/pages/deliveryDeal/sendList.vue b/pages/deliveryDeal/sendList.vue
index 04f1d69..589487e 100644
--- a/pages/deliveryDeal/sendList.vue
+++ b/pages/deliveryDeal/sendList.vue
@@ -80,6 +80,7 @@
 				searchParam: {
 					billCode: '',
 					_date: [],
+					scanStatType: 1, // 发件
 				},
 				resData: { list: [] }
 			}
@@ -97,9 +98,8 @@
 		methods: {
 			async getListFun(param){
 				let cpParam = JSON.parse(JSON.stringify(param))
-				cpParam['params.scanStatType'] = 1 // 发件
-				cpParam['params.beginScanDate'] = cpParam._date[0]
-				cpParam['params.endScanDate'] = cpParam._date[1]
+				cpParam.beginScanDate = cpParam._date[0]
+				cpParam.endScanDate = cpParam._date[1]
 				let res = await apiService.queryScanWaybillList(cpParam)
 				return res
 			},
diff --git a/pages/post/freightCalculate.vue b/pages/post/freightCalculate.vue
index b89d67a..42a0746 100644
--- a/pages/post/freightCalculate.vue
+++ b/pages/post/freightCalculate.vue
@@ -64,7 +64,7 @@
 							<view class="yunf-input-item" >
 								<tpx-text-item label="重量">
 									<template v-slot:right>
-										<tpx-input v-model:value="submitParam.billWeight"  placeholder="" inputAlign="right" suffix="kg" type="digit"></tpx-input>
+										<tpx-input v-model:value="submitParam.billWeight"  placeholder="" inputAlign="right" suffix="kg" _digit="5"></tpx-input>
 									</template>
 								</tpx-text-item>
 							</view>
@@ -72,7 +72,7 @@
 							<view class="yunf-input-item" >
 								<tpx-text-item label="体积">
 									<template v-slot:right>
-										<tpx-input v-model:value="submitParam.totalVolume"  placeholder="" inputAlign="right" suffix="m³" type="digit"></tpx-input>
+										<tpx-input v-model:value="submitParam.totalVolume"  placeholder="" inputAlign="right" suffix="m³" _digit="5"></tpx-input>
 									</template>
 								</tpx-text-item>
 							</view>