From 709a4a10be56952ead6340e4822fce41a66e47cd Mon Sep 17 00:00:00 2001
From: puzhibing <393733352@qq.com>
Date: 星期三, 26 七月 2023 18:39:28 +0800
Subject: [PATCH] Merge branch '1.1' of http://120.76.84.145:10101/gitblit/r/java/SuperSaveDriving into dev

---
 management/guns-admin/src/main/webapp/static/modular/system/tAgent/tAgent_info.js |  185 +++++++++++++++++++++++++++++++++++++++++++--
 1 files changed, 175 insertions(+), 10 deletions(-)

diff --git a/management/guns-admin/src/main/webapp/static/modular/system/tAgent/tAgent_info.js b/management/guns-admin/src/main/webapp/static/modular/system/tAgent/tAgent_info.js
index ef7f181..16a3346 100644
--- a/management/guns-admin/src/main/webapp/static/modular/system/tAgent/tAgent_info.js
+++ b/management/guns-admin/src/main/webapp/static/modular/system/tAgent/tAgent_info.js
@@ -61,6 +61,146 @@
                     message: '两次密码不一致'
                 },
             }
+        },
+        merchantName: {
+            validators: {
+                notEmpty: {
+                    message: '公司名称不能为空'
+                }
+            }
+        },
+        businessScope: {
+            validators: {
+                notEmpty: {
+                    message: '经营范围不能为空'
+                }
+            }
+        },
+        socialCreditCode: {
+            validators: {
+                notEmpty: {
+                    message: '统一社会信用码不能为空'
+                }
+            }
+        },
+        socialCreditCodeExpires: {
+            validators: {
+                notEmpty: {
+                    message: '统一社会信用证有效期不能为空'
+                }
+            }
+        },
+        provCodeEnterprise: {
+            validators: {
+                notEmpty: {
+                    message: '地区不能为空'
+                }
+            }
+        },
+        cityCodeEnterprise: {
+            validators: {
+                notEmpty: {
+                    message: '地区不能为空'
+                }
+            }
+        },
+        areaCodeEnterprise: {
+            validators: {
+                notEmpty: {
+                    message: '地区不能为空'
+                }
+            }
+        },
+        address: {
+            validators: {
+                notEmpty: {
+                    message: '企业详细地址不能为空'
+                }
+            }
+        },
+        legalPerson: {
+            validators: {
+                notEmpty: {
+                    message: '法人姓名不能为空'
+                }
+            }
+        },
+        merchantIDCode: {
+            validators: {
+                notEmpty: {
+                    message: '法人身份证号不能为空'
+                }
+            }
+        },
+        certIdExpires: {
+            validators: {
+                notEmpty: {
+                    message: '法人身份证有效期不能为空'
+                }
+            }
+        },
+        legalPhone: {
+            validators: {
+                notEmpty: {
+                    message: '法人手机号不能为空'
+                }
+            }
+        },
+        fileNo: {
+            validators: {
+                notEmpty: {
+                    message: '营业执照扫描件不能为空'
+                }
+            }
+        },
+        cardName: {
+            validators: {
+                notEmpty: {
+                    message: '结算账户名不能为空'
+                }
+            }
+        },
+        cardNo: {
+            validators: {
+                notEmpty: {
+                    message: '结算账户号不能为空'
+                }
+            }
+        },
+        phone: {
+            validators: {
+                notEmpty: {
+                    message: '银行预留手机号不能为空'
+                }
+            }
+        },
+        bankCode: {
+            validators: {
+                notEmpty: {
+                    message: '银行名称不能为空'
+                }
+            }
+        },
+        provCodeBank: {
+            validators: {
+                notEmpty: {
+                    message: '开户行地区不能为空'
+                }
+            }
+        },
+        cityCodeBank: {
+            validators: {
+                notEmpty: {
+                    message: '开户行地区不能为空'
+                }
+            }
+        },
+        areaCodeBank: {
+            validators: {
+                notEmpty: {
+                    message: '开户行地区不能为空'
+                }
+            }
         }
     }
 };
@@ -114,20 +254,41 @@
  */
 TAgentInfoDlg.collectData = function() {
     this
-    .set('id')
-    .set('principal')
-    .set('principalPhone')
-    .set('email')
-    .set('provinceCode')
-    .set('provinceName')
-    .set('cityCode')
-    .set('cityName')
-    .set('status')
+        .set('id')
+        .set('principal')
+        .set('principalPhone')
+        .set('email')
+        .set('provinceCode')
+        .set('provinceName')
+        .set('cityCode')
+        .set('cityName')
+        .set('status')
         .set('area')
         .set('areaId')
         .set('account')
         .set('password')
-    .set('createTime');
+        .set('createTime')
+        .set('userType')
+        .set('merchantName')
+        .set('businessScope')
+        .set('socialCreditCode')
+        .set('socialCreditCodeExpires')
+        .set('provCodeEnterprise')
+        .set('cityCodeEnterprise')
+        .set('areaCodeEnterprise')
+        .set('address')
+        .set('cardName')
+        .set('cardNo')
+        .set('bankAcctType')
+        .set('phone')
+        .set('legalPerson')
+        .set('merchantIDCode')
+        .set('certIdExpires')
+        .set('legalPhone')
+        .set('bankCode')
+        .set('provCodeBank')
+        .set('cityCodeBank')
+        .set('areaCodeBank');
 }
 
 /**
@@ -141,6 +302,10 @@
     if(!this.validate()){
         return ;
     }
+    if(this.tAgentInfoData.userType == 0){
+        delete this.tAgentInfoData.socialCreditCodeExpires;
+        delete this.tAgentInfoData.certIdExpires;
+    }
 
     //提交信息
     var ajax = new $ax(Feng.ctxPath + "/tAgent/add", function(data){

--
Gitblit v1.7.1