From a16fafee33301a5132bc9e5997c198a3bf8da712 Mon Sep 17 00:00:00 2001
From: whycq <913841844@qq.com>
Date: 星期一, 13 五月 2024 19:14:39 +0800
Subject: [PATCH] #

---
 static/css/common/order.css            |    2 +-
 pages/phyz/stationManage/pickAgain.vue |   33 ++++++++++++++++++++++++++++++---
 2 files changed, 31 insertions(+), 4 deletions(-)

diff --git a/pages/phyz/stationManage/pickAgain.vue b/pages/phyz/stationManage/pickAgain.vue
index dfd1b5c..3c22660 100644
--- a/pages/phyz/stationManage/pickAgain.vue
+++ b/pages/phyz/stationManage/pickAgain.vue
@@ -8,6 +8,7 @@
 				<view>鍚嶇О锛歿{orderDetl.maktx}}</view>
 				<view>搴撳瓨鏁伴噺锛歿{orderDetl.anfme}}</view>
 				<view>璁㈠崟鍙嚭鏁伴噺锛歿{orderDetl.stock}}</view>
+				<view>宸叉嫞鏁伴噺锛歿{orderDetl.pickedAnfme}}</view>
 				<view>鎷f枡鏁伴噺锛歿{orderDetl.count}}</view>
 			</view>
 			<view class="list-right" @click="addItem(index)">
@@ -51,7 +52,8 @@
 				count: 0,
 				maxCount: 0,
 				wrkNo: '',
-				locNo: ''
+				locNo: '',
+				pickedAnfme: 0
 			}
 		},
 		onShow() {
@@ -85,6 +87,8 @@
 						res = res.data
 						console.log(res);
 						if (res.code === 200) {
+							_this.chosed(_this.pickList,res.data.records)
+							return
 							let enbleList = [], isfl;
 							for (let k of res.data.records) {
 								isfl = false;
@@ -120,8 +124,31 @@
 				})
 			},
 			// 宸查�夋嫞鏂欏垪琛�
-			orderCar() {
-				
+			chosed(wrkDetls,locDetls) {
+				let isfl = false, enbleList = []
+				for (let locDetl of locDetls) {
+					locDetl['color'] = 'order-sts-start'
+					locDetl['pickedAnfme'] = 0
+					locDetl['count'] = 0
+					for (let wrkDetl of wrkDetls) {
+						if (wrkDetl.threeCode == locDetl.threeCode && wrkDetl.matnr == locDetl.matnr) {
+							locDetl['pickedAnfme'] = wrkDetl.anfme
+							if (locDetl.stock == -1) {
+								locDetl.stock = 0
+							}
+							if (wrkDetl.anfme < locDetl.anfme) {
+								locDetl['color'] = 'order-sts-working'
+								locDetl['pickedAnfme'] = wrkDetl.anfme
+								locDetl['count'] = 0
+							} else {
+								locDetl['color'] = 'order-sts-end'
+							}
+							break
+						} 
+					}
+					
+				}
+				this.dataList = locDetls
 			},
 			// 娣诲姞鍏ュ簱鍟嗗搧鑷� 寰呯粍鎵樺垪琛�
 			addItem(index) {
diff --git a/static/css/common/order.css b/static/css/common/order.css
index 60d37f4..e8ecb55 100644
--- a/static/css/common/order.css
+++ b/static/css/common/order.css
@@ -15,7 +15,7 @@
 	}
 	.list {
 		margin: 20rpx;
-		
+		font-size: 14px;
 		background-color: #fff;
 		border-radius: 20rpx;
 		border: 1px solid #eeeeee;

--
Gitblit v1.9.1