From d07f25c163706ac46a83bd2c63db1e3c52715222 Mon Sep 17 00:00:00 2001
From: zhaowc <526854230@qq.com>
Date: 星期四, 27 三月 2025 15:54:25 +0800
Subject: [PATCH] 解决问题

---
 Pda/View/SoSetting/SampleOut.html |   41 ++++++++++++++++++++++++++++++++---------
 1 files changed, 32 insertions(+), 9 deletions(-)

diff --git a/Pda/View/SoSetting/SampleOut.html b/Pda/View/SoSetting/SampleOut.html
index 2602607..32faf38 100644
--- a/Pda/View/SoSetting/SampleOut.html
+++ b/Pda/View/SoSetting/SampleOut.html
@@ -288,8 +288,8 @@
 										<div class="layui-form-item layout-input" style="margin-top: 6px;">
 											<label class="layui-form-label lableWidth">鎷h揣鏁伴噺锛�</label>
 											<div class="layui-input-block">
-												<input id="pickQty1" type="number" placeholder="璇疯緭鍏ユ嫞璐ф暟閲�"autocomplete="off" 
-													class="layui-input" oninput="value=value.replace(/^(0+)|[^\d]+/g,'')">
+												<input id="pickQty1" type="text" placeholder="璇疯緭鍏ユ嫞璐ф暟閲�"autocomplete="off" 
+													class="layui-input" >
 											</div>
 										</div>
 									</td>
@@ -482,9 +482,9 @@
 											<label class="layui-form-label lableWidth" >鎷h揣鏁伴噺锛�</label>
 											<div id="" class="local-input">
 												<div class="layui-input-block">
-													<input id="pickQty2" type="number" placeholder="璇疯緭鍏ユ嫞璐ф暟閲�"
+													<input id="pickQty2" type="text" placeholder="璇疯緭鍏ユ嫞璐ф暟閲�"
 														autocomplete="off" class="layui-input" style="padding-left:0.1rem;"
-														oninput="value=value.replace(/^(0+)|[^\d]+/g,'')">
+														>
 												</div>
 											</div>
 											<div id="" class="local-ok">
@@ -987,7 +987,7 @@
                             });
                             return;
                         }
-                        if($('#pickQty1').val() != "" && $('#pickQty1').val()>parseInt($('#pickQty').val())){
+                        if($('#pickQty1').val() != "" && $('#pickQty1').val()>parseFloat($('#pickQty').val())){
                             layer.msg("鎷h揣鏁伴噺涓嶈兘澶т簬寰呮嫞鏁伴噺锛�", {
                                 icon: 2,
                                 time: 2000 //2绉掑叧闂紙濡傛灉涓嶉厤缃紝榛樿鏄�3绉掞級
@@ -1044,6 +1044,19 @@
 			//纭鎷h揣 
 			function reqPickScatter() {
                 canPickBox = false//鍥炶皟
+				if($('#pickQty1').val()!= "" && $('#pickQty1').val()!= undefined){
+					console.log("111111111111111111"+$('#pickQty1').val());
+					
+					var reg = /^[1-9]\d*(\.\d{1,4})?$|^0\.\d{1,4}[1-9]\d*$/;
+					 		  
+					if (!reg.test($("#pickQty1").val())) {
+						layer.msg("鏁伴噺蹇呴』澶т簬0(鍙繚鐣�4浣嶅皬鏁�)", {
+							icon: 2,
+							time: 2000 //2绉掑叧闂紙濡傛灉涓嶉厤缃紝榛樿鏄�3绉掞級
+						});
+						return -1;
+					}
+				}
 				var param = {
 					"SoNo": $("#bar").val(),
 					"SoDetailId": $("#skuLotNo").val(),
@@ -1556,8 +1569,8 @@
 							time: 2000 //2绉掑叧闂紙濡傛灉涓嶉厤缃紝榛樿鏄�3绉掞級
 						}); return;
 					}			
-					let pickedQty = parseInt($('#pickedQty2').val()) //宸叉嫞鏁伴噺
-					let pickQty = parseInt($('#pickQty2').val())  //鎷h揣鏁伴噺
+					let pickedQty = parseFloat($('#pickedQty2').val()) //宸叉嫞鏁伴噺
+					let pickQty = parseFloat($('#pickQty2').val())  //鎷h揣鏁伴噺
 					if (pickQty <= 0) {
 						layer.msg("鎷h揣鏁伴噺闇�澶т簬0", {
 							icon: 2,
@@ -1573,8 +1586,8 @@
                             time: 2000 //2绉掑叧闂紙濡傛灉涓嶉厤缃紝榛樿鏄�3绉掞級
                         }); return;
                     }
-					let pickedQty = parseInt($('#pickedQty2').val()) //宸叉嫞鏁伴噺
-					let pickQty = parseInt($('#pickQty2').val())  //鎷h揣鏁伴噺
+					let pickedQty = parseFloat($('#pickedQty2').val()) //宸叉嫞鏁伴噺
+					let pickQty = parseFloat($('#pickQty2').val())  //鎷h揣鏁伴噺
 					if (pickQty <= 0) {
 						layer.msg("鎷h揣鏁伴噺闇�澶т簬0", {
 							icon: 2,
@@ -1609,6 +1622,16 @@
 			//纭鎷h揣 
 			function reqPickScatter2() {
 				canPickBox = false//鍥炶皟
+				if($('#pickQty2').val()!= "" && $('#pickQty2').val()!= undefined){
+					var reg = /^[1-9]\d*(\.\d{1,4})?$|^0\.\d{1,4}[1-9]\d*$/;
+					if (!reg.test($("#pickQty2").val())) {
+						layer.msg("鏁伴噺蹇呴』澶т簬0(鍙繚鐣�4浣嶅皬鏁�)", {
+							icon: 2,
+							time: 2000 //2绉掑叧闂紙濡傛灉涓嶉厤缃紝榛樿鏄�3绉掞級
+						});
+						return -1;
+					}
+				}
 				var param = {
 					"SoNo": $("#bar2").val(),
 					"SoDetailId": $("#skuLotNo2").val(),

--
Gitblit v1.8.0