From 01d8de48c76467ff3b99b204e66d3ef86506fa52 Mon Sep 17 00:00:00 2001
From: zhibing.pu <393733352@qq.com>
Date: 星期四, 25 七月 2024 18:23:40 +0800
Subject: [PATCH] Merge branch '2.0' of http://120.76.84.145:10101/gitblit/r/java/IgoTravel into 2.0
---
ManagementIGOTravel/guns-admin/src/main/webapp/static/modular/system/driverActivity/driverActivity_info.js | 14 ++++++++++----
1 files changed, 10 insertions(+), 4 deletions(-)
diff --git a/ManagementIGOTravel/guns-admin/src/main/webapp/static/modular/system/driverActivity/driverActivity_info.js b/ManagementIGOTravel/guns-admin/src/main/webapp/static/modular/system/driverActivity/driverActivity_info.js
index ee9f4c6..6f6d33a 100644
--- a/ManagementIGOTravel/guns-admin/src/main/webapp/static/modular/system/driverActivity/driverActivity_info.js
+++ b/ManagementIGOTravel/guns-admin/src/main/webapp/static/modular/system/driverActivity/driverActivity_info.js
@@ -69,6 +69,7 @@
return;
}
var re = /^(([1-9]{1}\d*)|(0{1}))(\.\d{1,2})?$/;
+ var re1 = /^\d+(\.\d{1,2})?$/;
if (!re.test($("#num2").val())) {
Feng.error("请输入正确金额数!");
return;
@@ -82,7 +83,7 @@
Feng.error("请输入正确金额数!");
return;
}
- if (!re.test($("#num12").val())) {
+ if (!re1.test($("#num12").val())) {
Feng.error("请输入正确小时数!");
return;
}
@@ -99,7 +100,7 @@
return;
}
- if (!/^[1-9]\d*$/.test($("#num4").val())) {
+ if (!re1.test($("#num4").val())) {
Feng.error("请输入正确小时数!");
return;
}
@@ -196,6 +197,7 @@
return;
}
var re = /^(([1-9]{1}\d*)|(0{1}))(\.\d{1,2})?$/;
+ var re1 = /^\d+(\.\d{1,2})?$/;
if (!re.test($("#num2").val())) {
Feng.error("请输入正确金额数!");
return;
@@ -209,7 +211,9 @@
Feng.error("请输入正确金额数!");
return;
}
- if (!re.test($("#num12").val())) {
+ if (!re1.test($("#num12").val())) {
+ console.log("11111")
+ console.log($("#num12").val())
Feng.error("请输入正确小时数!");
return;
}
@@ -226,7 +230,9 @@
return;
}
- if (!/^[1-9]\d*$/.test($("#num4").val())) {
+ if (!re1.test($("#num4").val())) {
+ console.log("2222")
+ console.log($("#num4").val())
Feng.error("请输入正确小时数!");
return;
}
--
Gitblit v1.7.1