From d5b3e5a413bcfccba294793ee093722f31b2448a Mon Sep 17 00:00:00 2001
From: puzhibing <393733352@qq.com>
Date: 星期三, 16 八月 2023 17:02:13 +0800
Subject: [PATCH] 添加推单日志

---
 management/guns-admin/src/main/webapp/static/modular/system/tBranchOffice/tBranchOffice_info.js |   63 ++++++++++++++++++++++++++++++-
 1 files changed, 60 insertions(+), 3 deletions(-)

diff --git a/management/guns-admin/src/main/webapp/static/modular/system/tBranchOffice/tBranchOffice_info.js b/management/guns-admin/src/main/webapp/static/modular/system/tBranchOffice/tBranchOffice_info.js
index 99665da..e6370ee 100644
--- a/management/guns-admin/src/main/webapp/static/modular/system/tBranchOffice/tBranchOffice_info.js
+++ b/management/guns-admin/src/main/webapp/static/modular/system/tBranchOffice/tBranchOffice_info.js
@@ -15,6 +15,10 @@
             validators: {
                 notEmpty: {
                     message: '负责人姓名不能为空'
+                },
+                regexp: {
+                    regexp:  /^[\u4E00-\u9FA5A-Za-z\s]+$/,
+                    message: '不能输入特殊字符和数字'
                 }
             }
         },
@@ -22,6 +26,10 @@
             validators: {
                 notEmpty: {
                     message: '联系电话不能为空'
+                },
+                regexp: {
+                    regexp: /^1[3-9]\d{9}$/,
+                    message: '请输入合法手机号'
                 }
             }
         },
@@ -39,6 +47,35 @@
                 }
             }
         },
+        account: {
+            validators: {
+                notEmpty: {
+                    message: '登录账号不能为空'
+                }
+            }
+        },
+        password: {
+            validators: {
+                notEmpty: {
+                    message:  '登录密码不能为空'
+                },
+                identical: {
+                    field: 'rePassword',
+                    message: '两次密码不一致'
+                },
+            }
+        },
+        rePassword: {
+            validators: {
+                notEmpty: {
+                    message: '密码不能为空'
+                },
+                identical: {
+                    field: 'password',
+                    message: '两次密码不一致'
+                },
+            }
+        }
     }
 };
 
@@ -109,6 +146,8 @@
         .set('area')
         .set('areaId')
     .set('status')
+    .set('account')
+    .set('password')
     .set('createTime');
 }
 
@@ -127,7 +166,7 @@
     //提交信息
     var ajax = new $ax(Feng.ctxPath + "/tBranchOffice/add", function(data){
         if(data.code == 500){
-            Feng.error("添加失败!" + data.message + "!");
+            Feng.error(data.message);
             return false;
         }else {
             Feng.success("添加成功!");
@@ -149,9 +188,27 @@
     this.clearData();
     this.collectData();
 
-    if(!this.validate()){
-        return ;
+    var branchOfficeName = $('#branchOfficeName').val();
+    var principal = $('#principal').val();
+    var principalPhone = $('#principalPhone').val();
+    var area = $('#area').val();
+    if(null == branchOfficeName || '' == branchOfficeName){
+        Feng.error("分公司名称不能为空");
+        return
     }
+    if(null == principal || '' == principal){
+        Feng.error("负责人姓名不能为空");
+        return
+    }
+    if(null == principalPhone || '' == principalPhone){
+        Feng.error("联系电话不能为空");
+        return
+    }
+    if(null == area || '' == area){
+        Feng.error("代理区域不能为空");
+        return
+    }
+
 
     //提交信息
     var ajax = new $ax(Feng.ctxPath + "/tBranchOffice/update", function(data){

--
Gitblit v1.7.1