From 736b2dcb48735b65701030901ed01fc5f0aed8c2 Mon Sep 17 00:00:00 2001
From: skyouc
Date: 星期一, 13 一月 2025 20:36:44 +0800
Subject: [PATCH] # 1. 添加自定义toast组件     2. 上架商品不显示问题修复     3. 播种库位订单绑定功能

---
 pages/pakin/pakin.vue |   60 ++++++++++++++++++++++++++++++++++++++++++------------------
 1 files changed, 42 insertions(+), 18 deletions(-)

diff --git a/pages/pakin/pakin.vue b/pages/pakin/pakin.vue
index 0090ff2..97f9cac 100644
--- a/pages/pakin/pakin.vue
+++ b/pages/pakin/pakin.vue
@@ -14,19 +14,25 @@
 					<text style="text-align: right;color: #409EFF;" @click="findMat()">鎻愬彇+</text>
 					<uni-icons type="right" color="#c1c1c1"></uni-icons>
 				</view>
-			</view>
+			</view>
+			<uni-section title="鍟嗗搧鍒楄〃" type="line" class="mat-list-title"></uni-section>
 		</view>
-		<view class="mat-list-title">
-			<div>鍟嗗搧鍒楄〃</div>
+		<view class="list-view">
 			<scroll-view>
 				<view class="list" v-for="(item,i) in dataList" :key="i">
 					<view class="list-left">
 						<view class="list-left-item">
 							<view class="desc">No锛�</view>
 							<view class="left-item">{{i + 1}}</view>
+						</view>
+						<view class="list-left-item">
+							<view class="desc">璁㈠崟鍙凤細</view>
+							<view class="left-item">
+								<uni-tag :text="item.orderNo" type="normal"></uni-tag>
+							</view>
 						</view>
 						<view class="list-left-item">
-							<view class="desc">缂栫爜锛�</view>
+							<view class="desc">鐗╂枡鐮侊細</view>
 							<view class="left-item">
 								<uni-tag :text="item.matnr" type="primary"></uni-tag>
 							</view>
@@ -215,7 +221,8 @@
 				}
 			},
 		
-			checkMat(mat) {
+			checkMat(mat) {
+				console.log(mat)
 				var len = this.dataList.length
 				var add = true ,sameItem = false
 				for (var i = 0; i < len; i++) {
@@ -224,7 +231,8 @@
 							if (mat.batch == this.dataList[j].batch) {
 								sameItem = true
 							}
-						}
+						}
+						
 						// 鐩稿悓鐗╂枡 涓嶅悓鎵瑰彿  鏂板姞鍒楄〃
 						if (mat.batch != this.dataList[i].batch) {
 							this.$forceUpdate() // 寮哄埗鍒锋柊
@@ -234,11 +242,17 @@
 								add = true
 							}
 							
-						} else {
-							// 鐩稿悓鐗╂枡鐩稿悓鎵瑰彿 鏁伴噺绱姞
-							this.dataList[i].mergeNum += mat.mergeNum
-							this.$forceUpdate() // 寮哄埗鍒锋柊
-							add = false
+						} else {
+							// 鐩稿悓鐗╂枡锛岀浉鍚屾壒鍙凤紝涓嶅悓璁㈠崟鍙�
+							if (mat.orderNo != this.dataList[i].orderNo) {
+								this.$forceUpdate() 
+								add = true
+							} else {
+								// 鐩稿悓鐗╂枡鐩稿悓鎵瑰彿 鏁伴噺绱姞
+								this.dataList[i].mergeNum += mat.mergeNum
+								this.$forceUpdate() // 寮哄埗鍒锋柊
+								add = false
+							}
 						}
 					}
 				}
@@ -389,17 +403,30 @@
 </script>
 
 <style>
-	@import url('../../static/css/wms.css/wms.css');
+	@import url('../../static/css/wms.css/wms.css');
+	
+	.uni-section {
+		margin-top: 0rpx;
+
+		.uni-section__content-title {
+			font-size: 16px !important;
+		}
+	}
 
 	.list {
 		border-radius: unset;
 		margin: auto;
 		margin-top: 20rpx;
 		padding: 10rpx;
+	}
+	
+	.list-view {
+		width: 100%;
+		position: relative;
 	}
 
 	.list:first-child {
-		margin-top: 20rpx;
+		margin-top: 320rpx;
 	}
 	.code {
 		width: 100%;
@@ -443,11 +470,8 @@
 		line-height: 80rpx;
 		width: 100%;
 		background-color: white;
-		position: fixed;
-		margin-top: 200rpx;
+		position: relative;
+		font-weight: 500;
 		z-index: 9;
-		/* border-top: 1px solid #DCDFE6; */
-		text-align: center;
-		/* box-shadow: 0px 0px 10px 0px rgba(0, 0, 0, 0.2); */
 	}
 </style>

--
Gitblit v1.9.1