From 8b09fbc19a96b57bf1d0e4d7c79b51a76aeca554 Mon Sep 17 00:00:00 2001
From: Pu Zhibing <393733352@qq.com>
Date: 星期五, 28 三月 2025 19:57:56 +0800
Subject: [PATCH] 修改bug

---
 ManagementIGOTravel/guns-admin/src/main/webapp/static/modular/system/driverActivity/driverActivity_info.js |   27 +++++++++++++++++++++++----
 1 files changed, 23 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 47bb99a..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;
@@ -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();
 }
 /**
@@ -184,11 +190,14 @@
 
     this.clearData();
     this.collectData();
+    var staTime =$("#staTime").val();
+
     if ($.trim($("#num1").val())=="") {
         Feng.error("名称不能为空!");
         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;
@@ -200,6 +209,12 @@
 
     if (!re.test($("#num5").val())) {
         Feng.error("请输入正确金额数!");
+        return;
+    }
+    if (!re1.test($("#num12").val())) {
+        console.log("11111")
+        console.log($("#num12").val())
+        Feng.error("请输入正确小时数!");
         return;
     }
     // if (!re.test($("#num7").val())) {
@@ -215,10 +230,13 @@
         return;
     }
 
-    if (!/^[1-9]\d*$/.test($("#num4").val())) {
+    if (!re1.test($("#num4").val())) {
+        console.log("2222")
+        console.log($("#num4").val())
         Feng.error("请输入正确小时数!");
         return;
     }
+
     // if (!/^[1-9]\d*$/.test($("#num6").val())) {
     //     Feng.error("请输入正确小时数!");
     //     return;
@@ -235,7 +253,7 @@
         Feng.error("请选择活动时间!");
         return;
     }
-    if($.trim($("#staTime").val())==""){
+    if($.trim(staTime)==""){
         Feng.error("请选择时间!");
         return;
     }
@@ -255,6 +273,7 @@
     },function(data){
         Feng.error("修改失败!" + data.responseJSON.message + "!");
     });
+    ajax.set("id",$("#id").val());
     ajax.set("startTime",$("#startTime").val());
     ajax.set("staTime",$("#staTime").val());
     ajax.set("num1",$("#num1").val());
@@ -268,7 +287,7 @@
     ajax.set("num9",0);
     ajax.set("num10",$("#num10").val());
     ajax.set("num11",$("#num11").val());
-    ajax.set("id",$("#id").val());
+    ajax.set("num12",$("#num12").val());
     ajax.start();
 }
 

--
Gitblit v1.7.1