From 5a0d10cd14a76acfe6cf2f1b9f8fb16de8311754 Mon Sep 17 00:00:00 2001
From: Double-_-Z <2492419643@qq.com>
Date: Wed, 20 Aug 2025 13:14:27 +0800
Subject: [PATCH] =?UTF-8?q?=E8=AE=A2=E5=8D=95=E8=B0=83=E6=95=B4?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 aircraft/server/order/add.vue    |  4 ++--
 aircraft/server/order/detail.vue | 25 ++++++++++++++-----------
 2 files changed, 16 insertions(+), 13 deletions(-)

diff --git a/aircraft/server/order/add.vue b/aircraft/server/order/add.vue
index 42e885c..c8ac373 100644
--- a/aircraft/server/order/add.vue
+++ b/aircraft/server/order/add.vue
@@ -40,11 +40,11 @@
 						</w-select>
 					</u-form-item>
 					<u-form-item prop="cargoWeight" required label="货物重量：" :border-bottom="false">
-						<u-input class="field-ninput" type="number" placeholder="请输入货物重量（最多保留两位小数）" v-model.number="form.cargoWeight" />
+						<u-input class="field-ninput" type="digit" placeholder="请输入货物重量（最多保留两位小数）" v-model.number="form.cargoWeight" />
 						<view slot="right" class="field-input-right">KG</view>
 					</u-form-item>
 					<u-form-item prop="surchargeAmount" label="附加费：" :border-bottom="false">
-						<u-input type="number" class="field-ninput" placeholder="请输入附加费（最多保留两位小数）" v-model.number="form.surchargeAmount" />
+						<u-input type="digit" class="field-ninput" placeholder="请输入附加费（最多保留两位小数）" v-model.number="form.surchargeAmount" />
 						<view slot="right" class="field-input-right">元</view>
 					</u-form-item>
 					<u-form-item prop="operatorIds" label="操作员：" required :border-bottom="false">
diff --git a/aircraft/server/order/detail.vue b/aircraft/server/order/detail.vue
index 0a9a979..cd5313b 100644
--- a/aircraft/server/order/detail.vue
+++ b/aircraft/server/order/detail.vue
@@ -33,11 +33,11 @@
 					</view>
 					<view class="mc-lam">
 						<text class="lam-title">货物重量</text>
-						<text class="lam-value">{{ orderDetail.cargoWeight }} KG</text>
+						<text class="lam-value">{{ orderDetail.cargoWeight?orderDetail.cargoWeight.toFixed(2):'-' }} KG</text>
 					</view>
 					<view class="mc-lam">
 						<text class="lam-title">附加费</text>
-						<text class="lam-value"><text>{{ orderDetail.surchargeAmount }}</text>元</text>
+						<text class="lam-value"><text>{{ orderDetail.surchargeAmount?orderDetail.surchargeAmount.toFixed(2):'-' }}</text>元</text>
 					</view>
 				</view>
 			</view>
@@ -103,7 +103,7 @@
 						<u-button :custom-style="{...deleteCustomStyle,opacity: disabledDeleteAction(item)?0.7:1}" style="margin-left: auto;"
 						:hair-line="false" @click="handleDeleteAction(item)" :disabled="disabledDeleteAction(item)">删除</u-button>
 						<u-button type="warning" :custom-style="{...customStyle,opacity: disabledChangeState(item)?0.7:1}" style="margin-left: 20rpx;margin-right: 30rpx;"
-						:hair-line="false" @click="handleChangeAction(item)" :disabled="disabledChangeState(item)">更改状态</u-button>
+						:hair-line="false" @click="handleChangeAction(index)" :disabled="disabledChangeState(item)">更改状态</u-button>
 					</view>
 					<view class="action-btns" v-else />
 				</view>
@@ -149,7 +149,7 @@
 						<view class="lam-title">载货重量</view>
 						<u-input class="lam-input" placeholder-style="font-size:32rpx;color:#B3B3B3;"
 						custom-style="font-size:32rpx;" v-model.number="form.cargoWeight"
-						placeholder="请填写重量" type="number" :clearable="false" />
+						placeholder="请填写重量" type="digit" :clearable="false" />
 						<view class="lam-input-right">KG</view>
 					</view>
 					<view class="action-lamx">
@@ -216,10 +216,11 @@
 			<view class="slot-content">
 				<u-input placeholder="请选择任务状态" v-model="stateForm.taskStatusName"
 				@click="()=>{showChangeStatePick = true}" type="select"/>
-				<u-picker mode="selector" v-model="showChangeStatePick" :default-selector="getDefaultStateSelector" :range="stateList"
-				range-key="value" confirm-color="#f7c04d" title="飞行任务状态" @confirm="handleClickState"></u-picker>
 			</view>
 		</u-modal>
+		<u-select v-model="showChangeStatePick" mode="single-column" :list="stateList"
+		value-name="key" label-name="value" :default-value="getDefaultStateSelector"
+		confirm-color="#f7c04d" title="飞行任务状态" @confirm="handleClickState"></u-select>
 		<u-back-top :scrollTop="scrollTop" zIndex="100" :duration="500"
 		:iconStyle="{ color: '#fff' }" :customStyle="{background: 'linear-gradient(180deg, #f8b500 0%, #fceabb 100%)',
 		boxShadow: '0rpx 0rpx 12rpx rgba(202,202,182,0.5)',
@@ -449,10 +450,10 @@ export default {
 			this.form[valueForm.name] = val?.value || '';
 		},
 		// 选择飞行任务状态
-		handleClickState(index){
-			const val = this.stateList[index[0]];
-			this.stateForm.taskStatus = val.key;
-			this.stateForm.taskStatusName = val.value;
+		handleClickState(e){
+			const val = e[0];
+			this.stateForm.taskStatus = val.value;
+			this.stateForm.taskStatusName = val.label;
 		},
 		// 保存任务
 		async handleSave(){
@@ -559,7 +560,9 @@ export default {
 			})
 		},
 		// 更改任务状态
-		handleChangeAction({id, orderItemStatus}){
+		handleChangeAction(index){
+			const {id, orderItemStatus} = 
+			this.orderDetail.orderTaskDetailList[index];
 			this.stateForm = {
 				orderTaskId: id,
 				oldStatus: orderItemStatus,