0925

pages/orderDetails/details.vue

@@ -1284,7 +1284,9 @@
 		computed: {
 			shouldShowFeeButton() {
 				return this.detailsData && this.currentStepIndex >= 7 &&
-					(!this.detailsData.orderStatus || this.detailsData.orderStatus == 2);
+					(!this.detailsData.orderStatus ||
+						this.detailsData.orderStatus == 2 ||
+						this.detailsData.orderStatus == 4);
 			}
 		},
 		methods: {
@@ -1847,6 +1849,7 @@
 			},
 
 			getjine(oneData) {
+				console.log('oneData', oneData)
 				if (!this.setMoney) {
 					uni.showToast({
 						title: '请输入金额',
@@ -2877,7 +2880,7 @@
 			},
 
 			// 确认挂账按钮
-			confirmCreditPayment() {
+			async confirmCreditPayment() {
 				if (!this.setMoney) {
 					uni.showToast({
 						title: '请输入挂账金额',
@@ -2896,18 +2899,76 @@
 
 				const oneData = {
 					autoRemark: autoRemarkTemp + '付款方式: 挂账, ' + '收款负责人: ' + this.selectedDispatcherName,
-					remark: this.creditRemark,
+					/* remark: this.creditRemark,
 					payType: 'qd',
 					orderSigningPersonId: this.selectedDispatcherId,
 					orderSigningPersonName: this.selectedDispatcherName,
-					orderStatus: '4',
+					orderStatus: '4', */
 				}
 				this.getjine(oneData)
 
-				this.showCreditPopup = false;
-				this.showFeePopup = false;
-				this.resetPaymentUpload();
-				this.cleanFee();
+				let data = {
+					rescueInfoId: this.id,
+					title: '司机确认收款完成',
+					images: this.paymentImages.join(','),
+					remark: this.creditRemark,
+				};
+
+				try {
+					const res = await request({
+						url: '/app/driver/uploadDetailByDriver',
+						method: 'post',
+						data: data
+					});
+
+					if (res.code == 200) {
+						this.ulImages = [];
+						this.remark = '';
+						this.fileList1 = [];
+						this.selectedOption = '';
+						uni.showToast({
+							title: '提交成功',
+							icon: 'success',
+							duration: 2000
+						});
+						let orderData = {
+							id: this.detailsData.orderId,
+							isOnline: '0',
+							payRemark: this.creditRemark,
+							payImages: this.paymentImages.join(','),
+							payType: 'qd',
+							orderStatus: '4',
+							orderSigningPersonId: this.selectedDispatcherId,
+							orderSigningPersonName: this.selectedDispatcherName,
+						}
+						this.updateOrderInfo(orderData);
+						this.detailsData.feeType = '2'
+						this.confirmadd()
+
+						// 确保在成功后再关闭弹框
+						this.showCreditPopup = false;
+						this.resetPaymentUpload();
+						this.cleanFee();
+						// 刷新数据
+						this.getrescueDetail(this.id);
+
+					} else {
+						uni.showToast({
+							title: '提交失败: ' + (res.msg || '未知错误'),
+							icon: 'none'
+						});
+					}
+				} catch (error) {
+					console.error('提交失败:', error);
+					uni.showToast({
+						title: '提交失败',
+						icon: 'none'
+					});
+
+					// 即使失败也要关闭弹框
+					this.showCreditPopup = false;
+					this.resetPaymentUpload();
+				}
 			},
 
 			// 支付凭证上传