0930

pages/orderDetails/details.vue

@@ -516,6 +516,55 @@
 				</view>
 			</view>
 		</u-popup>
+
+		<u-popup :show="orderCompleteShow" mode="center" :round="10">
+			<view class="popup-box">
+				<view class="p-title">描述</view>
+				<!-- <view class="huinput" @click="gettype"> -->
+				<view class="huinput">
+					<text>节点：</text>
+					<text class="tshe">{{ dictLabel }}</text>
+				</view>
+				<view class="huinput">
+					<text>救援结束车辆里程数: </text>
+					<u--textarea v-model="detailsData.endScale" placeholder="请输入车辆里程数" border="bottom"
+						autoHeight></u--textarea>
+				</view>
+				<view class="huinput">
+					<text>故障车车牌号: </text>
+					<u--textarea v-model="detailsData.licenseNum" placeholder="请输入故障车车牌号" border="bottom"
+						autoHeight></u--textarea>
+				</view>
+				<view class="huinput">
+					<text>备注信息：</text>
+					<u--textarea v-model="remark" placeholder="请输入备注" border="bottom" autoHeight></u--textarea>
+				</view>
+
+				<!-- 上传状态提示 -->
+				<view class="upload-tips" v-if="uploadingRecord">
+					<u-loading-icon size="20" color="#0D2E8D"></u-loading-icon>
+					<text>图片上传中，请稍候...</text>
+				</view>
+
+
+				<view class="p-title">现场图片</view>
+				<view class="huinput">
+					<u-upload :fileList="fileList1" @afterRead="afterRead" @delete="deletePic" name="1" multiple
+						:maxCount="5" :disabled="uploadingRecord"></u-upload>
+				</view>
+
+				<view class="button-group">
+					<view class="cancel-button" @click="cancelOrderComplete" :disabled="uploadingRecord">
+						<text>取消</text>
+					</view>
+					<view class="confirm-button" @click="getdaoda()" :disabled="isSubmitting || uploadingRecord">
+						<!-- <text>确认</text> -->
+						<text>{{ isSubmitting ? '处理中...' : '确认' }}</text>
+					</view>
+				</view>
+			</view>
+		</u-popup>
+
 		<u-popup :show="toRepairShow" mode="center" :round="10" @close="closeRepairPopup">
 			<view class="popup-box repair-popup">
 				<view class="p-title title-content-s">转维修信息</view>
@@ -1261,7 +1310,8 @@
 						label: '否',
 						value: 0
 					},
-				]
+				],
+				orderCompleteShow: false,
 
 			}
 		},
@@ -1701,16 +1751,13 @@
 				}
 				this.rescueId = id;
 				if (this.recordSteps.length > 0) {
-					console.log('this.recordSteps', this.recordSteps)
-					console.log('this.currentStepIndex', this.currentStepIndex)
-					console.log('this.currentStepIndex - 1', this.currentStepIndex - 1)
 					this.dictValue = this.recordSteps[this.currentStepIndex - 1].value;
 					this.dictLabel = this.recordSteps[this.currentStepIndex - 1].label;
-					console.log('this.dictValue', this.dictValue)
-					console.log('this.dictLabel', this.dictLabel)
 				}
 				if (this.currentStepIndex === 2) {
 					this.acceptOrderShow = true;
+				} else if (this.currentStepIndex === 7) {
+					this.orderCompleteShow = true
 				} else {
 					this.recordShow = true;
 				}
@@ -1724,6 +1771,15 @@
 				this.ulImages = [];
 			},
 
+
+			cancelOrderComplete() {
+				this.orderCompleteShow = false;
+				this.remark = ''; // 清空备注
+				this.fileList1 = []; // 清空图片列表
+				this.selectedOption = '';
+				this.ulImages = [];
+			},
+
 			deletePic(event) {
 				// 从 fileList 中删除
 				this[`fileList${event.name}`].splice(event.index, 1);
@@ -2172,6 +2228,8 @@
 						if (this.currentStepIndex == 7) {
 							updateData.rescueEndTime = new Date();
 							updateData.rescueStatus = '4';
+							updateData.endScale = this.detailsData.endScale;
+							updateData.licenseNum = this.detailsData.licenseNum;
 						}
 
 						// 更新下一步显示
@@ -2192,6 +2250,9 @@
 
 						// 刷新订单详情
 						this.recordShow = false;
+						if (this.currentStepIndex == 7) {
+							this.orderCompleteShow = false;
+						}
 						this.getrescueDetail(this.rescueId);
 					} else {
 						throw new Error(`API返回错误代码: ${res.code}`);
@@ -2535,6 +2596,21 @@
 					});
 					return;
 				}
+				if (this.currentStepIndex === 7 && (!this.detailsData.licenseNum || this.detailsData.licenseNum
+						.trim() === '')) {
+					uni.showToast({
+						title: '请填写故障车车牌号',
+						icon: 'none'
+					})
+					return
+				}
+				if (this.currentStepIndex === 7 && !this.detailsData.endScale) {
+					uni.showToast({
+						title: '请填写车辆里程',
+						icon: 'none'
+					})
+					return
+				}
 				if (this.ulImages.length === 0 && this.currentStepIndex != 6) {
 					uni.showToast({
 						title: '请上传图片',