From 085d0e9e62e524b7cf0e7b7d8ad3b51a5a7c1e81 Mon Sep 17 00:00:00 2001
From: 无关风月 <443237572@qq.com>
Date: 星期三, 24 七月 2024 11:01:09 +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 | 17 +++++++++++++++--
1 files changed, 15 insertions(+), 2 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 f33793e..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;
@@ -80,6 +81,10 @@
if (!re.test($("#num5").val())) {
Feng.error("请输入正确金额数!");
+ return;
+ }
+ if (!re1.test($("#num12").val())) {
+ Feng.error("请输入正确小时数!");
return;
}
// if (!re.test($("#num7").val())) {
@@ -95,7 +100,7 @@
return;
}
- if (!/^[1-9]\d*$/.test($("#num4").val())) {
+ if (!re1.test($("#num4").val())) {
Feng.error("请输入正确小时数!");
return;
}
@@ -148,6 +153,7 @@
ajax.set("num9",0);
ajax.set("num10",$("#num10").val());
ajax.set("num11",$("#num11").val());
+ ajax.set("num12",$("#num12").val());
ajax.start();
}
/**
@@ -191,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;
@@ -202,6 +209,10 @@
if (!re.test($("#num5").val())) {
Feng.error("请输入正确金额数!");
+ return;
+ }
+ if (!re1.test($("#num12").val())) {
+ Feng.error("请输入正确小时数!");
return;
}
// if (!re.test($("#num7").val())) {
@@ -217,10 +228,11 @@
return;
}
- if (!/^[1-9]\d*$/.test($("#num4").val())) {
+ if (!re1.test($("#num4").val())) {
Feng.error("请输入正确小时数!");
return;
}
+
// if (!/^[1-9]\d*$/.test($("#num6").val())) {
// Feng.error("请输入正确小时数!");
// return;
@@ -271,6 +283,7 @@
ajax.set("num9",0);
ajax.set("num10",$("#num10").val());
ajax.set("num11",$("#num11").val());
+ ajax.set("num12",$("#num12").val());
ajax.start();
}
--
Gitblit v1.7.1