From 51534acc576690f4dc7a2732f7efae77a6e70272 Mon Sep 17 00:00:00 2001
From: aihe <961836564@qq.com>
Date: Wed, 19 Jun 2024 23:45:37 +0800
Subject: [PATCH] uu

---
 pages/post/freightCalculate.vue | 23 ++++++++++++++++++++---
 pages/tms/unpackingScanning.vue |  6 +++---
 2 files changed, 23 insertions(+), 6 deletions(-)

diff --git a/pages/post/freightCalculate.vue b/pages/post/freightCalculate.vue
index bb8fb1e..aba7ae6 100644
--- a/pages/post/freightCalculate.vue
+++ b/pages/post/freightCalculate.vue
@@ -84,6 +84,24 @@
 									</template>
 								</tpx-text-item>
 							</view>
+							
+							<view class="yunf-input-item" >
+								<tpx-text-item label="计费方式">
+									<template v-slot:right>
+										<view style="display: inline-block;">
+											<u-radio-group v-model="submitParam.calcFeeType" custom-style="justify-content:end;">
+												<view v-for="(item, index) in dicData.emis_calc_fee_type">
+													<u-radio
+														v-if="item.val == 1 || item.val == 2"
+														:label="item.title" :name="item.val" activeColor="#B12D29" size="30" labelSize="26"
+														:custom-style="`margin-right: ${index+1<dicData.emis_calc_fee_type.length?30:0}rpx;`">
+													</u-radio>
+												</view>
+											</u-radio-group>
+										</view>
+									</template>
+								</tpx-text-item>
+							</view>
 						</view>
 					</view>
 				
@@ -228,7 +246,7 @@
 						},
 						transLine: "", // 线路编码
 						productType: "", // 产品类型code
-						calcFeeType: "", // 计费类型 1-重量计费 2-体积计费
+						calcFeeType: "1", // 计费类型 1-重量计费 2-体积计费
 						billWeight: "", // 实际重量
 						totalVolume: "", // 总体积
 						dispatchUnderlingSiteCode: "", // 目的地站点
@@ -285,7 +303,6 @@
 			},
 			async handleCalPost(type) {
 				let params = JSON.parse(JSON.stringify(this.submitParam));
-				params.calcFeeType = 1 // "计费类型 1-重量计费 2-体积计费"
 				let res = await apiService.preCalcWaybillFee({ ...params, _loading: true })
 				this.proTypeList = res.data || []
 				if(this.proTypeList.length > 0) {
@@ -328,7 +345,7 @@
 		}
 	}
 	.yunf-input-item{
-		padding: 26rpx 0;
+		padding: 20rpx 0;
 		border-bottom: 2rpx solid #F6F6F6;
 	}
 </style>
\ No newline at end of file
diff --git a/pages/tms/unpackingScanning.vue b/pages/tms/unpackingScanning.vue
index 699cbe7..a6eac10 100644
--- a/pages/tms/unpackingScanning.vue
+++ b/pages/tms/unpackingScanning.vue
@@ -9,11 +9,11 @@
 								@change="handleScanValChange" iconPos="left"></tpx-scan-input>
 						</view>
 					</u-row>
-					<u-row custom-style="margin-top:20rpx;">
+					<!-- <u-row custom-style="margin-top:20rpx;">
 						<view style="flex: 1;">
 							<tpx-select v-model:resObject="siteRes" :getListFun="getPreStationList" :transKeyVal="{valKey: 'destSite',titleKey: 'destSiteName'}" v-model:value="submitParam.preOrNextStationCode" mode="drop" placeholder="请选择上一网点"></tpx-select>
 						</view>
-					</u-row>
+					</u-row> -->
 				</view>
 				
 				<view class="blcok-white-noradius">
@@ -72,7 +72,7 @@
 					preOrNextStationCode: '',
 				},
 				submitValidConfig: {
-					preOrNextStationCode: { required: true, requiredMsg: '请选择上一网点' },
+					// preOrNextStationCode: { required: true, requiredMsg: '请选择上一网点' },
 					billCode: { required: true, requiredMsg: '运单号不能为空' },
 				},
 			}