From e6b2d108f49e2dc1d3c825704cb19e5557607420 Mon Sep 17 00:00:00 2001
From: skyouc
Date: 星期三, 06 八月 2025 10:11:35 +0800
Subject: [PATCH] PDA问题修复

---
 pages/order/orderOutConfirm.vue |   77 ++++++++++++++++++++++++++++++++++++--
 1 files changed, 72 insertions(+), 5 deletions(-)

diff --git a/pages/order/orderOutConfirm.vue b/pages/order/orderOutConfirm.vue
index a59a9cf..2470d5c 100644
--- a/pages/order/orderOutConfirm.vue
+++ b/pages/order/orderOutConfirm.vue
@@ -21,7 +21,7 @@
 		<view class="list-view">
 			<scroll-view style="overflow: hidden;overflow-y: scroll;height: auto;">
 				<checkbox-group @change="checkboxChange">
-					<label class="order__list" v-for="(item, index) in range" :key="index">
+					<label :class="item.workQty == item.anfme ? 'order__list' : 'order-list-cell'"  v-for="(item, index) in range" :key="index">
 						<view class="order__list__right">
 							<checkbox :value="item.id" :checked="item.checked" style="transform:scale(0.7)" />
 						</view>
@@ -46,7 +46,7 @@
 		<view>
 			<uni-popup ref="combConfirm" type="dialog">
 				<uni-popup-dialog :type="msgType" cancelText="鍙栨秷" confirmText="纭" :title="title" :content="content"
-					@confirm="comb" @close="combClose"></uni-popup-dialog>
+					@confirm="shippingConfirm" @close="combClose"></uni-popup-dialog>
 			</uni-popup>
 		</view>
 		<view>
@@ -69,7 +69,7 @@
 				messageText: '',
 				title: '',
 				content: '',
-				dataList: [{}],
+				shipping: [],
 				barcode: '',
 				matFocus: '',
 				value: '0',
@@ -86,7 +86,7 @@
 				let that = this
 				setTimeout(() => {
 					that.getOrderDetl()
-				}, 600)
+				}, 700)
 			},
 			/**
 			 * 鑾峰彇鍙戣揣璁㈠崟鏄庣粏淇℃伅
@@ -121,7 +121,6 @@
 						}
 					},
 					complete() {
-						that.resst()
 						that.$toast.hideLoading()
 					}
 				});
@@ -132,6 +131,7 @@
 			 */
 			resst() {
 				this.orderNo = ''
+				this.shipping = []
 			},
 			/**
 			 * checkbox閫変腑浜嬩欢
@@ -162,6 +162,60 @@
 					this.range.map(item => {
 					   return item.checked = true
 					})
+				}
+			},
+			
+			//纭鍙戣揣
+			shippinged() {
+				if (this.orderNo == undefined || this.orderNo == null || this.orderNo.trim() == '') {
+					this.messageToggle('error', '璁㈠崟缂栫爜涓嶈兘涓虹┖锛侊紒')
+					return
+				}
+				
+				let that = this
+				this.$toast.loading('鍔犺浇涓�...')
+				uni.request({
+					url: that.baseUrl + '/pda/shipping/confirm',
+					data: JSON.stringify(that.shipping),
+					method: 'POST',
+					header: {
+						'token': uni.getStorageSync('token')
+					},
+					success(result) {
+						var res = result.data
+						if (res.code === 200) {
+							that.messageToggle('success', '鍙戣揣鎴愬姛锛侊紒')
+							that.range = res.data.map(item => {
+								return {...item, checked: true}
+							})
+						} else {
+							that.messageText = res.msg
+							that.messageToggle('error')
+						}
+					},
+					complete() {
+						that.resst()
+						that.$toast.hideLoading()
+					}
+				});
+			},
+			
+			combConfirm() {
+				this.dialogToggle('dialog', '纭', '鏄惁纭鍙戣揣锛�')
+			},
+			
+			shippingConfirm(type) {
+				if (this.range == null) {
+					this.messageToggle('error', '鍙戣揣鍗曟暟鎹负绌猴紒锛�');
+					return
+				}
+				/**杩囨护鏈�変腑璁㈠崟鏄庣粏*/
+				this.shipping = this.range.filter(item => {
+					return item.checked == true
+				})
+				
+				if (this.shipping != null && this.shipping.length > 0) {
+					this.shippinged()
 				}
 			},
 			
@@ -263,6 +317,19 @@
 		background-color: #3eb689;
 		color: #FFF;
 	}
+	
+	.order-list-cell {
+		margin: 20rpx;
+		font-size: 14px;
+		border-radius: 20rpx;
+		border: 1px solid #eeeeee;
+		display: flex;
+		position: relative;
+		background-color: #FD4D11;
+		color: #FFF;
+	}
+	
+	
 	.order__list__left {
 		flex: 1;
 		padding: 20rpx;

--
Gitblit v1.9.1