From e3f7d6d4635a53aa1da614bbfdd7f587da3fcc12 Mon Sep 17 00:00:00 2001
From: whycq <913841844@qq.com>
Date: 星期六, 04 一月 2025 09:48:31 +0800
Subject: [PATCH] #

---
 pages/order/pickOrderList.vue     |   72 ++++++++++++++++++++++++++++++++----
 pages/order/orderPickConfirm2.vue |   24 ++++++++++-
 2 files changed, 85 insertions(+), 11 deletions(-)

diff --git a/pages/order/orderPickConfirm2.vue b/pages/order/orderPickConfirm2.vue
index f755424..354fd6f 100644
--- a/pages/order/orderPickConfirm2.vue
+++ b/pages/order/orderPickConfirm2.vue
@@ -206,10 +206,28 @@
 						})
 					},
 					events: {
-						sMat: function(data) {
-							_this.dataList.push(data.data)
-							console.log(data);
+						pickList: function(data) {
+							for (let k of data.data) {
+								let add = true
+								if (_this.dataList.length == 0) {
+									_this.dataList.push(k)
+									continue
+								}
+								for (let m of _this.dataList) {
+									if (k.matnr == m.matnr && k.orderNo == k.orderNo) {
+										add = false
+									}
+								}
+								if (add) {
+									k['maxCount'] = k.anfme
+									_this.dataList.push(k)
+								}
+							}
 						}
+						// sMat: function(data) {
+						// 	_this.dataList.push(data.data)
+						// 	console.log(data);
+						// }
 					}
 				})
 			},
diff --git a/pages/order/pickOrderList.vue b/pages/order/pickOrderList.vue
index 3224d7a..9515faf 100644
--- a/pages/order/pickOrderList.vue
+++ b/pages/order/pickOrderList.vue
@@ -26,8 +26,9 @@
 				
 			</view>
 			<view class="code-title">
-				<view></view>
-				<view style="width: 100%;text-align: center;margin: 16rpx 0;">{{searchValue}} 鎬绘暟閲忥細- {{total}} -</view>
+				<view style="flex: 1;"></view>
+				<view style="flex: 1;width: 100%;text-align: center;margin: 16rpx 0;">{{searchValue}} 鎬绘暟閲忥細- {{total}} -</view>
+				<view style="flex: 1;display: flex;align-items: center;"><button size="mini" type="primary" @click="allSelect()">{{seltitle}}</button></view>
 			</view>
 		</view>
 		
@@ -36,12 +37,20 @@
 				<view>No锛歿{index + 1}}</view>
 				<view>璁㈠崟鍙凤細{{orderDetl.orderNo}}</view>
 				<view>鏂欏彿锛歿{orderDetl.matnr}}</view>
+				<view>鏂欏悕锛歿{orderDetl.maktx}}</view>
 				<view>鎵瑰彿锛歿{orderDetl.batch}}</view>
 				<view>鍙敤鏁伴噺锛歿{orderDetl.count}}</view>
 			</view>
-			<view class="order__list__right" @click="addItem(orderDetl)">
-				<uni-icons type="folder-add" size="25"  color="#fff"></uni-icons>
+			<view class="order__list__right">
+				<!-- <view class="order__list__right" @click="addItem(orderDetl)"> -->
+				<label @click="checkboxChange(orderDetl)">
+					<checkbox :value="orderDetl.matnr" :checked="orderDetl.checked" style="transform:scale(0.7)" /><text></text>
+				</label>
 			</view>
+		</view>
+		<!-- 搴曢儴鎿嶄綔鎸夐挳 -->
+		<view class="buttom">
+			<button size="mini" type="primary" @click="addItems()">鎻愬彇</button>
 		</view>
 		<view style="height: 100rpx;width: 100%;text-align: center;line-height: 100rpx;">- 宸茬粡鍒板簳浜� -</view>
 	</view>
@@ -59,7 +68,8 @@
 				searchType: '鐗╂枡',
 				searchValue: '',
 				dataList: [],
-				selectedList: []
+				selectedList: [],
+				seltitle: '鍏ㄩ��'
 			}
 		},
 		onShow() {
@@ -81,6 +91,40 @@
 		},
 		methods: {
 			back() { uni.navigateBack({}) },
+			checkboxChange(e) {
+				let items = this.dataList,
+				values = e.matnr;
+				if (e.checked) {
+					this.$set(e,'checked',false)
+				} else {
+					this.$set(e,'checked',true)
+				}
+				var count = 0
+				for (let k of items) {
+					if (k.checked) {
+						count++
+					}
+				}
+				if (count == items.length && count > 0) {
+					this.seltitle = '鍙栨秷鍏ㄩ��'
+				} else {
+					this.seltitle = '鍏ㄩ��'
+				}
+			},
+			allSelect() {
+				if (this.seltitle == '鍏ㄩ��') {
+					for (let k of this.dataList) {
+						k.checked = true
+					}
+					this.seltitle = '鍙栨秷鍏ㄩ��'
+				} else {
+					for (let k of this.dataList) {
+						k.checked = false
+					}
+					this.seltitle = '鍏ㄩ��'
+				}
+				
+			},
 			set(e) {
 				var ck = this.dataList[e].checked
 				this.dataList[e].checked = ck ? false : true
@@ -121,12 +165,24 @@
 				})
 				
 			},
-			addItem(mat) {
-				this.getOpenerEventChannel().emit('sMat', {data: mat});
+			addItems() {
+				let pickList = []
+				for (let k of this.dataList) {
+					if (k.checked) {
+						pickList.push(k)
+					}
+				}
+				this.getOpenerEventChannel().emit('pickList', {data: pickList});
 				uni.navigateBack({
 					
 				})
-			}
+			},
+			// addItem(mat) {
+			// 	this.getOpenerEventChannel().emit('sMat', {data: mat});
+			// 	uni.navigateBack({
+					
+			// 	})
+			// }
 		}
 	}
 </script>

--
Gitblit v1.9.1