注册

Signed-off-by: lijunqing <lijunqing@dashoo.cn>

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

@@ -90,7 +90,7 @@ func (this *OilCorporateInfoController) GetCompanyInfo() {
 // @Success	200	{object} controllers.Request
 // @router /getsuppliername [get]
 func (this *OilCorporateInfoController) GetSupplierName() {
-	sqlStr := "SELECT SupplierName FROM OilCorporateInfo"
+	sqlStr := "SELECT SupplierName,CommercialNo FROM OilCorporateInfo"
 	svc := register.GetOilCorporateInfoService(utils.DBE)
 	list, _ := svc.DBE.QueryString(sqlStr)
 

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

@@ -29,7 +29,7 @@
 
       <el-card>
         <div class="home-wrapper" v-if="activeIndex==1">
-            <el-form label-width="135px" ref="formData" :model="formData" :rules="rules">
+            <el-form label-width="135px" ref="RegisterFormData" :model="formData" :rules="rules">
               <el-row>
                 <el-col :span="24">
                   <el-form-item label="公司名称" label-width="150px" style="width: 100%" prop="SupplierName">
@@ -91,21 +91,25 @@
                 </el-col>
               </el-row>
               <el-row>
-                <el-col :span="24">
-                  <el-form-item label="账号/Email" label-width="150px" style="width: 100%" prop="UserName">
-                    <el-input v-model="formData.UserName" placeholder="请输入登录账号"></el-input>
-                  </el-form-item>
-                </el-col>
                 <el-col :span="12">
-                  <el-form-item label="用户名"  label-width="150px" style="width: 100%" prop="UserRealName">
-                    <el-input v-model="formData.UserRealName" placeholder="请输入真实用户名"></el-input>
+                  <el-form-item label="邮箱"  label-width="150px" style="width: 100%" prop="EMail">
+                    <el-input v-model="formData.EMail" placeholder="请输入邮箱"></el-input>
                   </el-form-item>
-                </el-col>
+                </el-col> 
+
                 <el-col :span="12">
                   <el-form-item label="手机号"   style="width: 100%" prop="UserTelephone">
                     <el-input v-model="formData.UserTelephone" placeholder="用于审核通知"></el-input>
                   </el-form-item>
                 </el-col>
+
+                <el-col :span="24">
+                  <el-form-item label="用户名" label-width="150px" style="width: 100%" prop="UserName">
+                    <el-input v-model="formData.UserName" placeholder="请输入登录用户名"></el-input>
+                  </el-form-item>
+                </el-col>
+               
+              
                 <el-col :span="8">
                   <el-form-item label="密码" label-width="150px" style="width: 100%" prop="UserPass" >
                     <el-input type="password" v-model="formData.UserPass"  auto-complete="off" placeholder="请输入密码"></el-input>
@@ -166,40 +170,61 @@
 
   @Component({
     data () {
+        var checkemail= (rule, value, callback) => {
+        if (value) {
+          let re = /^([a-zA-Z0-9]+[_|-|.|-]?)*[a-zA-Z0-9]+@([a-zA-Z0-9]+[_|-|.|-]?)*[a-zA-Z0-9]+.[a-zA-Z]{2,3}$/
+          if (!re.test(value)) {
+            callback(new Error('请输入正确的邮箱地址'))
+          } else {
+            callback()
+          }
+        }
+        else{
+          callback(new Error('请输入邮箱地址'))
+        }
+      };
       var checkSupplierName =  (rule, value, callback) => {
         if (value === '') {
-          callback(new Error('请输入公司名称！'));
+          callback(new Error('请输入公司名称'));
         } else {
-          if (this.supplierNameList) {
+          if (this.supplierNameList) {            
             for (let i = 0; i < this.supplierNameList.length; i++) {
               if (value == this.supplierNameList[i].SupplierName) {
-                callback(new Error('该公司已注册！'));
-              } else {
-                callback();
-              }
+                callback(new Error('该公司已被注册'));
+              } 
             }
+          }else {
+            callback();
           }
         }
       };
       var checkCommercialNo = (rule, value, callback) => {
         if (value === '') {
-          callback(new Error('请输入统一社会信用代码！'));
+          callback(new Error('请输入统一社会信用代码'));
         } else {
           let re4 = /^[0-9A-Z]\d{17}$/
           if (!re4.test(this.formData.CommercialNo)) {
-            callback(new Error('请填写18位统一社会信用代码！'));
+            callback(new Error('请填写18位统一社会信用代码'));
           } else {
+           if (this.supplierNameList) {            
+            for (let i = 0; i < this.supplierNameList.length; i++) {
+              if (value == this.supplierNameList[i].CommercialNo) {
+                callback(new Error('该统一社会信用代码与其他公司重复'));
+              } 
+            }
+          }else {
             callback();
-          }
+           }
+         }
         }
       };
       var checkLegalPersonId = (rule, value, callback) => {
         if (value === '') {
-          callback(new Error('请输入正确格式的法定代表人身份证号！'));
+          callback(new Error('请输入正确格式的法定代表人身份证号'));
         } else {
           let re1 = /(^\d{18}$)|(^\d{17}(\d|X|x)$)/
           if (!re1.test(this.formData.LegalPersonId)) {
-            callback(new Error('请输入正确格式的法定代表人身份证号！'));
+            callback(new Error('请输入正确格式的法定代表人身份证号'));
           } else {
             callback();
           }
@@ -207,42 +232,64 @@
       };
       var checkContactId = (rule, value, callback) => {
         if (value === '') {
-          callback(new Error('请输入正确格式的联系人身份证号！'));
+          callback(new Error('请输入正确格式的联系人身份证号'));
         } else {
           let re1 = /(^\d{18}$)|(^\d{17}(\d|X|x)$)/
           if (!re1.test(this.formData.ContactId)) {
-            callback(new Error('请输入正确格式的联系人身份证号！'));
+            callback(new Error('请输入正确格式的联系人身份证号'));
           } else {
             callback();
           }
         }
       };
-      var checkUpload = (rule, value, callback) => {
-        if (value === '') {
-          callback(new Error('请上传身份证扫描件! '))
-        } else {
-          callback()
+      
+      var checkUploadLegal = (rule, value, callback) => {
+      if(this.$refs.LegalPersonUpload.uploadFiles.length > 0){
+           if (!this.checkSuccess(this.$refs.LegalPersonUpload.uploadFiles)) {
+              callback(new Error('上传照片失败，请重新上传法定代表人身份证照片'));
+            }else { 
+              callback();
+            }
+        }else{
+              callback(new Error('请上传法定代表人身份证照片'));
+        }
+      };
+
+      var checkUploadContact = (rule, value, callback) => {
+        if(this.$refs.ContactUpload.uploadFiles.length > 0){
+           if (!this.checkSuccess(this.$refs.ContactUpload.uploadFiles)) {
+              callback(new Error('上传照片失败，请重新上传联系人身份证照片'));
+            }else { 
+              callback();
+            }
+        }else{
+              callback(new Error('请上传联系人身份证照片'));
         }
       };
       var userNameIsExist =  (rule, value, callback) => {
         if (value === '') {
-          callback(new Error('请输入登录账号!'));
+          callback(new Error('请输入登录用户名'));
         } else {
-          this.checkUserNameIsExist()
-          if (this.userIsExist) {
-            callback(new Error('该登录账号已注册！!'));
+          let re1 = /^(?=.*[a-zA-Z])(?=.*\d)[a-zA-Z\d]{6,}$/
+          if (!re1.test(this.formData.UserName)) {
+            callback(new Error('请输入正确格式的用户名（大于6位的英文字母和数字组合）'));
           } else {
-            callback();
+                this.checkUserNameIsExist()
+                if (this.userIsExist) {
+                  callback(new Error('该用户名已被注册'));
+                } else {
+                  callback();
+                }
           }
         }
       };
       var checkUserTelephone = (rule, value, callback) => {
         if (value === '') {
-          callback(new Error('请输入正确格式的手机号！'));
+          callback(new Error('请输入正确格式的手机号'));
         } else {
           let re3 = /^[1][3456789]\d{9}$/
           if (!re3.test(this.formData.UserTelephone)) {
-            callback(new Error('请填写正确格式的手机号！'));
+            callback(new Error('请填写正确格式的手机号'));
           } else {
             callback();
           }
@@ -250,11 +297,11 @@
       };
       var checkUserPass = (rule, value, callback) => {
         if (value === '') {
-          callback(new Error('请输入正确格式的密码(8—20位，至少包含1个大写字母、1个小写字母和1个数字)！'));
+          callback(new Error('请输入正确格式的密码(8—20位，至少包含1个大写字母、1个小写字母和1个数字)'));
         } else {
           let re2 = /^(?=.*[a-z])(?=.*[A-Z])(?=.*\d)[^]{8,20}$/
           if (!re2.test(this.formData.UserPass)) {
-            callback(new Error('请输入正确格式的密码(8—20位，至少包含1个大写字母、1个小写字母和1个数字)！'));
+            callback(new Error('请输入正确格式的密码(8—20位，至少包含1个大写字母、1个小写字母和1个数字)'));
           } else {
             callback();
           }
@@ -262,7 +309,7 @@
       };
       var checkUserPass2 = (rule, value, callback) => {
         if (value === '') {
-          callback(new Error('请输入确认密码！'));
+          callback(new Error('请输入确认密码'));
         } else {
           if (this.formData.UserPass != this.formData.UserPass2) {
             callback(new Error('两次输入的密码不一致，请重新输入'));
@@ -349,6 +396,11 @@
               trigger: 'blur'
             }
           ],
+          EMail: [{
+            required: true,
+            validator: checkemail,
+            trigger: 'blur'
+          }],
           CommercialNo: [
             { required: true, validator: checkCommercialNo, trigger: 'blur' }
           ],
@@ -360,8 +412,8 @@
           ],
           LegalPersonImg: [
             { required: true,
-              validator: checkUpload,
-              trigger: 'blur'
+              validator: checkUploadLegal,
+              trigger: 'change'
             }
           ],
           ContactName: [
@@ -372,7 +424,7 @@
           ],
           ContactImg: [
             { required: true,
-              validator: checkUpload,
+              validator: checkUploadContact,
               trigger: 'blur'
             }
           ],
@@ -382,9 +434,7 @@
               trigger: 'blur'
             }
           ],
-          UserRealName: [
-            { required: true, message: '请输入真实用户名', trigger: 'blur' }
-          ],
+         
           UserTelephone: [
             { required: true, validator: checkUserTelephone, trigger: 'blur' }
           ],
@@ -424,96 +474,40 @@
 
       //注册
       register () {
-        let _this = this
-        //判断公司是否注册
-        if (_this.supplierNameList) {
-          for (let i = 0; i < _this.supplierNameList.length; i++) {
-            if (_this.formData.SupplierName == _this.supplierNameList[i].SupplierName) {
-              callback(new Error('该公司已注册！'));
-              return
-            }
-          }
-        }
-
-        //统一社会信用代码验证
-        let re4 = /^[0-9A-Z]\d{17}$/
-        if (!re4.test(_this.formData.CommercialNo)) {
-          callback(new Error('请填写18位统一社会信用代码！'));
-          return
-        }
-
-        //身份证号验证
-        let re1 = /(^\d{18}$)|(^\d{17}(\d|X|x)$)/
-        if (!re1.test(_this.formData.LegalPersonId)) {
-          callback(new Error('请填写正确的法定代表人身份证号！'));
-          return
-        }
-        if (!re1.test(_this.formData.ContactId)) {
-          callback(new Error('请填写正确的联系人身份证号！'));
-          return
-        }
-
-        // 判断法定代表人身份证文件上传是否完成
-        if (!_this.checkSuccess(_this.$refs.LegalPersonUpload.uploadFiles)) {
-          callback(new Error('上传文件失败，请重新上传法定代表人身份证文件！'));
-          return
-        }
-        let URL = []
-        URL = _this.getFileURL(_this.$refs.LegalPersonUpload.uploadFiles) //获取地址
-        _this.formData.LegalPersonURL = URL.join("&")
-
-        // 判断联系人身份证文件上传是否完成
-        if (!_this.checkSuccess(_this.$refs.ContactUpload.uploadFiles)) {
-          callback(new Error('上传文件失败，请重新上传联系人身份证文件！'));
-          return
-        }
-        let URL2 = []
-        URL2 = _this.getFileURL(_this.$refs.ContactUpload.uploadFiles) //获取地址
-        _this.formData.ContactURL = URL2.join("&")
-
-        //手机号验证
-        let re3 = /^[1][3456789]\d{9}$/
-        if (!re3.test(_this.formData.UserTelephone)) {
-          callback(new Error('请填写正确的手机号！'));
-          return
-        }
-
-        //判断登录账号是否存在
-        _this.checkUserNameIsExist()
-        if (_this.userIsExist) {
-          callback(new Error('该登录账号已注册！'));
-          return
-        }
-
-        //密码验证 字母数字组成8-20位 正向断言
-        let re2 = /^(?=.*[0-9])[0-9A-Za-z]{8,20}$/g
-        if (!re2.test(_this.formData.UserPass)) {
-          callback(new Error('请输入正确格式的密码(8——20位，包含英文字母、数字)！'));
-          return
-        }
-        if (_this.formData.UserPass != _this.formData.UserPass2) {
-          callback(new Error('两次输入的密码不一致，请重新输入!'));
-          return
-        }
-
-        //添加注册信息
-        _this.$axios.post('/register/addentity', _this.formData)
-          .then(function (response) {
-            if (response.data.code === 0) {
-              _this.$message({
-                type: 'success',
-                message: response.data.message
-              });
-              _this.$router.push('/login') //跳转到登录页
-            } else {
-              _this.$alert(response.data.message, '提示', {
-                confirmButtonText: '确定',
-              })
+       this.$refs['RegisterFormData'].validate((valid) => {
+          if(valid){
+              let _this = this 
+              let URL = []
+              URL = _this.getFileURL(_this.$refs.LegalPersonUpload.uploadFiles) //获取地址
+              _this.formData.LegalPersonURL = URL.join("&")
+
+              let URL2 = []
+              URL2 = _this.getFileURL(_this.$refs.ContactUpload.uploadFiles) //获取地址
+              _this.formData.ContactURL = URL2.join("&")
+
+              _this.formData.UserRealName= _this.formData.SupplierName
+
+              //添加注册信息
+              console.log( _this.formData)
+              _this.$axios.post('/register/addentity', _this.formData)
+                .then(function (response) {
+                  if (response.data.code === 0) {
+                    _this.$message({
+                      type: 'success',
+                      message: response.data.message
+                    });
+                    _this.$router.push('/login') //跳转到登录页
+                  } else {
+                    _this.$alert(response.data.message, '提示', {
+                      confirmButtonText: '确定',
+                    })
+                  }
+                })
+                .catch(function (error) {
+                  console.log(error)
+                })
             }
-          })
-          .catch(function (error) {
-            console.log(error)
-          })
+        })
       },
 
       //获取已注册的公司
@@ -521,6 +515,7 @@
         let _this = this
         _this.$axios.get('/register/getsuppliername', {})
           .then(res => {
+            console.log(res.data.items)
             _this.supplierNameList = res.data.items
           })
           .catch(err => {
@@ -536,6 +531,7 @@
         }
         _this.$axios.get('/register/usernameisexist', {params})
           .then(res => {
+            console.log(res.data.item)
             _this.userIsExist = res.data.item
           })
           .catch(err => {
@@ -546,7 +542,7 @@
       //上传超过限制数
       uploadExceed(files, fileList) {
         if (fileList.length == this.limitNumb) {
-          this.$alert("超出上传文件数，禁止上传！", '提示', {
+          this.$alert("超出上传照片数，禁止上传", '提示', {
             confirmButtonText: '确定',
           })
         }
@@ -560,25 +556,22 @@
         let isIMAGE3 = file.name.split('.')[1] === 'png'
 
         if (!isIMAGE1 && !isIMAGE2 && !isIMAGE3) {
-          this.$message.error('上传文件只能是图片格式(jpg/jpeg/png)!')
+          this.$message.error('上传照片只能是图片格式(jpg/jpeg/png)!')
         }
         if (!isLt10m) {
-          this.$message.error('上传文件大小不能超过 10MB!')
+          this.$message.error('上传照片大小不能超过 10MB!')
         }
         return isIMAGE1 || isIMAGE2 || isIMAGE3 && isLt10m
       },
 
       //判断是否上传成功
       checkSuccess(uploadFiles) {
-        if (uploadFiles.length < 1) {
-          return false
-        } else {
           for (let i = 0; i < uploadFiles.length; i++) {
-            if (uploadFiles[i].status !== 'success') {
+            console.log(uploadFiles[i])
+            if (uploadFiles[i].status != 'success') {
               return false
             }
           }
-        }
         return true
       },
 
@@ -605,7 +598,7 @@
               } else {
                 _this.$message({
                   type: 'warning',
-                  message: '未上传成功！请重新上传！'
+                  message: '未上传成功，请重新上传'
                 })
               }
             })
@@ -613,7 +606,7 @@
               console.log(error)
               _this.$message({
                 type: 'warning',
-                message: '未上传成功！请重新上传！'
+                message: '未上传成功，请重新上传'
               })
             })
         }