修改公司注册页面

src/dashoo.cn/backend/api/controllers/base.go

@@ -287,6 +287,7 @@ func (this *BaseController) Prepare() {
 		"/api/register/addentity",
 		"/api/register/getsuppliername",
 		"/api/register/getdictlist",
+		"/api/register/usernameisexist",
 		"/api/rtx/call",
 		"/api/organizes/getorglist",
 		"/api/supplier/getauditerbydeptandnologin",

src/dashoo.cn/backend/api/controllers/register/oilcorporateinfo.go

@@ -100,6 +100,28 @@ func (this *OilCorporateInfoController) GetSupplierName() {
 	this.ServeJSON()
 }
 
+// @Title 判断新注册的账号是否存在
+// @Description 判断新注册的账号是否存在
+// @Success	200	{object} controllers.Request
+// @router /usernameisexist [get]
+func (this *OilCorporateInfoController) UserNameIsExist() {
+	var errinfo ErrorDataInfo
+	UserName := this.GetString("UserName")
+
+	userSvc := userRole.GetUserService(utils.DBE)
+	resultBool := userSvc.ValidUsernameExist(UserName)
+
+	if resultBool {
+		errinfo.Item = true //已存在
+		this.Data["json"] = &errinfo
+		this.ServeJSON()
+	} else {
+		errinfo.Item = false //不存在
+		this.Data["json"] = &errinfo
+		this.ServeJSON()
+	}
+}
+
 // @Title 注册
 // @Description 新增公司信息
 // @Success	200	{object} controllers.Request
@@ -227,19 +249,19 @@ func (this *OilCorporateInfoController) AddUser() {
 				this.Data["json"] = &errinfo
 				this.ServeJSON()
 			} else {
-				errinfo.Message = "操作失败！"
+				errinfo.Message = "操作失败！--1"
 				errinfo.Code = -1
 				this.Data["json"] = &errinfo
 				this.ServeJSON()
 			}
 		} else {
-			errinfo.Message = "操作失败！"
+			errinfo.Message = "操作失败！--2"
 			errinfo.Code = -1
 			this.Data["json"] = &errinfo
 			this.ServeJSON()
 		}
 	} else {
-		errinfo.Message = "操作失败！"
+		errinfo.Message = "操作失败！--3"
 		errinfo.Code = -1
 		this.Data["json"] = &errinfo
 		this.ServeJSON()

src/dashoo.cn/frontend_web/src/pages/signup.vue

@@ -183,6 +183,48 @@
           }
         }
       };
+      var checkCommercialNo = (rule, value, callback) => {
+        if (value === '') {
+          callback(new Error('请输入统一社会信用代码！'));
+        } else {
+          let re4 = /^[0-9A-Z]\d{17}$/
+          if (!re4.test(this.formData.CommercialNo)) {
+            this.$alert('请填写正确的统一社会信用代码！', '提示', {
+              confirmButtonText: '确定',
+            })
+          } else {
+            callback();
+          }
+        }
+      };
+      var checkLegalPersonId = (rule, value, callback) => {
+        if (value === '') {
+          callback(new Error('请输入正确格式的法定代表人身份证号！'));
+        } else {
+          let re1 = /(^\d{18}$)|(^\d{17}(\d|X|x)$)/
+          if (!re1.test(this.formData.LegalPersonId)) {
+            this.$alert('请输入正确格式的法定代表人身份证号！', '提示', {
+              confirmButtonText: '确定',
+            })
+          } else {
+            callback();
+          }
+        }
+      };
+      var checkContactId = (rule, value, callback) => {
+        if (value === '') {
+          callback(new Error('请输入正确格式的联系人身份证号！'));
+        } else {
+          let re1 = /(^\d{18}$)|(^\d{17}(\d|X|x)$)/
+          if (!re1.test(this.formData.ContactId)) {
+            this.$alert('请输入正确格式的联系人身份证号！', '提示', {
+              confirmButtonText: '确定',
+            })
+          } else {
+            callback();
+          }
+        }
+      };
       var checkUpload = (rule, value, callback) => {
         if (value === '') {
           callback(new Error('请上传身份证扫描件! '))
@@ -190,6 +232,61 @@
           callback()
         }
       };
