From b088628cf9be70c36e34032bb0d024548351541b Mon Sep 17 00:00:00 2001
From: puzhibing <393733352@qq.com>
Date: 星期六, 11 三月 2023 17:37:12 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/master'

---
 management/guns-admin/src/main/webapp/static/modular/system/tDriver/tDriver_info.js |  115 +++++++++++++++++++++++++++++++++++++++++++++++++++++----
 1 files changed, 107 insertions(+), 8 deletions(-)

diff --git a/management/guns-admin/src/main/webapp/static/modular/system/tDriver/tDriver_info.js b/management/guns-admin/src/main/webapp/static/modular/system/tDriver/tDriver_info.js
index ab958df..6df0474 100644
--- a/management/guns-admin/src/main/webapp/static/modular/system/tDriver/tDriver_info.js
+++ b/management/guns-admin/src/main/webapp/static/modular/system/tDriver/tDriver_info.js
@@ -2,7 +2,60 @@
  * 初始化详情对话框
  */
 var TDriverInfoDlg = {
-    tDriverInfoData : {}
+    tDriverInfoData : {},
+    validateFields: {
+        name: {
+            validators: {
+                notEmpty: {
+                    message: '姓名不能为空'
+                }
+            }
+        },
+        phone: {
+            validators: {
+                notEmpty: {
+                    message: '手机号不能为空'
+                }
+            }
+        },
+        emergencyContact: {
+            validators: {
+                notEmpty: {
+                    message: '紧急联系人姓名不能为空'
+                }
+            }
+        },
+        emergencyPhone: {
+            validators: {
+                notEmpty: {
+                    message: '紧急联系人电话不能为空'
+                }
+            }
+        },
+        area: {
+            validators: {
+                notEmpty: {
+                    message: '请选择服务区域'
+                }
+            }
+        },
+        idcard: {
+            validators: {
+                notEmpty: {
+                    message: '身份证号码不能为空'
+                }
+            }
+        },
+    }
+};
+
+/**
+ * 验证数据是否为空
+ */
+TDriverInfoDlg.validate = function () {
+    $('#driverInfoForm').data("bootstrapValidator").resetForm();
+    $('#driverInfoForm').bootstrapValidator('validate');
+    return $("#driverInfoForm").data('bootstrapValidator').isValid();
 };
 
 /**
@@ -91,15 +144,38 @@
     this.clearData();
     this.collectData();
 
+    if(!this.validate()){
+        return ;
+    }
+
+    var idcardFront = $("#idcardFront").val();
+    if ("" == idcardFront){
+        Feng.info("请上传身份证正面照");
+        return;
+    }
+
+    var idcardBack = $("#idcardBack").val();
+    if ("" == idcardBack){
+        Feng.info("请上传身份证背面照");
+        return;
+    }
+
+    var driverLicense = $("#driverLicense").val();
+    if ("" == driverLicense){
+        Feng.info("请上传驾驶证");
+        return;
+    }
+
     //提交信息
     var ajax = new $ax(Feng.ctxPath + "/tDriver/add", function(data){
         if(data.code == 500){
             Feng.error("添加失败!" + data.message + "!");
             return false;
+        }else {
+            Feng.success("添加成功!");
+            window.parent.TDriver.table.refresh();
+            TDriverInfoDlg.close();
         }
-        Feng.success("添加成功!");
-        window.parent.TDriver.table.refresh();
-        TDriverInfoDlg.close();
     },function(data){
         Feng.error("添加失败!" + data.responseJSON.message + "!");
     });
@@ -115,15 +191,38 @@
     this.clearData();
     this.collectData();
 
+    if(!this.validate()){
+        return ;
+    }
+
+    var idcardFront = $("#idcardFront").val();
+    if ("" == idcardFront){
+        Feng.info("请上传身份证正面照");
+        return;
+    }
+
+    var idcardBack = $("#idcardBack").val();
+    if ("" == idcardBack){
+        Feng.info("请上传身份证背面照");
+        return;
+    }
+
+    var driverLicense = $("#driverLicense").val();
+    if ("" == driverLicense){
+        Feng.info("请上传驾驶证");
+        return;
+    }
+
     //提交信息
     var ajax = new $ax(Feng.ctxPath + "/tDriver/update", function(data){
         if(data.code == 500){
             Feng.error("修改失败!" + data.message + "!");
             return false;
+        }else {
+            Feng.success("修改成功!");
+            window.parent.TDriver.table.refresh();
+            TDriverInfoDlg.close();
         }
-        Feng.success("修改成功!");
-        window.parent.TDriver.table.refresh();
-        TDriverInfoDlg.close();
     },function(data){
         Feng.error("修改失败!" + data.responseJSON.message + "!");
     });
@@ -132,5 +231,5 @@
 }
 
 $(function() {
-
+    Feng.initValidator("driverInfoForm", TDriverInfoDlg.validateFields);
 });

--
Gitblit v1.7.1