From 9d7dda331f3498a95e2e922e9ddae0fa43e83605 Mon Sep 17 00:00:00 2001
From: IPC-610 <IPC-610@DESKTOP-6LEOOS3>
Date: 星期四, 02 一月 2025 13:38:06 +0800
Subject: [PATCH] 修改问题
---
HTML/views/ASNSetting/ArrivalNoticeDetail.html | 9 +++++----
1 files changed, 5 insertions(+), 4 deletions(-)
diff --git a/HTML/views/ASNSetting/ArrivalNoticeDetail.html b/HTML/views/ASNSetting/ArrivalNoticeDetail.html
index 1101799..c9f20f8 100644
--- a/HTML/views/ASNSetting/ArrivalNoticeDetail.html
+++ b/HTML/views/ASNSetting/ArrivalNoticeDetail.html
@@ -177,6 +177,7 @@
{ field: 'PackagNo', title: '鍖呰鍚嶇О', width: 160, templet: "#table-content-Packlist" },
{ field: 'Lot1', title: '鐢熶骇鏃ユ湡', align: 'center', edit: 'text', width: 140 },
{ field: 'Lot2', title: '杩囨湡鏃ユ湡', align: 'center', edit: 'text', width: 140 },
+ { field: 'IsBale', title: '鏄惁瑁瑰寘', align: 'center', edit: 'text', width: 140 },
// { field: 'Price', title: '鍗曚环', align: 'center', width: 80 },
// { field: 'Money', title: '閲戦', align: 'center', width: 100 },
@@ -575,7 +576,7 @@
if (value == '') {
return '';
} else {
- var ver = /^[0-9]+$/;
+ var ver =/^\\d+\\.\\d{1,4}$/; // /^[0-9]+$/;
if (!ver.test(value)) {
return '鍙兘杈撳叆姝ｆ暣鏁�';
}
@@ -762,7 +763,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 +803,7 @@
}
if (!reg.test(arr[i].Qty)) {
- layer.msg("鍏ュ簱鏁伴噺蹇呴』鏄ぇ浜�0鐨勬暣鏁�", {
+ layer.msg("鍏ュ簱鏁伴噺蹇呴』澶т簬0(鍙繚鐣�4浣嶅皬鏁�)", {
icon: 2,
time: 2000 //2绉掑叧闂紙濡傛灉涓嶉厤缃紝榛樿鏄�3绉掞級
});
@@ -816,7 +817,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