+      var userNameIsExist =  (rule, value, callback) => {
+        if (value === '') {
+          callback(new Error('请输入登录账号!'));
+        } else {
+          this.checkUserNameIsExist()
+          if (this.userIsExist) {
+            this.$alert('该登录账号已注册！', '提示:', {
+              confirmButtonText: '确定',
+            })
+          } else {
+            callback();
+          }
+        }
+      };
+      var checkUserTelephone = (rule, value, callback) => {
+        if (value === '') {
+          callback(new Error('请输入正确格式的手机号！'));
+        } else {
+          let re3 = /^[1][3456789]\d{9}$/
+          if (!re3.test(this.formData.UserTelephone)) {
+            this.$alert('请填写正确格式的手机号！', '提示', {
+              confirmButtonText: '确定',
+            })
+          } else {
+            callback();
+          }
+        }
+      };
+      var checkUserPass = (rule, value, callback) => {
+        if (value === '') {
+          callback(new Error('请输入正确格式的密码(8——20位，包含英文字母、数字)！'));
+        } else {
+          let re2 = /^(?=.*[0-9])[0-9A-Za-z]{8,20}$/g
+          if (!re2.test(this.formData.UserPass)) {
+            this.$alert('请输入正确格式的密码(8——20位，包含英文字母、数字)！', '提示', {
+              confirmButtonText: '确定',
+            })
+          } else {
+            callback();
+          }
+        }
+      };
+      var checkUserPass2 = (rule, value, callback) => {
+        if (value === '') {
+          callback(new Error('请输入确认密码！'));
+        } else {
+          if (this.formData.UserPass != this.formData.UserPass2) {
+            this.$alert('两次输入的密码不一致，请重新输入!', '提示', {
+              confirmButtonText: '确定',
+            })
+          } else {
+            callback();
+          }
+        }
+      };
       return {
         activeIndex: '1',
 
@@ -197,6 +294,7 @@
         waituploads: [], // 等待上传的文件列表
         limitNumb: 2, //文件上传限制数
         chooseAuditorVisible: false,
+        userIsExist: false, //默认新用户不存在
 
         formData: {
           Id: '', //int
@@ -268,13 +366,13 @@
             }
           ],
           CommercialNo: [
-            { required: true, message: '请输入统一社会信用代码', trigger: 'blur' }
+            { required: true, validator: checkCommercialNo, trigger: 'blur' }
           ],
           LegalPerson: [
             { required: true, message: '请输入法定代表人姓名', trigger: 'blur' }
           ],
           LegalPersonId: [
-            { required: true, message: '请输入法定代表人身份证号', trigger: 'blur' }
+            { required: true, validator: checkLegalPersonId, trigger: 'blur' }
           ],
           LegalPersonImg: [
             { required: true,
@@ -286,7 +384,7 @@
             { required: true, message: '请输入联系人姓名', trigger: 'blur' }
           ],
           ContactId: [
-            { required: true, message: '请输入联系人身份证号', trigger: 'blur' }
+            { required: true, validator: checkContactId, trigger: 'blur' }
           ],
           ContactImg: [
             { required: true,
@@ -295,22 +393,22 @@
             }
           ],
           UserName: [
-            { required: true, message: '请输入登录账号', trigger: 'blur' }
+            { required: true, 
+              validator: userNameIsExist, 
+              trigger: 'blur'
+            }
           ],
           UserRealName: [
             { required: true, message: '请输入真实用户名', trigger: 'blur' }
           ],
           UserTelephone: [
-            { required: true, message: '请输入手机号', trigger: 'blur' }
+            { required: true, validator: checkUserTelephone, trigger: 'blur' }
           ],
           UserPass: [
-            { required: true, message: '请输入密码', trigger: 'blur' }
+            { required: true, validator: checkUserPass, trigger: 'blur' }
           ],
           UserPass2: [
-            { required: true,
-              message: '请输入确认密码',
-              trigger: 'blur'
-            }
+            { required: true, validator: checkUserPass2, trigger: 'blur' }
           ],
           CheckUserName: [
             { required: true, message: '请选择审核人', trigger: 'blur' }
@@ -355,7 +453,7 @@
           }
         }
 
-        //组织机构代码验证
+        //统一社会信用代码验证
         let re4 = /^[0-9A-Z]\d{17}$/
         if (!re4.test(_this.formData.CommercialNo)) {
           this.$alert('请填写正确的统一社会信用代码！', '提示', {
@@ -410,6 +508,15 @@
           return
         }
 
+        //判断登录账号是否存在
+        _this.checkUserNameIsExist()
+        if (_this.userIsExist) {
+          _this.$alert('该登录账号已注册！', '提示:', {
+            confirmButtonText: '确定',
+          })
+          return
+        }
+
         //密码验证 字母数字组成8-20位 正向断言
         let re2 = /^(?=.*[0-9])[0-9A-Za-z]{8,20}$/g
         if (!re2.test(_this.formData.UserPass)) {
@@ -425,6 +532,7 @@
           return
         }
 
+        //添加注册信息
         _this.$axios.post('/register/addentity', _this.formData)
           .then(function (response) {
             if (response.data.code === 0) {
@@ -456,6 +564,21 @@
           })
       },
 
+      //判断用户名是否存在
+      checkUserNameIsExist() {
+        let _this = this
+        let params = {
+          UserName: _this.formData.UserName,
+        }
+        _this.$axios.get('/register/usernameisexist', {params})
+          .then(res => {
+            _this.userIsExist = res.data.item
+          })
+          .catch(err => {
+            console.error(err)
+          })
+      },
+
       //上传超过限制数
       uploadExceed(files, fileList) {
         if (fileList.length == this.limitNumb) {