From f8957ba7f0ade842553bd37254cf31da639a1925 Mon Sep 17 00:00:00 2001
From: chengsc <Demo@DESKTOP-CPA90BF>
Date: 星期日, 20 十月 2024 17:41:36 +0800
Subject: [PATCH] 修改问题

---
 HTML/views/ASNSetting/ArrivalNoticeDetail.html |    8 ++++----
 1 files changed, 4 insertions(+), 4 deletions(-)

diff --git a/HTML/views/ASNSetting/ArrivalNoticeDetail.html b/HTML/views/ASNSetting/ArrivalNoticeDetail.html
index 1101799..532051b 100644
--- a/HTML/views/ASNSetting/ArrivalNoticeDetail.html
+++ b/HTML/views/ASNSetting/ArrivalNoticeDetail.html
@@ -575,7 +575,7 @@
 					if (value == '') {
 						return '';
 					} else {
-						var ver = /^[0-9]+$/;
+						var ver =/^\\d+\\.\\d{1,4}$/;  // /^[0-9]+$/;
 						if (!ver.test(value)) {
 							return '鍙兘杈撳叆姝f暣鏁�';
 						}
@@ -762,7 +762,7 @@
 			// 鎻愪氦鑾峰彇鍏ュ簱鍗曚俊鎭�
 			function getAsnOrderInfo() {
 				var DataList = [];
-				var reg = /^([0]|[0-9][0-9]*)$/;
+				var reg = /(^[1-9]([0-9]+)?(\.[0-9]{1,4})?$)|(^(0){1}$)|(^[0-9]\.[0-9]([0-9])?$)/;///^[+-]?\d+\.\d{0,4}$/i;    ///^([0]|[0-9][0-9]*)$/;
 				console.log(arr);
 				for (var i in arr) {
 					console.log(arr[i].LotNo);
@@ -802,7 +802,7 @@
 					}
 
 					if (!reg.test(arr[i].Qty)) {
-						layer.msg("鍏ュ簱鏁伴噺蹇呴』鏄ぇ浜�0鐨勬暣鏁�", {
+						layer.msg("鍏ュ簱鏁伴噺蹇呴』澶т簬0(鍙繚鐣�4浣嶅皬鏁�)", {
 							icon: 2,
 							time: 2000 //2绉掑叧闂紙濡傛灉涓嶉厤缃紝榛樿鏄�3绉掞級
 						});
@@ -816,7 +816,7 @@
 						Standard: arr[i].Standard,
 						LotNo: arr[i].LotNo,
 						LotText: arr[i].LotText,
-						Qty: parseInt(arr[i].Qty),
+						Qty:parseFloat(arr[i].Qty),
 						PackagNo: arr[i].PackagNo,
 						Price: arr[i].Price,
 						IsBale: arr[i].IsBale,

--
Gitblit v1.8.0