From ad86e0cb28f4301c4935bea43e4ebd824338390e Mon Sep 17 00:00:00 2001
From: xuhy <3313886187@qq.com>
Date: 星期四, 18 五月 2023 16:44:46 +0800
Subject: [PATCH] BUG修改

---
 management/guns-admin/src/main/webapp/static/modular/system/tDriver/tDriver.js |   42 ++++++++++++++++++++++++++++++++++++------
 1 files changed, 36 insertions(+), 6 deletions(-)

diff --git a/management/guns-admin/src/main/webapp/static/modular/system/tDriver/tDriver.js b/management/guns-admin/src/main/webapp/static/modular/system/tDriver/tDriver.js
index 9bbeebf..424d751 100644
--- a/management/guns-admin/src/main/webapp/static/modular/system/tDriver/tDriver.js
+++ b/management/guns-admin/src/main/webapp/static/modular/system/tDriver/tDriver.js
@@ -66,13 +66,13 @@
                 }
             }},
             {title: '添加时间', field: 'createTime', visible: true, align: 'center', valign: 'middle'},
-        {title: '操作', visible: true, align: 'center', valign: 'middle',width:150,
+        {title: '操作', visible: true, align: 'center', valign: 'middle',width:'160px',fixed:'true',
             formatter: function (value, row) {
                 if (row.status === 1){
                     return '<a href="#" onclick="TDriver.searchTDriverDetail('+row.id+')" style="color:green">详情</a>' +'&nbsp;' +
                         '<a href="#" onclick="TDriver.stop('+row.id+','+row.status+')" style="color:red">冻结</a>' +'&nbsp;' +
                         '<a href="#" onclick="TDriver.updateInfo('+row.id+')" style="color:green">编辑</a>'
-                }else if (row.status === 2){
+                }else if (row.status === 2 || row.approvalStatus === 2){
                     return '<a href="#" onclick="TDriver.searchTDriverDetail('+row.id+')" style="color:green">详情</a>' +'&nbsp;' +
                         '<a href="#" onclick="TDriver.start('+row.id+','+row.status+')" style="color:green">解冻</a>'
                 }
@@ -164,8 +164,8 @@
 TDriver.stop = function (id) {
     var index = layer.open({
         type: 2,
-        title: '停用',
-        area: ['45%', '50%'], //宽高
+        title: '冻结',
+        area: ['800px', '420px'], //宽高
         fix: false, //不固定
         maxmin: true,
         content: Feng.ctxPath + '/tDriver/tDriver_start_and_stop?id='+id
@@ -180,7 +180,7 @@
     var index = layer.open({
         type: 2,
         title: '启用',
-        area: ['45%', '50%'], //宽高
+        area: ['800px', '420px'], //宽高
         fix: false, //不固定
         maxmin: true,
         content: Feng.ctxPath + '/tDriver/tDriver_start_and_stop?id='+id
@@ -192,6 +192,18 @@
  * 提交启用冻结
  */
 TDriver.updateStatus = function () {
+
+    var status = $("#status").val();
+    console.log(status)
+    if(status == 1 && ($("#stopRemark").val() == '' || $("#stopRemark").val() == null)){
+        Feng.info("请输入冻结理由!")
+        return;
+    }
+    if(status == 2 && ($("#startRemark").val() == '' || $("#startRemark").val() == null)){
+        Feng.info("请输入解冻理由!")
+        return;
+    }
+
     var ajax = new $ax(Feng.ctxPath + "/tDriver/update-status", function (data) {
         Feng.success("修改成功!");
         TDriverInfoDlg.close();
@@ -221,7 +233,7 @@
         var index = layer.open({
             type: 2,
             title: '充值余额',
-            area: ['45%', '20%'], //宽高
+            area: ['800px', '220px'], //宽高
             fix: false, //不固定
             maxmin: true,
             content: Feng.ctxPath + '/tDriver/rechargeBalancePage?id=' + id
@@ -234,6 +246,18 @@
  * 提交充值
  */
 TDriver.rechargeBalance = function () {
+    var balance = $('#backgroundBalance').val().trim();
+    var reg=/^[1-9]\d*$/;//由 1-9开头 的正则表达式
+    //先判断是否为整数 在判断 是否在 1-总页  整数范围之内
+    if(reg.test(balance)){
+        if(parseInt(balance) <= 0){
+            Feng.error("请输入大于0的正整数");
+            return;
+        }
+    }else{
+        Feng.error("请输入大于0的正整数");
+        return;
+    }
     var ajax = new $ax(Feng.ctxPath + "/tDriver/recharge-balance", function (data) {
         Feng.success("修改成功!");
         TDriverInfoDlg.close();
@@ -288,6 +312,12 @@
  * 提交审核
  */
 TDriver.auditSubmit = function () {
+
+    if($("#approvalStatus").val() == 3 && ($("#approvalNotes").val() == '' || $("#approvalNotes").val() == null)){
+        Feng.info("请输入驳回原因!");
+        return;
+    }
+
     var ajax = new $ax(Feng.ctxPath + "/tDriver/auditSubmit", function (data) {
         Feng.success("修改成功!");
         TDriverInfoDlg.close();

--
Gitblit v1.7.1