From f166bfa6b3f17349905b5c98881b4b6224a9a35b Mon Sep 17 00:00:00 2001
From: whycq <913841844@qq.com>
Date: 星期二, 29 十月 2024 13:16:29 +0800
Subject: [PATCH] #

---
 pages/pakin/repairPakin.vue  |   18 ++++++++++++------
 pages/pakin/confirmPakin.vue |   12 ++++++------
 2 files changed, 18 insertions(+), 12 deletions(-)

diff --git a/pages/pakin/confirmPakin.vue b/pages/pakin/confirmPakin.vue
index 427fc6b..3bd93ff 100644
--- a/pages/pakin/confirmPakin.vue
+++ b/pages/pakin/confirmPakin.vue
@@ -312,10 +312,10 @@
 						if (key.startsWith('鍗峰彿')) roll.rollNo = item[key];
 						else if (key.startsWith('绠卞彿')) roll.boxNo = item[key];
 						else if (key.startsWith('瑙勬牸')) roll.specs = item[key];
-						else if (key.startsWith('闀垮害')) roll.length = item[key].split(' ')[0];
-						else if (key.startsWith('鍑�閲�')) roll.netWeight = item[key].split(' ')[0];
-						else if (key.startsWith('姣涢噸')) roll.grossWeight = item[key].split(' ')[0];
-						else if (key.startsWith('鎺ュご')) roll.splices = item[key].split(' ')[0];
+						else if (key.startsWith('闀垮害')) roll.length = item[key].replace(/[^0-9]/ig, "");
+						else if (key.startsWith('鍑�閲�')) roll.netWeight = item[key].replace(/[^0-9]/ig, "");
+						else if (key.startsWith('姣涢噸')) roll.grossWeight = item[key].replace(/[^0-9]/ig, "");
+						else if (key.startsWith('鎺ュご')) roll.splices = item[key].replace(/[^0-9]/ig, "");
 						else if (key.startsWith('鍒嗗垏鏃堕棿')) roll.fqTime = item[key];
 					})
 					let newObj = {...nedata,...roll}
@@ -788,7 +788,7 @@
 	@import url('../../static/css/wms.css/wms.css');
 
 	.list:first-child {
-		margin-top: 340rpx;
+		margin-top: 370rpx;
 	}
 	.code {
 		width: 100%;
@@ -832,7 +832,7 @@
 		width: 100%;
 		background-color: white;
 		position: fixed;
-		margin-top: 230rpx;
+		margin-top: 260rpx;
 		z-index: 9;
 		/* border-top: 1px solid #DCDFE6; */
 		text-align: center;
diff --git a/pages/pakin/repairPakin.vue b/pages/pakin/repairPakin.vue
index 8339a2a..658b0c7 100644
--- a/pages/pakin/repairPakin.vue
+++ b/pages/pakin/repairPakin.vue
@@ -276,10 +276,10 @@
 							if (key.startsWith('鍗峰彿')) roll[index].rollNo = value;
 							else if (key.startsWith('绠卞彿')) roll[index].boxNo = value;
 							else if (key.startsWith('瑙勬牸')) roll[index].specs = value;
-							else if (key.startsWith('闀垮害')) roll[index].length = value.split(' ')[0];
-							else if (key.startsWith('鍑�閲�')) roll[index].netWeight = value.split(' ')[0];
-							else if (key.startsWith('姣涢噸')) roll[index].grossWeight = value.split(' ')[0];
-							else if (key.startsWith('鎺ュご')) roll[index].splices = value.split(' ')[0];
+							else if (key.startsWith('闀垮害')) roll[index].length = value.replace(/[^0-9]/ig, "");
+							else if (key.startsWith('鍑�閲�')) roll[index].netWeight = value.replace(/[^0-9]/ig, "");
+							else if (key.startsWith('姣涢噸')) roll[index].grossWeight = value.replace(/[^0-9]/ig, "");
+							else if (key.startsWith('鎺ュご')) roll[index].splices = value.replace(/[^0-9]/ig, "");
 							else if (key.startsWith('鍒嗗垏鏃堕棿')) roll[index].fqTime = value;
 				
 				            // 濡傛灉鏈夋墍鏈夊弬鏁帮紝鍒欏皢鍏舵帹鍏� rolls 鏁扮粍
@@ -677,8 +677,14 @@
 	
 	.picker {
 	  padding: 10px;
-	  background-color: #fff;
-	  text-align: center;
+	  height: 40rpx;
+	  width: 40rpx;
+	  display: flex;
+	  align-items: center;
+	  justify-content: center;
+	  background-color: #5fbf8e;
+	  color: #FFF;
+	  border-radius: 50%;
 	}
 	.desc {
 		min-height: 40rpx;

--
Gitblit v1.9.1