From 38470a0317c44220f371ef96a4a1b935ac16bdc0 Mon Sep 17 00:00:00 2001
From: luodangjia <luodangjia>
Date: 星期三, 24 七月 2024 13:49:37 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/2.0' into 2.0
---
ManagementIGOTravel/guns-admin/src/main/webapp/static/modular/system/driverActivity/driverActivity_info.js | 10 ++++++----
1 files changed, 6 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..ff72118 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,7 @@
Feng.error("请输入正确金额数!");
return;
}
- if (!re.test($("#num12").val())) {
+ if (!re1.test($("#num12").val())) {
Feng.error("请输入正确小时数!");
return;
}
@@ -226,7 +228,7 @@
return;
}
- if (!/^[1-9]\d*$/.test($("#num4").val())) {
+ if (!re1.test($("#num4").val())) {
Feng.error("请输入正确小时数!");
return;
}
--
Gitblit v1.7.1